Allow multiple texture ids per picture buffer.

content/renderer/pepper/pepper_video_decoder_host.cc

 // Copyright (c) 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/pepper_video_decoder_host.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
@@ skipping 261 matching lines @@
       return PP_ERROR_BADARGUMENT;
     }
     new_textures.insert(
         std::make_pair(texture_ids[i], PictureBufferState::ASSIGNED));
   }
 
   picture_buffer_map_.insert(new_textures.begin(), new_textures.end());
 
   std::vector<media::PictureBuffer> picture_buffers;
   for (uint32_t i = 0; i < texture_ids.size(); i++) {
+    media::PictureBuffer::TextureIds ids;
+    ids.push_back(texture_ids[i]);
     media::PictureBuffer buffer(
         texture_ids[i],  // Use the texture_id to identify the buffer.
-        gfx::Size(size.width, size.height),
-        texture_ids[i]);
+        gfx::Size(size.width, size.height), ids);
     picture_buffers.push_back(buffer);
   }
   decoder_->AssignPictureBuffers(picture_buffers);
   return PP_OK;
 }
 
 int32_t PepperVideoDecoderHost::OnHostMsgRecyclePicture(
     ppapi::host::HostMessageContext* context,
     uint32_t texture_id) {
   if (!initialized_)
@@ skipping 48 matching lines @@
     return PP_ERROR_FAILED;
 
   reset_reply_context_ = context->MakeReplyMessageContext();
   decoder_->Reset();
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 void PepperVideoDecoderHost::ProvidePictureBuffers(
     uint32_t requested_num_of_buffers,
+    uint32_t textures_per_buffer,
     const gfx::Size& dimensions,
     uint32_t texture_target) {
+  DCHECK_EQ(1u, textures_per_buffer);
   RequestTextures(std::max(min_picture_count_, requested_num_of_buffers),
                   dimensions,
                   texture_target,
                   std::vector<gpu::Mailbox>());
 }
 
 void PepperVideoDecoderHost::PictureReady(const media::Picture& picture) {
   PictureBufferMap::iterator it =
       picture_buffer_map_.find(picture.picture_buffer_id());
   DCHECK(it != picture_buffer_map_.end());
@@ skipping 163 matching lines @@
 
 PepperVideoDecoderHost::PendingDecodeList::iterator
 PepperVideoDecoderHost::GetPendingDecodeById(int32_t decode_id) {
   return std::find_if(pending_decodes_.begin(), pending_decodes_.end(),
                       [decode_id](const PendingDecode& item) {
                         return item.decode_id == decode_id;
                       });
 }
 
 }  // namespace content