Fix visible size for V4L2 VDA

content/common/gpu/media/v4l2_video_decode_accelerator.h

 // Copyright 2014 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.
 //
 // This file contains an implementation of VideoDecodeAccelerator
 // that utilizes hardware video decoders, which expose Video4Linux 2 API
 // (http://linuxtv.org/downloads/v4l-dvb-apis/).
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DECODE_ACCELERATOR_H_
@@ skipping 224 matching lines @@
 
   // Attempt to start/stop device_poll_thread_.
   bool StartDevicePoll();
   // If |keep_input_state| is true, don't reset input state; used during
   // resolution change.
   bool StopDevicePoll(bool keep_input_state);
 
   void StartResolutionChangeIfNeeded();
   void FinishResolutionChange();
 
-  // Try to get output format, detected after parsing the beginning
-  // of the stream. Sets |again| to true if more parsing is needed.
-  bool GetFormatInfo(struct v4l2_format* format, bool* again);
-  // Create output buffers for the given |format|.
-  bool CreateBuffersForFormat(const struct v4l2_format& format);
+  // Try to get output format and visible size, detected after parsing the
+  // beginning of the stream. Sets |again| to true if more parsing is needed.
+  bool GetFormatInfo(struct v4l2_format* format,
+                     gfx::Size* visible_size,
+                     bool* again);
+  // Create output buffers for the given |format| and |visible_size|.
+  bool CreateBuffersForFormat(const struct v4l2_format& format,
+                              const gfx::Size& visible_size);
+
+  // Try to get |visible_size|. Return false if cropping is not supported or the
+  // crop size is not inside |coded_size|.
+  bool GetVisibleSize(const gfx::Size& coded_size, gfx::Size* visible_size);
 
   //
   // Device tasks, to be run on device_poll_thread_.
   //
 
   // The device task.
   void DevicePollTask(bool poll_device);
 
   //
   // Safe from any thread.
@@ skipping 148 matching lines @@
   // Pictures that are ready but not sent to PictureReady yet.
   std::queue<PictureRecord> pending_picture_ready_;
 
   // The number of pictures that are sent to PictureReady and will be cleared.
   int picture_clearing_count_;
 
   // Used by the decoder thread to wait for AssignPictureBuffers to arrive
   // to avoid races with potential Reset requests.
   base::WaitableEvent pictures_assigned_;
 
-  // Output picture size.
-  gfx::Size frame_buffer_size_;
+  // Output picture coded size.
+  gfx::Size coded_size_;
+
+  // Output picture visible size.
+  gfx::Size visible_size_;
 
   //
   // The device polling thread handles notifications of V4L2 device changes.
   //
 
   // The thread.
   base::Thread device_poll_thread_;
 
   //
   // Other state, held by the child (main) thread.
@@ skipping 13 matching lines @@
 
   // The WeakPtrFactory for |weak_this_|.
   base::WeakPtrFactory<V4L2VideoDecodeAccelerator> weak_this_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(V4L2VideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DECODE_ACCELERATOR_H_