Reland r101418: Fix aspect ratio and clarify video frame dimensions

media/ffmpeg/ffmpeg_common.h

Index: media/ffmpeg/ffmpeg_common.h
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
index dec47dfaa7910ddeaa73dfd979652dc8cbbb55b0..6f04e073f61a4cc745931ff638950eeb14c20a49 100644
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -105,10 +105,10 @@ MEDIA_EXPORT bool GetStreamByteCountOverRange(AVStream* stream,
                                               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.