Chromium Code Reviews| Index: media/mojo/services/mojo_audio_decoder.cc |
| diff --git a/media/mojo/services/mojo_audio_decoder.cc b/media/mojo/services/mojo_audio_decoder.cc |
| index 9a070bb722002017ad4e1eced4054f7399f16111..76d093b420d310bf5fb18f7518ea248267b3de6e 100644 |
| --- a/media/mojo/services/mojo_audio_decoder.cc |
| +++ b/media/mojo/services/mojo_audio_decoder.cc |
| @@ -85,7 +85,8 @@ void MojoAudioDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer, |
| DCHECK(task_runner_->BelongsToCurrentThread()); |
| if (has_connection_error_) { |
| - task_runner_->PostTask(FROM_HERE, base::Bind(decode_cb, kDecodeError)); |
| + task_runner_->PostTask(FROM_HERE, |
| + base::Bind(decode_cb, DecoderStatus::DECODE_ERROR)); |
| return; |
| } |
| @@ -103,9 +104,9 @@ void MojoAudioDecoder::Reset(const base::Closure& closure) { |
| if (has_connection_error_) { |
| if (!decode_cb_.is_null()) { |
| - task_runner_->PostTask( |
| - FROM_HERE, |
| - base::Bind(base::ResetAndReturn(&decode_cb_), kDecodeError)); |
| + task_runner_->PostTask(FROM_HERE, |
| + base::Bind(base::ResetAndReturn(&decode_cb_), |
| + DecoderStatus::DECODE_ERROR)); |
| } |
| task_runner_->PostTask(FROM_HERE, closure); |
| @@ -144,7 +145,7 @@ void MojoAudioDecoder::OnConnectionError() { |
| } |
| if (!decode_cb_.is_null()) |
| - base::ResetAndReturn(&decode_cb_).Run(kDecodeError); |
| + base::ResetAndReturn(&decode_cb_).Run(DecoderStatus::DECODE_ERROR); |
| if (!reset_cb_.is_null()) |
| base::ResetAndReturn(&reset_cb_).Run(); |
| } |
| @@ -162,18 +163,18 @@ void MojoAudioDecoder::OnInitialized(bool status, |
| task_runner_->PostTask(FROM_HERE, base::Bind(init_cb_, status)); |
| } |
| -static media::AudioDecoder::Status ConvertDecodeStatus( |
| +static media::DecoderStatus ConvertDecodeStatus( |
| interfaces::AudioDecoder::DecodeStatus status) { |
| switch (status) { |
| case interfaces::AudioDecoder::DecodeStatus::OK: |
|
xhwang
2016/03/29 19:42:28
+sandersd: When working on VDAv2, we probably want
|
| - return media::AudioDecoder::kOk; |
| + return media::DecoderStatus::OK; |
| case interfaces::AudioDecoder::DecodeStatus::ABORTED: |
| - return media::AudioDecoder::kAborted; |
| + return media::DecoderStatus::ABORTED; |
| case interfaces::AudioDecoder::DecodeStatus::DECODE_ERROR: |
| - return media::AudioDecoder::kDecodeError; |
| + return media::DecoderStatus::DECODE_ERROR; |
| } |
| NOTREACHED(); |
| - return media::AudioDecoder::kDecodeError; |
| + return media::DecoderStatus::DECODE_ERROR; |
| } |
| void MojoAudioDecoder::OnDecodeStatus( |