Allow multiple texture ids per picture buffer.

content/common/gpu/media/media_messages.h

 // Copyright 2016 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.
 
 // Multiply-included message file, hence no include guard here, but see below
 // for a much smaller-than-usual include guard section.
 
 #include "content/common/content_export.h"
 #include "content/common/gpu/media/create_video_encoder_params.h"
 #include "gpu/config/gpu_info.h"
@@ skipping 92 matching lines @@
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::CreateVideoEncoderParams)
   IPC_STRUCT_TRAITS_MEMBER(input_format)
   IPC_STRUCT_TRAITS_MEMBER(input_visible_size)
   IPC_STRUCT_TRAITS_MEMBER(output_profile)
   IPC_STRUCT_TRAITS_MEMBER(initial_bitrate)
   IPC_STRUCT_TRAITS_MEMBER(encoder_route_id)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(media::PictureBuffer::TextureIds)
+  IPC_STRUCT_TRAITS_MEMBER(ids[0])
+  IPC_STRUCT_TRAITS_MEMBER(ids[1])
+  IPC_STRUCT_TRAITS_MEMBER(ids[2])
+  IPC_STRUCT_TRAITS_MEMBER(ids[3])
+IPC_STRUCT_TRAITS_END()
+
 //------------------------------------------------------------------------------
 // Accelerated Video Decoder Messages
 // These messages are sent from Renderer process to GPU process.
 
 // Create and initialize a hardware video decoder using the specified route_id.
 // Created decoders should be freed with AcceleratedVideoDecoderMsg_Destroy when
 // no longer needed.
 IPC_SYNC_MESSAGE_ROUTED2_1(GpuCommandBufferMsg_CreateVideoDecoder,
                            media::VideoDecodeAccelerator::Config /* config */,
                            int32_t /* decoder_route_id */,
                            bool /* succeeded */)
 
 // Set a CDM on the decoder to handle encrypted buffers.
 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderMsg_SetCdm, int32_t /* CDM ID */)
 
 // Send input buffer for decoding.
 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderMsg_Decode, media::BitstreamBuffer)
 
 // Give the texture IDs for the textures the decoder will use for output.
-IPC_MESSAGE_ROUTED2(AcceleratedVideoDecoderMsg_AssignPictureBuffers,
-                    std::vector<int32_t>,  /* Picture buffer ID */
-                    std::vector<uint32_t>) /* Texture ID */
+IPC_MESSAGE_ROUTED2(
+    AcceleratedVideoDecoderMsg_AssignPictureBuffers,
+    std::vector<int32_t>,                          /* Picture buffer ID */
+    std::vector<media::PictureBuffer::TextureIds>) /* Texture ID */
 
 // Send from Renderer process to the GPU process to recycle the given picture
 // buffer for further decoding.
 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderMsg_ReusePictureBuffer,
                     int32_t) /* Picture buffer ID */
 
 // Send flush request to the decoder.
 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderMsg_Flush)
 
 // Send reset request to the decoder.
@@ skipping 10 matching lines @@
 
 // Notify the CDM setting result.
 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_CdmAttached,
                     bool) /* success */
 
 // Accelerated video decoder has consumed input buffer from transfer buffer.
 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_BitstreamBufferProcessed,
                     int32_t) /* Processed buffer ID */
 
 // Allocate video frames for output of the hardware video decoder.
-IPC_MESSAGE_ROUTED3(AcceleratedVideoDecoderHostMsg_ProvidePictureBuffers,
+IPC_MESSAGE_ROUTED4(AcceleratedVideoDecoderHostMsg_ProvidePictureBuffers,
                     int32_t,   /* Number of video frames to generate */
+                    uint32_t,  /* Number of textures per frame */
                     gfx::Size, /* Requested size of buffer */
                     uint32_t)  /* Texture target */
 
 // Decoder reports that a picture is ready and buffer does not need to be passed
 // back to the decoder.
 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_DismissPictureBuffer,
                     int32_t) /* Picture buffer ID */
 
 // Decoder reports that a picture is ready.
 IPC_MESSAGE_ROUTED5(AcceleratedVideoDecoderHostMsg_PictureReady,
@@ skipping 100 matching lines @@
 IPC_MESSAGE_ROUTED0(AcceleratedJpegDecoderMsg_Destroy)
 
 //------------------------------------------------------------------------------
 // Accelerated JPEG Decoder Host Messages
 // These messages are sent from the GPU process to Browser process.
 //
 // Report decode status.
 IPC_MESSAGE_ROUTED2(AcceleratedJpegDecoderHostMsg_DecodeAck,
                     int32_t, /* bitstream_buffer_id */
                     media::JpegDecodeAccelerator::Error /* error */)