Introduce a client minimum picture pool size

content/renderer/pepper/video_decoder_shim.cc

 // 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.
 
 #include "content/renderer/pepper/video_decoder_shim.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
@@ skipping 609 matching lines @@
 
 // DecoderImpl runs the underlying VideoDecoder on the media thread, receiving
 // calls from the VideoDecodeShim on the main thread and sending results back.
 // This class is constructed on the main thread, but used and destructed on the
 // media thread.
 class VideoDecoderShim::DecoderImpl {
  public:
   explicit DecoderImpl(const base::WeakPtr<VideoDecoderShim>& proxy);
   ~DecoderImpl();
 
-  void Initialize(media::VideoDecoderConfig config);
+  void Initialize(media::VideoDecoderConfig config, uint32_t min_picture_count);
   void Decode(uint32_t decode_id, scoped_refptr<media::DecoderBuffer> buffer);
   void Reset();
   void Stop();
 
  private:
-  void OnInitDone(bool success);
+  void OnInitDone(uint32_t min_picture_count, bool success);
   void DoDecode();
   void OnDecodeComplete(media::VideoDecoder::Status status);
   void OnOutputComplete(const scoped_refptr<media::VideoFrame>& frame);
   void OnResetComplete();
 
   // WeakPtr is bound to main_message_loop_. Use only in shim callbacks.
   base::WeakPtr<VideoDecoderShim> shim_;
   scoped_ptr<media::VideoDecoder> decoder_;
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
   // Queue of decodes waiting for the decoder.
@@ skipping 17 matching lines @@
       awaiting_decoder_(false),
       decode_id_(0),
       weak_ptr_factory_(this) {
 }
 
 VideoDecoderShim::DecoderImpl::~DecoderImpl() {
   DCHECK(pending_decodes_.empty());
 }
 
 void VideoDecoderShim::DecoderImpl::Initialize(
-    media::VideoDecoderConfig config) {
+    media::VideoDecoderConfig config, uint32_t min_picture_count) {
   DCHECK(!decoder_);
 #if !defined(MEDIA_DISABLE_LIBVPX)
   if (config.codec() == media::kCodecVP9) {
     decoder_.reset(
         new media::VpxVideoDecoder(base::ThreadTaskRunnerHandle::Get()));
   } else
 #endif
   {
     scoped_ptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder(
         new media::FFmpegVideoDecoder(base::ThreadTaskRunnerHandle::Get()));
     ffmpeg_video_decoder->set_decode_nalus(true);
     decoder_ = ffmpeg_video_decoder.Pass();
   }
 
   // VpxVideoDecoder and FFmpegVideoDecoder support only one pending Decode()
   // request.
   DCHECK_EQ(decoder_->GetMaxDecodeRequests(), 1);
 
   decoder_->Initialize(
       config, true /* low_delay */,
       base::Bind(&VideoDecoderShim::DecoderImpl::OnInitDone,
-                 weak_ptr_factory_.GetWeakPtr()),
+                 weak_ptr_factory_.GetWeakPtr(), min_picture_count),
       base::Bind(&VideoDecoderShim::DecoderImpl::OnOutputComplete,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void VideoDecoderShim::DecoderImpl::Decode(
     uint32_t decode_id,
     scoped_refptr<media::DecoderBuffer> buffer) {
   DCHECK(decoder_);
   pending_decodes_.push(PendingDecode(decode_id, buffer));
   DoDecode();
@@ skipping 17 matching lines @@
 void VideoDecoderShim::DecoderImpl::Stop() {
   DCHECK(decoder_);
   // Clear pending decodes now. We don't want OnDecodeComplete to call DoDecode
   // again.
   while (!pending_decodes_.empty())
     pending_decodes_.pop();
   decoder_.reset();
   // This instance is deleted once we exit this scope.
 }
 
-void VideoDecoderShim::DecoderImpl::OnInitDone(bool success) {
+void VideoDecoderShim::DecoderImpl::OnInitDone(
+    uint32_t min_picture_count, bool success) {
   int32_t result = success ? PP_OK : PP_ERROR_NOTSUPPORTED;
 
   // Calculate how many textures the shim should create.
-  uint32_t shim_texture_pool_size = media::limits::kMaxVideoFrames + 1;
+  uint32_t shim_texture_pool_size =
+      std::max(static_cast<uint32_t>(media::limits::kMaxVideoFrames + 1),
+               min_picture_count);
   main_task_runner_->PostTask(
       FROM_HERE, base::Bind(&VideoDecoderShim::OnInitializeComplete, shim_,
                             result, shim_texture_pool_size));
 }
 
 void VideoDecoderShim::DecoderImpl::DoDecode() {
   if (pending_decodes_.empty() || awaiting_decoder_)
     return;
 
   awaiting_decoder_ = true;
@@ skipping 87 matching lines @@
   // The callback now holds the only reference to the DecoderImpl, which will be
   // deleted when Stop completes.
   media_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&VideoDecoderShim::DecoderImpl::Stop,
                  base::Owned(decoder_impl_.release())));
 }
 
 bool VideoDecoderShim::Initialize(
     media::VideoCodecProfile profile,
+    uint32 min_picture_count,
     media::VideoDecodeAccelerator::Client* client) {
   DCHECK_EQ(client, host_);
   DCHECK(RenderThreadImpl::current());
   DCHECK_EQ(state_, UNINITIALIZED);
   media::VideoCodec codec = media::kUnknownVideoCodec;
   if (profile <= media::H264PROFILE_MAX)
     codec = media::kCodecH264;
   else if (profile <= media::VP8PROFILE_MAX)
     codec = media::kCodecVP8;
   else if (profile <= media::VP9PROFILE_MAX)
@@ skipping 12 matching lines @@
       gfx::Rect(32, 24),
       gfx::Size(32, 24),
       NULL /* extra_data */,  // TODO(bbudge) Verify this isn't needed.
       0 /* extra_data_size */,
       false /* decryption */);
 
   media_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&VideoDecoderShim::DecoderImpl::Initialize,
                  base::Unretained(decoder_impl_.get()),
-                 config));
+                 config,
+                 min_picture_count));
   // Return success, even though we are asynchronous, to mimic
   // media::VideoDecodeAccelerator.
   return true;
 }
 
 void VideoDecoderShim::Decode(const media::BitstreamBuffer& bitstream_buffer) {
   DCHECK(RenderThreadImpl::current());
   DCHECK_EQ(state_, DECODING);
 
   // We need the address of the shared memory, so we can copy the buffer.
@@ skipping 205 matching lines @@
 void VideoDecoderShim::DeleteTexture(uint32_t texture_id) {
   gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
   gles2->DeleteTextures(1, &texture_id);
 }
 
 void VideoDecoderShim::FlushCommandBuffer() {
   context_provider_->ContextGL()->Flush();
 }
 
 }  // namespace content