Remove VideoDecoder::natural_size() & added VideoFrame::natural_size().

media/filters/ffmpeg_video_decoder.cc

 // Copyright (c) 2012 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/filters/ffmpeg_video_decoder.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 57 matching lines @@
   // Don't use |codec_context_| here! With threaded decoding,
   // it will contain unsynchronized width/height/pix_fmt values,
   // whereas |codec_context| contains the current threads's
   // updated width/height/pix_fmt, which can change for adaptive
   // content.
   VideoFrame::Format format = PixelFormatToVideoFormat(codec_context->pix_fmt);
   if (format == VideoFrame::INVALID)
     return AVERROR(EINVAL);
   DCHECK(format == VideoFrame::YV12 || format == VideoFrame::YV16);
 
-  int width = codec_context->width;
-  int height = codec_context->height;
+  gfx::Size size(codec_context->width, codec_context->height);
   int ret;
-  if ((ret = av_image_check_size(width, height, 0, NULL)) < 0)
+  if ((ret = av_image_check_size(size.width(), size.height(), 0, NULL)) < 0)
     return ret;
 
+  gfx::Size natural_size;
+  if (codec_context->sample_aspect_ratio.num > 0) {
+    natural_size = GetNaturalSize(size,
+                                  codec_context->sample_aspect_ratio.num,
+                                  codec_context->sample_aspect_ratio.den);
+  } else {
+    natural_size = demuxer_stream_->video_decoder_config().natural_size();
+  }
+
   scoped_refptr<VideoFrame> video_frame =
-      VideoFrame::CreateFrame(format, width, height, kNoTimestamp());
+      VideoFrame::CreateFrame(format, size, natural_size, kNoTimestamp());
 
   for (int i = 0; i < 3; i++) {
     frame->base[i] = video_frame->data(i);
     frame->data[i] = video_frame->data(i);
     frame->linesize[i] = video_frame->stride(i);
   }
 
   frame->opaque = video_frame.release();
   frame->type = FF_BUFFER_TYPE_USER;
   frame->pkt_pts = codec_context->pkt ? codec_context->pkt->pts :
@@ skipping 82 matching lines @@
   }
 
   if (avcodec_open2(codec_context_, codec, NULL) < 0) {
     status_cb.Run(PIPELINE_ERROR_DECODE);
     return;
   }
 
   // Success!
   state_ = kNormal;
   av_frame_ = avcodec_alloc_frame();
-  natural_size_ = config.natural_size();
   status_cb.Run(PIPELINE_OK);
 }
 
 void FFmpegVideoDecoder::Read(const ReadCB& read_cb) {
   // Complete operation asynchronously on different stack of execution as per
   // the API contract of VideoDecoder::Read()
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &FFmpegVideoDecoder::DoRead, this, read_cb));
 }
 
@@ skipping 37 matching lines @@
 
   DoStop();
 }
 
 void FFmpegVideoDecoder::DoStop() {
   ReleaseFFmpegResources();
   state_ = kUninitialized;
   base::ResetAndReturn(&stop_cb_).Run();
 }
 
-const gfx::Size& FFmpegVideoDecoder::natural_size() {
-  return natural_size_;
-}
-
 void FFmpegVideoDecoder::set_decryptor(Decryptor* decryptor) {
   DCHECK_EQ(state_, kUninitialized);
   decryptor_ = decryptor;
 }
 
 FFmpegVideoDecoder::~FFmpegVideoDecoder() {
   ReleaseFFmpegResources();
 }
 
 void FFmpegVideoDecoder::DoRead(const ReadCB& read_cb) {
@@ skipping 253 matching lines @@
     av_free(codec_context_);
     codec_context_ = NULL;
   }
   if (av_frame_) {
     av_free(av_frame_);
     av_frame_ = NULL;
   }
 }
 
 }  // namespace media