Allow multiple texture ids per picture buffer.

content/common/gpu/media/media_messages.h

Index: content/common/gpu/media/media_messages.h
diff --git a/content/common/gpu/media/media_messages.h b/content/common/gpu/media/media_messages.h
index 554fb15b3854b8a91399f2e78ed4b8ff7f22c6e3..6b00037b9049fc354e5745a000a19c24d7ac7fb8 100644
--- a/content/common/gpu/media/media_messages.h
+++ b/content/common/gpu/media/media_messages.h
@@ -110,6 +110,13 @@ IPC_STRUCT_TRAITS_BEGIN(content::CreateVideoEncoderParams)
   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.
@@ -129,9 +136,10 @@ IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderMsg_SetCdm, int32_t /* CDM ID */)
 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.
@@ -162,8 +170,9 @@ 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 */