Allow multiple texture ids per picture buffer.

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>
 #include <utility>
@@ skipping 926 matching lines @@
   DCHECK_NE(state_, UNINITIALIZED);
   if (buffers.empty()) {
     NOTREACHED();
     return;
   }
   DCHECK_EQ(buffers.size(), pending_texture_mailboxes_.size());
   GLuint num_textures = base::checked_cast<GLuint>(buffers.size());
   std::vector<uint32_t> local_texture_ids(num_textures);
   gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
   for (uint32_t i = 0; i < num_textures; i++) {
+    if (buffers[i].texture_ids().empty())
+      continue;

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

Could this case actually happen?

     local_texture_ids[i] = gles2->CreateAndConsumeTextureCHROMIUM(
         GL_TEXTURE_2D, pending_texture_mailboxes_[i].name);
     // Map the plugin texture id to the local texture id.
-    uint32_t plugin_texture_id = buffers[i].texture_id();
+    uint32_t plugin_texture_id = buffers[i].texture_ids()[0];
     texture_id_map_[plugin_texture_id] = local_texture_ids[i];
     available_textures_.insert(plugin_texture_id);
   }
   pending_texture_mailboxes_.clear();
   SendPictures();
 }
 
 void VideoDecoderShim::ReusePictureBuffer(int32_t picture_buffer_id) {
   DCHECK(RenderThreadImpl::current());
   uint32_t texture_id = static_cast<uint32_t>(picture_buffer_id);
@@ skipping 159 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