V4L2SVDA/VAAPIVDA: use visible size from decoder and pass to client

media/gpu/vaapi_video_decode_accelerator.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/gpu/vaapi_video_decode_accelerator.h"
 
 #include <string.h>
 
 #include <memory>
 
@@ skipping 49 matching lines @@
   } while (0)
 
 class VaapiVideoDecodeAccelerator::VaapiDecodeSurface
     : public base::RefCountedThreadSafe<VaapiDecodeSurface> {
  public:
   VaapiDecodeSurface(int32_t bitstream_id,
                      const scoped_refptr<VASurface>& va_surface);
 
   int32_t bitstream_id() const { return bitstream_id_; }
   scoped_refptr<VASurface> va_surface() { return va_surface_; }
+  gfx::Rect visible_rect() const { return visible_rect_; }
+
+  void SetVisibleRect(const gfx::Rect& visible_rect) {
+    visible_rect_ = visible_rect;
+  }
 
  private:
   friend class base::RefCountedThreadSafe<VaapiDecodeSurface>;
   ~VaapiDecodeSurface();
 
   int32_t bitstream_id_;
   scoped_refptr<VASurface> va_surface_;
+  gfx::Rect visible_rect_;
 };
 
 VaapiVideoDecodeAccelerator::VaapiDecodeSurface::VaapiDecodeSurface(
     int32_t bitstream_id,
     const scoped_refptr<VASurface>& va_surface)
     : bitstream_id_(bitstream_id), va_surface_(va_surface) {}
 
 VaapiVideoDecodeAccelerator::VaapiDecodeSurface::~VaapiDecodeSurface() {}
 
 class VaapiH264Picture : public H264Picture {
@@ skipping 42 matching lines @@
 
   bool SubmitSlice(const H264PPS* pps,
                    const H264SliceHeader* slice_hdr,
                    const H264Picture::Vector& ref_pic_list0,
                    const H264Picture::Vector& ref_pic_list1,
                    const scoped_refptr<H264Picture>& pic,
                    const uint8_t* data,
                    size_t size) override;
 
   bool SubmitDecode(const scoped_refptr<H264Picture>& pic) override;
-  bool OutputPicture(const scoped_refptr<H264Picture>& pic) override;
+  bool OutputPicture(const scoped_refptr<H264Picture>& pic,
+                     const gfx::Rect& visible_rect) override;
 
   void Reset() override;
 
  private:
   scoped_refptr<VaapiDecodeSurface> H264PictureToVaapiDecodeSurface(
       const scoped_refptr<H264Picture>& pic);
 
   void FillVAPicture(VAPictureH264* va_pic, scoped_refptr<H264Picture> pic);
   int FillVARefFramesFromDPB(const H264DPB& dpb,
                              VAPictureH264* va_pics,
@@ skipping 40 matching lines @@
 
   // VP8Decoder::VP8Accelerator implementation.
   scoped_refptr<VP8Picture> CreateVP8Picture() override;
 
   bool SubmitDecode(const scoped_refptr<VP8Picture>& pic,
                     const Vp8FrameHeader* frame_hdr,
                     const scoped_refptr<VP8Picture>& last_frame,
                     const scoped_refptr<VP8Picture>& golden_frame,
                     const scoped_refptr<VP8Picture>& alt_frame) override;
 
-  bool OutputPicture(const scoped_refptr<VP8Picture>& pic) override;
+  bool OutputPicture(const scoped_refptr<VP8Picture>& pic,
+                     const gfx::Rect& visible_rect) override;
 
  private:
   scoped_refptr<VaapiDecodeSurface> VP8PictureToVaapiDecodeSurface(
       const scoped_refptr<VP8Picture>& pic);
 
   VaapiWrapper* vaapi_wrapper_;
   VaapiVideoDecodeAccelerator* vaapi_dec_;
 
   DISALLOW_COPY_AND_ASSIGN(VaapiVP8Accelerator);
 };
@@ skipping 33 matching lines @@
 
   // VP9Decoder::VP9Accelerator implementation.
   scoped_refptr<VP9Picture> CreateVP9Picture() override;
 
   bool SubmitDecode(const scoped_refptr<VP9Picture>& pic,
                     const Vp9SegmentationParams& seg,
                     const Vp9LoopFilterParams& lf,
                     const std::vector<scoped_refptr<VP9Picture>>& ref_pictures,
                     const base::Closure& done_cb) override;
 
-  bool OutputPicture(const scoped_refptr<VP9Picture>& pic) override;
+  bool OutputPicture(const scoped_refptr<VP9Picture>& pic,
+                     const gfx::Rect& visible_rect) override;
 
   bool IsFrameContextRequired() const override { return false; }
 
   bool GetFrameContext(const scoped_refptr<VP9Picture>& pic,
                        Vp9FrameContext* frame_ctx) override;
 
  private:
   scoped_refptr<VaapiDecodeSurface> VP9PictureToVaapiDecodeSurface(
       const scoped_refptr<VP9Picture>& pic);
 
@@ skipping 137 matching lines @@
   decoder_thread_task_runner_ = decoder_thread_.task_runner();
 
   state_ = kIdle;
   output_mode_ = config.output_mode;
   return true;
 }
 
 void VaapiVideoDecodeAccelerator::OutputPicture(
     const scoped_refptr<VASurface>& va_surface,
     int32_t input_id,
+    gfx::Rect visible_rect,
     VaapiPicture* picture) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   int32_t output_id = picture->picture_buffer_id();
 
   TRACE_EVENT2("Video Decoder", "VAVDA::OutputSurface", "input_id", input_id,
                "output_id", output_id);
 
   DVLOG(3) << "Outputting VASurface " << va_surface->id()
            << " into pixmap bound to picture buffer id " << output_id;
 
   RETURN_AND_NOTIFY_ON_FAILURE(picture->DownloadFromSurface(va_surface),
                                "Failed putting surface into pixmap",
                                PLATFORM_FAILURE, );
 
   // Notify the client a picture is ready to be displayed.
   ++num_frames_at_client_;
   TRACE_COUNTER1("Video Decoder", "Textures at client", num_frames_at_client_);
-  DVLOG(4) << "Notifying output picture id " << output_id
-           << " for input " << input_id << " is ready";
-  // TODO(posciak): Use visible size from decoder here instead
-  // (crbug.com/402760). Passing (0, 0) results in the client using the
-  // visible size extracted from the container instead.
+  DVLOG(4) << "Notifying output picture id " << output_id << " for input "
+           << input_id
+           << " is ready. visible rect: " << visible_rect.ToString();
   // TODO(hubbe): Use the correct color space.  http://crbug.com/647725
   if (client_)
-    client_->PictureReady(Picture(output_id, input_id, gfx::Rect(0, 0),
+    client_->PictureReady(Picture(output_id, input_id, visible_rect,
                                   gfx::ColorSpace(), picture->AllowOverlay()));
 }
 
 void VaapiVideoDecodeAccelerator::TryOutputSurface() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Handle Destroy() arriving while pictures are queued for output.
   if (!client_)
     return;
 
@@ skipping 688 matching lines @@
 
   {
     base::AutoLock auto_lock(lock_);
     // Drop any requests to output if we are resetting or being destroyed.
     if (state_ == kResetting || state_ == kDestroying)
       return;
   }
 
   pending_output_cbs_.push(
       base::Bind(&VaapiVideoDecodeAccelerator::OutputPicture, weak_this_,
-                 dec_surface->va_surface(), dec_surface->bitstream_id()));
+                 dec_surface->va_surface(), dec_surface->bitstream_id(),
+                 dec_surface->visible_rect()));
 
   TryOutputSurface();
 }
 
 scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface>
 VaapiVideoDecodeAccelerator::CreateSurface() {
   DCHECK(decoder_thread_task_runner_->BelongsToCurrentThread());
   base::AutoLock auto_lock(lock_);
 
   if (available_va_surfaces_.empty())
@@ skipping 259 matching lines @@
 bool VaapiVideoDecodeAccelerator::VaapiH264Accelerator::SubmitDecode(
     const scoped_refptr<H264Picture>& pic) {
   DVLOG(4) << "Decoding POC " << pic->pic_order_cnt;
   scoped_refptr<VaapiDecodeSurface> dec_surface =
       H264PictureToVaapiDecodeSurface(pic);
 
   return vaapi_dec_->DecodeSurface(dec_surface);
 }
 
 bool VaapiVideoDecodeAccelerator::VaapiH264Accelerator::OutputPicture(
-    const scoped_refptr<H264Picture>& pic) {
+    const scoped_refptr<H264Picture>& pic,
+    const gfx::Rect& visible_rect) {
   scoped_refptr<VaapiDecodeSurface> dec_surface =
       H264PictureToVaapiDecodeSurface(pic);
-
+  dec_surface->SetVisibleRect(visible_rect);
   vaapi_dec_->SurfaceReady(dec_surface);
 
   return true;
 }
 
 void VaapiVideoDecodeAccelerator::VaapiH264Accelerator::Reset() {
   vaapi_wrapper_->DestroyPendingBuffers();
 }
 
 scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface>
@@ skipping 263 matching lines @@
                                     frame_hdr->frame_size, non_const_ptr))
     return false;
 
   scoped_refptr<VaapiDecodeSurface> dec_surface =
       VP8PictureToVaapiDecodeSurface(pic);
 
   return vaapi_dec_->DecodeSurface(dec_surface);
 }
 
 bool VaapiVideoDecodeAccelerator::VaapiVP8Accelerator::OutputPicture(
-    const scoped_refptr<VP8Picture>& pic) {
+    const scoped_refptr<VP8Picture>& pic,
+    const gfx::Rect& visible_rect) {
   scoped_refptr<VaapiDecodeSurface> dec_surface =
       VP8PictureToVaapiDecodeSurface(pic);
-
+  dec_surface->SetVisibleRect(visible_rect);
   vaapi_dec_->SurfaceReady(dec_surface);
   return true;
 }
 
 scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface>
 VaapiVideoDecodeAccelerator::VaapiVP8Accelerator::
     VP8PictureToVaapiDecodeSurface(const scoped_refptr<VP8Picture>& pic) {
   VaapiVP8Picture* vaapi_pic = pic->AsVaapiVP8Picture();
   CHECK(vaapi_pic);
   return vaapi_pic->dec_surface();
@@ skipping 140 matching lines @@
                                     frame_hdr->frame_size, non_const_ptr))
     return false;
 
   scoped_refptr<VaapiDecodeSurface> dec_surface =
       VP9PictureToVaapiDecodeSurface(pic);
 
   return vaapi_dec_->DecodeSurface(dec_surface);
 }
 
 bool VaapiVideoDecodeAccelerator::VaapiVP9Accelerator::OutputPicture(
-    const scoped_refptr<VP9Picture>& pic) {
+    const scoped_refptr<VP9Picture>& pic,
+    const gfx::Rect& visible_rect) {
   scoped_refptr<VaapiDecodeSurface> dec_surface =
       VP9PictureToVaapiDecodeSurface(pic);
-
+  dec_surface->SetVisibleRect(visible_rect);
   vaapi_dec_->SurfaceReady(dec_surface);
   return true;
 }
 
 bool VaapiVideoDecodeAccelerator::VaapiVP9Accelerator::GetFrameContext(
     const scoped_refptr<VP9Picture>& pic,
     Vp9FrameContext* frame_ctx) {
   NOTIMPLEMENTED() << "Frame context update not supported";
   return false;
 }
 
 scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface>
 VaapiVideoDecodeAccelerator::VaapiVP9Accelerator::
     VP9PictureToVaapiDecodeSurface(const scoped_refptr<VP9Picture>& pic) {
   VaapiVP9Picture* vaapi_pic = pic->AsVaapiVP9Picture();
   CHECK(vaapi_pic);
   return vaapi_pic->dec_surface();
 }
 
 // static
 VideoDecodeAccelerator::SupportedProfiles
 VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
   return VaapiWrapper::GetSupportedDecodeProfiles();
 }
 
 }  // namespace media