Finish plumbing MojoVideoDecoder.

media/mojo/common/media_type_converters.cc

Index: media/mojo/common/media_type_converters.cc
diff --git a/media/mojo/common/media_type_converters.cc b/media/mojo/common/media_type_converters.cc
index 6df88c8a5e697e63266e1d7e3c3463a9589a3e5b..01f4c5cdafab18783f1d285d66f28d3361d38341 100644
--- a/media/mojo/common/media_type_converters.cc
+++ b/media/mojo/common/media_type_converters.cc
@@ -14,6 +14,7 @@
 #include "media/base/buffering_state.h"
 #include "media/base/cdm_config.h"
 #include "media/base/cdm_key_information.h"
+#include "media/base/decode_status.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/decryptor.h"
@@ -41,10 +42,21 @@ namespace mojo {
                                                media::mojom::mojo_enum_value), \
                 "Mismatched enum: " #media_enum_value " != " #mojo_enum_value)
 
+#define ASSERT_ENUM_CLASS_EQ(media_enum, value)                            \
+  static_assert(                                                           \
+      media::media_enum::value ==                                          \
+          static_cast<media::media_enum>(media::mojom::media_enum::value), \
+      "Mismatched enum: " #media_enum #value)
+
 // BufferingState.
 ASSERT_ENUM_EQ(BufferingState, BUFFERING_, , HAVE_NOTHING);
 ASSERT_ENUM_EQ(BufferingState, BUFFERING_, , HAVE_ENOUGH);
 
+// DecodeStatus.
+ASSERT_ENUM_CLASS_EQ(DecodeStatus, OK);
+ASSERT_ENUM_CLASS_EQ(DecodeStatus, ABORTED);
+ASSERT_ENUM_CLASS_EQ(DecodeStatus, DECODE_ERROR);
+
 // AudioCodec.
 ASSERT_ENUM_EQ_RAW(AudioCodec, kUnknownAudioCodec, AudioCodec::UNKNOWN);
 ASSERT_ENUM_EQ(AudioCodec, kCodec, , AAC);
@@ -427,8 +439,6 @@ TypeConverter<media::mojom::DecoderBufferPtr,
   mojo_buffer->duration_usec = input->duration().InMicroseconds();
   mojo_buffer->is_key_frame = input->is_key_frame();
   mojo_buffer->data_size = base::checked_cast<uint32_t>(input->data_size());
-  mojo_buffer->side_data_size =
-      base::checked_cast<uint32_t>(input->side_data_size());

[dcheng, 2016/05/20 21:18:22]

Can we wholly remove this field from the mojom in this patch?

[sandersd (OOO until July 31), 2016/05/20 22:27:14]

I already did that; was this comment intended for a different field?

[dcheng, 2016/05/20 22:52:59]

Oops, I missed that.

   mojo_buffer->front_discard_usec =
       input->discard_padding().first.InMicroseconds();
   mojo_buffer->back_discard_usec =
@@ -463,8 +473,8 @@ TypeConverter<scoped_refptr<media::DecoderBuffer>,
 
   scoped_refptr<media::DecoderBuffer> buffer(
       new media::DecoderBuffer(input->data_size));
-  if (input->side_data_size)
-    buffer->CopySideDataFrom(&input->side_data.front(), input->side_data_size);
+
+  buffer->CopySideDataFrom(&input->side_data.front(), input->side_data.size());

[dcheng, 2016/05/20 21:18:22]

Existing semantics don't copy this data if it's zero-length, having a
zero-length side data won't be a problem, right?

[sandersd (OOO until July 31), 2016/05/20 22:27:14]

That's correct, the media::DecoderBuffer structure doesn't distinguish between
no side data and zero-length side data.

 
   buffer->set_timestamp(
       base::TimeDelta::FromMicroseconds(input->timestamp_usec));