Allow multiple texture ids per picture buffer.

content/renderer/pepper/ppb_video_decoder_impl.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 "content/renderer/pepper/ppb_video_decoder_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 165 matching lines @@
     const PP_PictureBuffer_Dev* buffers) {
   if (!decoder_)
     return;
   UMA_HISTOGRAM_COUNTS_100("Media.PepperVideoDecoderPictureCount",
                            no_of_buffers);
 
   std::vector<media::PictureBuffer> wrapped_buffers;
   for (uint32_t i = 0; i < no_of_buffers; i++) {
     PP_PictureBuffer_Dev in_buf = buffers[i];
     DCHECK_GE(in_buf.id, 0);
+    media::PictureBuffer::TextureIds pepper_buffers;

[raymes, 2016/03/31 00:09:25]

nit: perhaps keep the naming similar to the other file (pepper_buffers vs ids)

+    pepper_buffers.push_back(in_buf.texture_id);
     media::PictureBuffer buffer(
-        in_buf.id,
-        gfx::Size(in_buf.size.width, in_buf.size.height),
-        in_buf.texture_id);
+        in_buf.id, gfx::Size(in_buf.size.width, in_buf.size.height),
+        pepper_buffers);
     wrapped_buffers.push_back(buffer);
     UMA_HISTOGRAM_COUNTS_10000("Media.PepperVideoDecoderPictureHeight",
                                in_buf.size.height);
   }
 
   FlushCommandBuffer();
   decoder_->AssignPictureBuffers(wrapped_buffers);
 }
 
 void PPB_VideoDecoder_Impl::ReusePictureBuffer(int32_t picture_buffer_id) {
@@ skipping 32 matching lines @@
   FlushCommandBuffer();
 
   decoder_.reset();
   ppp_videodecoder_ = NULL;
 
   ::ppapi::PPB_VideoDecoder_Shared::Destroy();
 }
 
 void PPB_VideoDecoder_Impl::ProvidePictureBuffers(
     uint32_t requested_num_of_buffers,
+    uint32_t textures_per_buffer,
     const gfx::Size& dimensions,
     uint32_t texture_target) {
   DCHECK(RenderThreadImpl::current());
+  DCHECK_EQ(1u, textures_per_buffer);
   if (!GetPPP())
     return;
 
   PP_Size out_dim = PP_MakeSize(dimensions.width(), dimensions.height());
   GetPPP()->ProvidePictureBuffers(pp_instance(), pp_resource(),
                                   requested_num_of_buffers, &out_dim,
                                   texture_target);
 }
 
 void PPB_VideoDecoder_Impl::PictureReady(const media::Picture& picture) {
@@ skipping 40 matching lines @@
   DCHECK(RenderThreadImpl::current());
   RunBitstreamBufferCallback(bitstream_buffer_id, PP_OK);
 }
 
 void PPB_VideoDecoder_Impl::NotifyFlushDone() {
   DCHECK(RenderThreadImpl::current());
   RunFlushCallback(PP_OK);
 }
 
 }  // namespace content