Allow multiple texture ids per picture buffer.

content/common/gpu/media/gpu_video_decode_accelerator.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 37 matching lines @@
   // capabilities will not contain duplicate supported profile entries.
   static gpu::VideoDecodeAcceleratorCapabilities GetCapabilities(
       const gpu::GpuPreferences& gpu_preferences);
 
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // media::VideoDecodeAccelerator::Client implementation.
   void NotifyCdmAttached(bool success) override;
   void ProvidePictureBuffers(uint32_t requested_num_of_buffers,
+                             uint32_t textures_per_buffer,
                              const gfx::Size& dimensions,
                              uint32_t texture_target) override;
   void DismissPictureBuffer(int32_t picture_buffer_id) override;
   void PictureReady(const media::Picture& picture) override;
   void NotifyEndOfBitstreamBuffer(int32_t bitstream_buffer_id) override;
   void NotifyFlushDone() override;
   void NotifyResetDone() override;
   void NotifyError(media::VideoDecodeAccelerator::Error error) override;
 
   // GpuCommandBufferStub::DestructionObserver implementation.
@@ skipping 33 matching lines @@
 #if defined(OS_ANDROID)
   scoped_ptr<media::VideoDecodeAccelerator> CreateAndroidVDA();
 #endif
 
   // We only allow self-delete, from OnWillDestroyStub(), after cleanup there.
   ~GpuVideoDecodeAccelerator() override;
 
   // Handlers for IPC messages.
   void OnSetCdm(int cdm_id);
   void OnDecode(const media::BitstreamBuffer& bitstream_buffer);
-  void OnAssignPictureBuffers(const std::vector<int32_t>& buffer_ids,
-                              const std::vector<uint32_t>& texture_ids);
+  void OnAssignPictureBuffers(
+      const std::vector<int32_t>& buffer_ids,
+      const std::vector<media::PictureBuffer::TextureIds>& texture_ids);
   void OnReusePictureBuffer(int32_t picture_buffer_id);
   void OnFlush();
   void OnReset();
   void OnDestroy();
 
   // Called on IO thread when |filter_| has been removed.
   void OnFilterRemoved();
 
   // Sets the texture to cleared.
   void SetTextureCleared(const media::Picture& picture);
@@ skipping 19 matching lines @@
   // Callback for making the relevant context current for GL calls.
   // Returns false if failed.
   base::Callback<bool(void)> make_context_current_;
 
   // The texture dimensions as requested by ProvidePictureBuffers().
   gfx::Size texture_dimensions_;
 
   // The texture target as requested by ProvidePictureBuffers().
   uint32_t texture_target_;
 
+  // The number of textures per picture buffer as requests by
+  // ProvidePictureBuffers()
+  uint32_t textures_per_buffer_;
+
   // The message filter to run VDA::Decode on IO thread if VDA supports it.
   scoped_refptr<MessageFilter> filter_;
 
   // Used to wait on for |filter_| to be removed, before we can safely
   // destroy the VDA.
   base::WaitableEvent filter_removed_;
 
   // GPU child thread task runner.
   const scoped_refptr<base::SingleThreadTaskRunner> child_task_runner_;
 
@@ skipping 10 matching lines @@
 
   // A map from picture buffer ID to TextureRef that have not been cleared.
   std::map<int32_t, scoped_refptr<gpu::gles2::TextureRef>> uncleared_textures_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(GpuVideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_