Reland r101418: Fix aspect ratio and clarify video frame dimensions

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 43 matching lines @@
   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;
   codec_context_->codec_type = AVMEDIA_TYPE_VIDEO;
   codec_context_->codec_id = VideoCodecToCodecID(config.codec());
-  codec_context_->coded_width = config.width();
-  codec_context_->coded_height = config.height();
+  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();
     codec_context_->extradata = reinterpret_cast<uint8_t*>(
         av_malloc(config.extra_data_size() + FF_INPUT_BUFFER_PADDING_SIZE));
     memcpy(codec_context_->extradata, config.extra_data(),
            config.extra_data_size());
@@ skipping 21 matching lines @@
       decode_threads < 0 || decode_threads > kMaxDecodeThreads) {
     decode_threads = kDecodeThreads;
   }
 
   // We don't allocate AVFrame on the stack since different versions of FFmpeg
   // may change the size of AVFrame, causing stack corruption.  The solution is
   // to let FFmpeg allocate the structure via avcodec_alloc_frame().
   av_frame_.reset(avcodec_alloc_frame());
   VideoCodecInfo info;
   info.success = false;
-  info.surface_width = config.surface_width();
-  info.surface_height = config.surface_height();
+  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,
-                                config.surface_width(),
-                                config.surface_height(),
+                                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 &&
       av_frame_.get()) {
     info.success = true;
@@ skipping 172 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);