Fix support for yuv_422 pixel format.

media/video/ffmpeg_video_decode_engine.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/video/ffmpeg_video_decode_engine.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/task.h"
 #include "media/base/buffers.h"
@@ skipping 40 matching lines @@
   // decoding thread, FFmpeg treats having one thread the same as having zero
   // threads (i.e., avcodec_decode_video() will execute on the calling thread).
   // Yet another reason for having two threads :)
   static const int kDecodeThreads = 2;
   static const int kMaxDecodeThreads = 16;
 
   // Initialize AVCodecContext structure.
   codec_context_ = avcodec_alloc_context();
 
   // TODO(scherkus): should video format get passed in via VideoDecoderConfig?
-  codec_context_->pix_fmt = PIX_FMT_YUV420P;
+  // (shadi): yes! YV16 and Y12 have different memory format.

[scherkus (not reviewing), 2011/09/28 17:32:17]

haha!

if these TODOs are sufficiently addressed then we can remove them

[shadi1, 2011/09/29 18:31:03]

Done.

+  codec_context_->pix_fmt = config.pix_fmt();
   codec_context_->codec_type = AVMEDIA_TYPE_VIDEO;
   codec_context_->codec_id = VideoCodecToCodecID(config.codec());
   codec_context_->coded_width = config.coded_size().width();
   codec_context_->coded_height = config.coded_size().height();
 
   frame_rate_numerator_ = config.frame_rate_numerator();
   frame_rate_denominator_ = config.frame_rate_denominator();
 
   if (config.extra_data() != NULL) {
     codec_context_->extradata_size = config.extra_data_size();
@@ skipping 33 matching lines @@
   VideoCodecInfo info;
   info.success = false;
   info.natural_size = config.natural_size();
 
   // If we do not have enough buffers, we will report error too.
   frame_queue_available_.clear();
 
   // Create output buffer pool when direct rendering is not used.
   for (size_t i = 0; i < Limits::kMaxVideoFrames; ++i) {
     scoped_refptr<VideoFrame> video_frame =
-        VideoFrame::CreateFrame(VideoFrame::YV12,
+        VideoFrame::CreateFrame(PixFmtToVideoFormat(codec_context_->pix_fmt),
                                 config.visible_rect().width(),
                                 config.visible_rect().height(),
                                 kNoTimestamp,
                                 kNoTimestamp);
     frame_queue_available_.push_back(video_frame);
   }
 
   codec_context_->thread_count = decode_threads;
   if (codec &&
       avcodec_open(codec_context_, codec) >= 0 &&
@@ skipping 117 matching lines @@
   // available frame, except the case of |frame_decoded| == 0, which
   // implies decoder order delay, and force us to read more inputs.
   DCHECK(frame_queue_available_.size());
   video_frame = frame_queue_available_.front();
   frame_queue_available_.pop_front();
 
   // Copy the frame data since FFmpeg reuses internal buffers for AVFrame
   // output, meaning the data is only valid until the next
   // avcodec_decode_video() call.
   int y_rows = codec_context_->height;
-  int uv_rows = codec_context_->height / 2;
+  int uv_rows = video_frame->rows(VideoFrame::kUPlane);

[scherkus (not reviewing), 2011/09/28 17:32:17]

nice :)

+
   CopyYPlane(av_frame_->data[0], av_frame_->linesize[0], y_rows, video_frame);
   CopyUPlane(av_frame_->data[1], av_frame_->linesize[1], uv_rows, video_frame);
   CopyVPlane(av_frame_->data[2], av_frame_->linesize[2], uv_rows, video_frame);
 
   video_frame->SetTimestamp(timestamp);
   video_frame->SetDuration(duration);
 
   pending_output_buffers_--;
   event_handler_->ConsumeVideoFrame(video_frame, statistics);
 }
@@ skipping 36 matching lines @@
   DCHECK_EQ(output_eos_reached_, false);
   pending_input_buffers_++;
   event_handler_->ProduceVideoSample(NULL);
 }
 
 }  // namespace media
 
 // Disable refcounting for this object because this object only lives
 // on the video decoder thread and there's no need to refcount it.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(media::FFmpegVideoDecodeEngine);