Reland r101418: Fix aspect ratio and clarify video frame dimensions

media/ffmpeg/ffmpeg_common.h

 // 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.
 
 #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_
 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_
 
 // Used for FFmpeg error codes.
 #include <cerrno>
 
@@ skipping 87 matching lines @@
 // |range_end| - The end time for the range covered by |bytes|. This may be
 //               different than |end_time| if the index doesn't have data for
 //               that exact time. |range_end| >= |end_time|
 MEDIA_EXPORT bool GetStreamByteCountOverRange(AVStream* stream,
                                               const base::TimeDelta& start_time,
                                               const base::TimeDelta& end_time,
                                               int64* bytes,
                                               base::TimeDelta* range_start,
                                               base::TimeDelta* range_end);
 
-// Calculates the width and height of the video surface using the video's
+// Calculates the natural width and height of the video using the video's
 // encoded dimensions and sample_aspect_ratio.
-int GetSurfaceHeight(AVStream* stream);
-int GetSurfaceWidth(AVStream* stream);
+int GetNaturalHeight(AVStream* stream);
+int GetNaturalWidth(AVStream* stream);
 
 // Closes & destroys all AVStreams in the context and then closes &
 // destroys the AVFormatContext.
 void DestroyAVFormatContext(AVFormatContext* format_context);
 
 }  // namespace media
 
 #endif  // MEDIA_FFMPEG_FFMPEG_COMMON_H_