Reland r101418: Fix aspect ratio and clarify video frame dimensions

media/tools/player_x11/gl_video_renderer.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/tools/player_x11/gl_video_renderer.h"
 
 #include <X11/Xutil.h>
 
 #include "base/message_loop.h"
 #include "media/base/buffers.h"
@@ skipping 110 matching lines @@
     "  gl_FragColor = vec4(rgb, 1);\n"
     "}\n";
 
 // Buffer size for compile errors.
 static const unsigned int kErrorSize = 4096;
 
 bool GlVideoRenderer::OnInitialize(media::VideoDecoder* decoder) {
   LOG(INFO) << "Initializing GL Renderer...";
 
   // Resize the window to fit that of the video.
-  XResizeWindow(display_, window_, decoder->width(), decoder->height());
+  XResizeWindow(display_, window_, decoder->natural_size().width(),
+                decoder->natural_size().height());
 
   gl_context_ = InitGLContext(display_, window_);
   if (!gl_context_)
     return false;
 
   // Create 3 textures, one for each plane, and bind them to different
   // texture units.
   glGenTextures(media::VideoFrame::kNumYUVPlanes, textures_);
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_2D, textures_[0]);
@@ skipping 123 matching lines @@
     glActiveTexture(GL_TEXTURE0 + i);
     glPixelStorei(GL_UNPACK_ROW_LENGTH, video_frame->stride(i));
     glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, width, height, 0,
                  GL_LUMINANCE, GL_UNSIGNED_BYTE, video_frame->data(i));
   }
   PutCurrentFrame(video_frame);
 
   glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
   glXSwapBuffers(display_, window_);
 }