Fix support for yuv_422 pixel format.

media/ffmpeg/ffmpeg_common.cc

 // Copyright (c) 2011 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/ffmpeg/ffmpeg_common.h"
 
 #include "base/logging.h"
 
 namespace media {
 
@@ skipping 197 matching lines @@
       // from the number of channels, otherwise report errors.
       if (channels == 1)
         return CHANNEL_LAYOUT_MONO;
       if (channels == 2)
         return CHANNEL_LAYOUT_STEREO;
       DLOG(WARNING) << "Unsupported/unencountered channel layout values";
       return CHANNEL_LAYOUT_UNSUPPORTED;
   }
 }
 
+VideoFrame::Format PixelFormatToVideoFormat(PixelFormat pixel_format) {
+  switch (pixel_format) {
+    case PIX_FMT_YUV422P:
+      return VideoFrame::YV16;
+    case PIX_FMT_YUV420P:
+      return VideoFrame::YV12;
+    default:
+      NOTREACHED() << "Unsupported PixelFormat: " << pixel_format;
+  }
+  return VideoFrame::INVALID;
+}
+
+PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format) {
+  switch (video_format) {
+      case VideoFrame::YV16:

[scherkus (not reviewing), 2011/09/29 20:48:05]

fix indentation

+        return PIX_FMT_YUV422P;
+      case VideoFrame::YV12:
+        return PIX_FMT_YUV420P;
+      default:
+        NOTREACHED() << "Unsupported VideoFrame Format: " << video_format;
+    }
+    return PIX_FMT_NONE;
+}
+
 base::TimeDelta GetFrameDuration(AVStream* stream) {
   AVRational time_base = { stream->r_frame_rate.den, stream->r_frame_rate.num };
   return ConvertFromTimeBase(time_base, 1);
 }
 
 bool GetSeekTimeAfter(AVStream* stream, const base::TimeDelta& timestamp,
                       base::TimeDelta* seek_time) {
   DCHECK(stream);
   DCHECK(timestamp >= base::TimeDelta::FromSeconds(0));
   DCHECK(seek_time);
@@ skipping 107 matching lines @@
         avcodec_close(stream->codec);
       }
     }
   }
 
   // Then finally cleanup the format context.
   av_close_input_file(format_context);
 }
 
 }  // namespace media