Plumb through cropped output size for VideoFrame

media/tools/player_x11/gl_video_renderer.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/tools/player_x11/gl_video_renderer.h"
 
 #include <X11/Xutil.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 103 matching lines @@
       gl_context_(NULL) {
 }
 
 GlVideoRenderer::~GlVideoRenderer() {
   glXMakeCurrent(display_, 0, NULL);
   glXDestroyContext(display_, gl_context_);
 }
 
 void GlVideoRenderer::Paint(media::VideoFrame* video_frame) {
   if (!gl_context_)
-    Initialize(video_frame->data_size().width(),
-               video_frame->data_size().height());
+    Initialize(video_frame->coded_size(), video_frame->visible_rect());
 
   // Convert YUV frame to RGB.
   DCHECK(video_frame->format() == media::VideoFrame::YV12 ||
          video_frame->format() == media::VideoFrame::YV16);
   DCHECK(video_frame->stride(media::VideoFrame::kUPlane) ==
          video_frame->stride(media::VideoFrame::kVPlane));
 
   if (glXGetCurrentContext() != gl_context_ ||
       glXGetCurrentDrawable() != window_) {
     glXMakeCurrent(display_, window_, gl_context_);
   }
   for (unsigned int i = 0; i < kNumYUVPlanes; ++i) {
     unsigned int width = video_frame->stride(i);
     unsigned int height = video_frame->rows(i);
     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));
   }
 
   glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
   glXSwapBuffers(display_, window_);
 }
 
-void GlVideoRenderer::Initialize(int width, int height) {
+void GlVideoRenderer::Initialize(gfx::Size coded_size, gfx::Rect visible_rect) {
   CHECK(!gl_context_);
   LOG(INFO) << "Initializing GL Renderer...";
 
   // Resize the window to fit that of the video.
-  XResizeWindow(display_, window_, width, height);
+  XResizeWindow(display_, window_, visible_rect.width(), visible_rect.height());
 
   gl_context_ = InitGLContext(display_, window_);
   CHECK(gl_context_) << "Failed to initialize GL context";
 
   // Create 3 textures, one for each plane, and bind them to different
   // texture units.
   glGenTextures(3, textures_);
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_2D, textures_[0]);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ skipping 68 matching lines @@
   glUniform1i(glGetUniformLocation(program, "v_tex"), 2);
   int yuv2rgb_location = glGetUniformLocation(program, "yuv2rgb");
   glUniformMatrix3fv(yuv2rgb_location, 1, GL_TRUE, kYUV2RGB);
 
   int pos_location = glGetAttribLocation(program, "in_pos");
   glEnableVertexAttribArray(pos_location);
   glVertexAttribPointer(pos_location, 2, GL_FLOAT, GL_FALSE, 0, kVertices);
 
   int tc_location = glGetAttribLocation(program, "in_tc");
   glEnableVertexAttribArray(tc_location);
-  glVertexAttribPointer(tc_location, 2, GL_FLOAT, GL_FALSE, 0,
-                        kTextureCoords);
+  float verts[8];
+  float x0 = static_cast<float>(visible_rect.x()) / coded_size.width();
+  float y0 = static_cast<float>(visible_rect.y()) / coded_size.height();
+  float x1 = static_cast<float>(visible_rect.right()) / coded_size.width();
+  float y1 = static_cast<float>(visible_rect.bottom()) / coded_size.height();
+  verts[0] = x0; verts[1] = y0;
+  verts[2] = x0; verts[3] = y1;
+  verts[4] = x1; verts[5] = y0;
+  verts[6] = x1; verts[7] = y1;
+  glVertexAttribPointer(tc_location, 2, GL_FLOAT, GL_FALSE, 0, verts);
 
   // We are getting called on a thread. Release the context so that it can be
   // made current on the main thread.
   glXMakeCurrent(display_, 0, NULL);
 }