Allow multiple texture ids per picture buffer.

media/video/picture.h

 // Copyright (c) 2011 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.
 
 #ifndef MEDIA_VIDEO_PICTURE_H_
 #define MEDIA_VIDEO_PICTURE_H_
 
 #include <stdint.h>
 
 #include "gpu/command_buffer/common/mailbox.h"
 #include "media/base/media_export.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace media {
 
 // A picture buffer that is composed of a GLES2 texture.
 // This is the media-namespace equivalent of PP_PictureBuffer_Dev.
 class MEDIA_EXPORT PictureBuffer {
  public:
-  PictureBuffer(int32_t id, gfx::Size size, uint32_t texture_id);
+  enum { kMaxPlanes = 4 };
+
+  struct TextureIds {

[sandersd (OOO until July 31), 2016/03/23 00:41:00]

Is there a particular reason to be using a struct, rather than the array
directly?

+    TextureIds() { memset(ids, 0, sizeof(ids)); }
+    uint32_t ids[kMaxPlanes];
+  };
+  PictureBuffer(int32_t id, gfx::Size size, TextureIds texture_ids);
   PictureBuffer(int32_t id,
                 gfx::Size size,
-                uint32_t texture_id,
-                uint32_t internal_texture_id);
+                TextureIds texture_ids,
+                TextureIds internal_texture_ids);
   PictureBuffer(int32_t id,
                 gfx::Size size,
-                uint32_t texture_id,
-                const gpu::Mailbox& texture_mailbox);
+                TextureIds texture_ids,
+                gpu::Mailbox texture_mailbox[kMaxPlanes]);
 
   // Returns the client-specified id of the buffer.
   int32_t id() const { return id_; }
 
   // Returns the size of the buffer.
   gfx::Size size() const {
     return size_;
   }
   void set_size(const gfx::Size& size) { size_ = size; }
 
   // Returns the id of the texture.
   // NOTE: The texture id in the renderer process corresponds to a different
   // texture id in the GPU process.
-  uint32_t texture_id() const { return texture_id_; }
+  TextureIds texture_ids() const { return texture_ids_; }
 
-  uint32_t internal_texture_id() const { return internal_texture_id_; }
+  TextureIds internal_texture_ids() const { return internal_texture_ids_; }
 
-  const gpu::Mailbox& texture_mailbox() const {
-    return texture_mailbox_;
+  const gpu::Mailbox& texture_mailbox(size_t plane) const {
+    return texture_mailbox_[plane];
   }
 
  private:
   int32_t id_;
   gfx::Size size_;
-  uint32_t texture_id_;
-  uint32_t internal_texture_id_;
-  gpu::Mailbox texture_mailbox_;
+  TextureIds texture_ids_;
+  TextureIds internal_texture_ids_;
+  gpu::Mailbox texture_mailbox_[kMaxPlanes];
 };
 
 // A decoded picture frame.
 // This is the media-namespace equivalent of PP_Picture_Dev.
 class MEDIA_EXPORT Picture {
  public:
   // Defaults |size_changed_| to false. Size changed is currently only used
   // by AVDA and is set via set_size_changd().
   Picture(int32_t picture_buffer_id,
           int32_t bitstream_buffer_id,
@@ skipping 29 matching lines @@
   int32_t picture_buffer_id_;
   int32_t bitstream_buffer_id_;
   gfx::Rect visible_rect_;
   bool allow_overlay_;
   bool size_changed_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_PICTURE_H_