Reland r101418: Fix aspect ratio and clarify video frame dimensions

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 169 matching lines @@
       start_ie->pos >= end_ie->pos) {
     return false;
   }
 
   *bytes = end_ie->pos - start_ie->pos;
   *range_start = ConvertFromTimeBase(stream->time_base, start_ie->timestamp);
   *range_end = ConvertFromTimeBase(stream->time_base, end_ie->timestamp);
   return true;
 }
 
-int GetSurfaceHeight(AVStream* stream) {
+int GetNaturalHeight(AVStream* stream) {
   return stream->codec->height;
 }
 
-int GetSurfaceWidth(AVStream* stream) {
+int GetNaturalWidth(AVStream* stream) {
   double aspect_ratio;
 
   if (stream->sample_aspect_ratio.num)
     aspect_ratio = av_q2d(stream->sample_aspect_ratio);
   else if (stream->codec->sample_aspect_ratio.num)
     aspect_ratio = av_q2d(stream->codec->sample_aspect_ratio);
   else
     aspect_ratio = 1.0;
 
   int width = floor(stream->codec->width * aspect_ratio + 0.5);
@@ skipping 23 matching lines @@
         avcodec_close(stream->codec);
       }
     }
   }
 
   // Then finally cleanup the format context.
   av_close_input_file(format_context);
 }
 
 }  // namespace media