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

media/gpu/vp9_decoder.cc

 // Copyright 2015 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/vp9_decoder.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 92 matching lines @@
         SetError();
         return kDecodeError;
       }
 
       curr_frame_hdr_.reset();
       continue;
     }
 
     gfx::Size new_pic_size(curr_frame_hdr_->frame_width,
                            curr_frame_hdr_->frame_height);
+    gfx::Rect new_render_rect(curr_frame_hdr_->render_width,
+                              curr_frame_hdr_->render_height);
     DCHECK(!new_pic_size.IsEmpty());
+    DCHECK(!new_render_rect.IsEmpty());
 
-    if (new_pic_size != pic_size_) {
-      DVLOG(1) << "New resolution: " << new_pic_size.ToString();
+    if (new_pic_size != pic_size_ || new_render_rect != render_rect_) {

[Owen Lin, 2017/06/07 06:11:00]

Same, we don't care about the visible crop here.

[johnylin1, 2017/06/07 15:38:37]

Done.

+      DVLOG(1) << "New resolution: " << new_pic_size.ToString()
+               << ", New render resolution: " << new_render_rect.ToString();
 
       if (!curr_frame_hdr_->IsKeyframe()) {
         // TODO(posciak): This is doable, but requires a few modifications to
         // VDA implementations to allow multiple picture buffer sets in flight.
         DVLOG(1) << "Resolution change currently supported for keyframes only";
         SetError();
         return kDecodeError;
       }
 
       // TODO(posciak): This requires us to be on a keyframe (see above) and is
       // required, because VDA clients expect all surfaces to be returned before
       // they can cycle surface sets after receiving kAllocateNewSurfaces.
       // This is only an implementation detail of VDAs and can be improved.
       for (auto& ref_frame : ref_frames_)
         ref_frame = nullptr;
 
       pic_size_ = new_pic_size;
+      render_rect_ = new_render_rect;
       return kAllocateNewSurfaces;
     }
 
     scoped_refptr<VP9Picture> pic = accelerator_->CreateVP9Picture();
     if (!pic)
       return kRanOutOfSurfaces;
 
     pic->frame_hdr.reset(curr_frame_hdr_.release());
 
     if (!DecodeAndOutputPicture(pic)) {
@@ skipping 53 matching lines @@
 
 void VP9Decoder::SetError() {
   Reset();
   state_ = kError;
 }
 
 gfx::Size VP9Decoder::GetPicSize() const {
   return pic_size_;
 }
 
+gfx::Rect VP9Decoder::GetVisibleRect() const {
+  return render_rect_;
+}
+
 size_t VP9Decoder::GetRequiredNumOfPictures() const {
   // kMaxVideoFrames to keep higher level media pipeline populated, +2 for the
   // pictures being parsed and decoded currently.
   return limits::kMaxVideoFrames + kVp9NumRefFrames + 2;
 }
 
 }  // namespace media