Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

media/mojo/services/media_type_converters.cc

 // Copyright 2014 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/media_type_converters.h"
 
 #include "media/base/audio_decoder_config.h"
 #include "media/base/buffering_state.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/decoder_buffer.h"
@@ skipping 116 matching lines @@
 
 // VideoFormat.
 ASSERT_ENUM_EQ_RAW(VideoFrame::Format,
                    VideoFrame::UNKNOWN,
                    VIDEO_FORMAT_UNKNOWN);
 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::YV12, VIDEO_FORMAT_YV12);
 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::I420, VIDEO_FORMAT_I420);
 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::YV16, VIDEO_FORMAT_YV16);
 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::YV12A, VIDEO_FORMAT_YV12A);
 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::YV24, VIDEO_FORMAT_YV24);
+#if defined(OS_MACOSX)
 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::NV12, VIDEO_FORMAT_NV12);
+#endif
 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::ARGB, VIDEO_FORMAT_ARGB);
-#if defined(VIDEO_HOLE)
-ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::HOLE, VIDEO_FORMAT_HOLE);
-#endif
-ASSERT_ENUM_EQ_RAW(VideoFrame::Format,
-                   VideoFrame::NATIVE_TEXTURE,
-                   VIDEO_FORMAT_NATIVE_TEXTURE);
+ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::XRGB, VIDEO_FORMAT_XRGB);
 ASSERT_ENUM_EQ_RAW(VideoFrame::Format,
                    VideoFrame::FORMAT_MAX,
                    VIDEO_FORMAT_FORMAT_MAX);
 
 // VideoCodec
 ASSERT_ENUM_EQ_RAW(VideoCodec, kUnknownVideoCodec, VIDEO_CODEC_UNKNOWN);
 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, H264);
 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VC1);
 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG2);
 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG4);
@@ skipping 324 matching lines @@
     CdmKeyInformationPtr>::Convert(const CdmKeyInformationPtr& input) {
   scoped_ptr<media::CdmKeyInformation> info(new media::CdmKeyInformation);
   info->key_id = input->key_id.storage();
   info->status =
       static_cast<media::CdmKeyInformation::KeyStatus>(input->status);
   info->system_code = input->system_code;
   return info.Pass();
 }
 
 }  // namespace mojo