Allow multiple texture ids per picture buffer.

content/common/gpu/media/vt_video_decode_accelerator_mac.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 <algorithm>
 
 #include <CoreVideo/CoreVideo.h>
 #include <OpenGL/CGLIOSurface.h>
 #include <OpenGL/gl.h>
 #include <stddef.h>
@@ skipping 820 matching lines @@
 }
 
 void VTVideoDecodeAccelerator::AssignPictureBuffers(
     const std::vector<media::PictureBuffer>& pictures) {
   DCHECK(gpu_thread_checker_.CalledOnValidThread());
 
   for (const media::PictureBuffer& picture : pictures) {
     DCHECK(!picture_info_map_.count(picture.id()));
     assigned_picture_ids_.insert(picture.id());
     available_picture_ids_.push_back(picture.id());
+    DCHECK_LE(1u, picture.internal_texture_ids().size());
+    DCHECK_LE(1u, picture.texture_ids().size());
     picture_info_map_.insert(std::make_pair(
         picture.id(),
-        make_scoped_ptr(new PictureInfo(picture.internal_texture_id(),
-                                        picture.texture_id()))));
+        make_scoped_ptr(new PictureInfo(picture.internal_texture_ids()[0],
+                                        picture.texture_ids()[0]))));
   }
 
   // Pictures are not marked as uncleared until after this method returns, and
   // they will be broken if they are used before that happens. So, schedule
   // future work after that happens.
   gpu_task_runner_->PostTask(FROM_HERE, base::Bind(
       &VTVideoDecodeAccelerator::ProcessWorkQueues, weak_this_));
 }
 
 void VTVideoDecodeAccelerator::ReusePictureBuffer(int32_t picture_id) {
@@ skipping 136 matching lines @@
     // size passed to ProvidePictureBuffers() is meaningless.
     if (picture_size_ != frame.coded_size) {
       // Dismiss current pictures.
       for (int32_t picture_id : assigned_picture_ids_)
         client_->DismissPictureBuffer(picture_id);
       assigned_picture_ids_.clear();
       available_picture_ids_.clear();
 
       // Request new pictures.
       picture_size_ = frame.coded_size;
-      client_->ProvidePictureBuffers(
-          kNumPictureBuffers, coded_size_, GL_TEXTURE_RECTANGLE_ARB);
+      client_->ProvidePictureBuffers(kNumPictureBuffers, 1, coded_size_,
+                                     GL_TEXTURE_RECTANGLE_ARB);
       return false;
     }
     if (!SendFrame(frame))
       return false;
   }
 
   return true;
 }
 
 bool VTVideoDecodeAccelerator::SendFrame(const Frame& frame) {
@@ skipping 117 matching lines @@
     SupportedProfile profile;
     profile.profile = supported_profile;
     profile.min_resolution.SetSize(16, 16);
     profile.max_resolution.SetSize(4096, 2160);
     profiles.push_back(profile);
   }
   return profiles;
 }
 
 }  // namespace content