Refactor audio and video decoder status into common file.

media/mojo/services/mojo_audio_decoder.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/mojo/services/mojo_audio_decoder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
@@ skipping 67 matching lines @@
       interfaces::AudioDecoderConfig::From(config), cdm_id,
       base::Bind(&MojoAudioDecoder::OnInitialized, base::Unretained(this)));
 }
 
 void MojoAudioDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
                               const DecodeCB& decode_cb) {
   DVLOG(3) << __FUNCTION__;
   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, DecodeStatus::DECODE_ERROR));
     return;
   }
 
   DCHECK(decode_cb_.is_null());
   decode_cb_ = decode_cb;
 
   remote_decoder_->Decode(
       TransferDecoderBuffer(buffer),
       base::Bind(&MojoAudioDecoder::OnDecodeStatus, base::Unretained(this)));
 }
 
 void MojoAudioDecoder::Reset(const base::Closure& closure) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   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_),
+                                        DecodeStatus::DECODE_ERROR));
     }
 
     task_runner_->PostTask(FROM_HERE, closure);
     return;
   }
 
   DCHECK(reset_cb_.is_null());
   reset_cb_ = closure;
   remote_decoder_->Reset(
       base::Bind(&MojoAudioDecoder::OnResetDone, base::Unretained(this)));
@@ skipping 18 matching lines @@
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   has_connection_error_ = true;
 
   if (!init_cb_.is_null()) {
     base::ResetAndReturn(&init_cb_).Run(false);
     return;
   }
 
   if (!decode_cb_.is_null())
-    base::ResetAndReturn(&decode_cb_).Run(kDecodeError);
+    base::ResetAndReturn(&decode_cb_).Run(DecodeStatus::DECODE_ERROR);
   if (!reset_cb_.is_null())
     base::ResetAndReturn(&reset_cb_).Run();
 }
 
 void MojoAudioDecoder::OnInitialized(bool status,
                                      bool needs_bitstream_conversion) {
   DVLOG(1) << __FUNCTION__ << ": status:" << status;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   needs_bitstream_conversion_ = needs_bitstream_conversion;
 
   if (status)
     CreateDataPipe();
 
   task_runner_->PostTask(FROM_HERE, base::Bind(init_cb_, status));
 }
 
-static media::AudioDecoder::Status ConvertDecodeStatus(
+static media::DecodeStatus ConvertDecodeStatus(
     interfaces::AudioDecoder::DecodeStatus status) {
   switch (status) {
     case interfaces::AudioDecoder::DecodeStatus::OK:
-      return media::AudioDecoder::kOk;
+      return media::DecodeStatus::OK;
     case interfaces::AudioDecoder::DecodeStatus::ABORTED:
-      return media::AudioDecoder::kAborted;
+      return media::DecodeStatus::ABORTED;
     case interfaces::AudioDecoder::DecodeStatus::DECODE_ERROR:
-      return media::AudioDecoder::kDecodeError;
+      return media::DecodeStatus::DECODE_ERROR;
   }
   NOTREACHED();
-  return media::AudioDecoder::kDecodeError;
+  return media::DecodeStatus::DECODE_ERROR;
 }
 
 void MojoAudioDecoder::OnDecodeStatus(
     interfaces::AudioDecoder::DecodeStatus status) {
   DVLOG(1) << __FUNCTION__ << ": status:" << status;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   DCHECK(!decode_cb_.is_null());
   base::ResetAndReturn(&decode_cb_).Run(ConvertDecodeStatus(status));
 }
@@ skipping 37 matching lines @@
   uint32_t num_bytes = base::checked_cast<uint32_t>(media_buffer->data_size());
   DCHECK_GT(num_bytes, 0u);
   CHECK_EQ(WriteDataRaw(producer_handle_.get(), media_buffer->data(),
                         &num_bytes, MOJO_READ_DATA_FLAG_ALL_OR_NONE),
            MOJO_RESULT_OK);
   CHECK_EQ(num_bytes, static_cast<uint32_t>(media_buffer->data_size()));
   return buffer;
 }
 
 }  // namespace media