Allow multiple texture ids per picture buffer.

media/video/picture.cc

 // 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.
 
+#include "base/macros.h"
 #include "media/video/picture.h"
 
 namespace media {
 
-PictureBuffer::PictureBuffer(int32_t id, gfx::Size size, uint32_t texture_id)
-    : id_(id), size_(size), texture_id_(texture_id), internal_texture_id_(0) {}
+PictureBuffer::PictureBuffer(int32_t id, gfx::Size size, TextureIds texture_ids)
+    : id_(id), size_(size), texture_ids_(texture_ids) {}
 
 PictureBuffer::PictureBuffer(int32_t id,
                              gfx::Size size,
-                             uint32_t texture_id,
-                             uint32_t internal_texture_id)
+                             TextureIds texture_ids,

[DaleCurtis, 2016/03/24 02:00:45]

const& for both?

+                             TextureIds internal_texture_ids)
     : id_(id),
       size_(size),
-      texture_id_(texture_id),
-      internal_texture_id_(internal_texture_id) {}
+      texture_ids_(texture_ids),
+      internal_texture_ids_(internal_texture_ids) {}
 
 PictureBuffer::PictureBuffer(int32_t id,
                              gfx::Size size,
-                             uint32_t texture_id,
-                             const gpu::Mailbox& texture_mailbox)
-    : id_(id),
-      size_(size),
-      texture_id_(texture_id),
-      internal_texture_id_(0),
-      texture_mailbox_(texture_mailbox) {}
+                             TextureIds texture_ids,

[DaleCurtis, 2016/03/24 02:00:46]

const&?

+                             gpu::Mailbox texture_mailbox[kMaxPlanes])

[DaleCurtis, 2016/03/24 02:00:45]

Why the const& removal here? Should this be a vector too?

+    : id_(id), size_(size), texture_ids_(texture_ids) {
+  for (size_t i = 0; i < arraysize(texture_mailbox_); ++i) {
+    texture_mailbox_[i] = texture_mailbox[i];
+  }
+}
+
+PictureBuffer::~PictureBuffer() {}
 
 Picture::Picture(int32_t picture_buffer_id,
                  int32_t bitstream_buffer_id,
                  const gfx::Rect& visible_rect,
                  bool allow_overlay)
     : picture_buffer_id_(picture_buffer_id),
       bitstream_buffer_id_(bitstream_buffer_id),
       visible_rect_(visible_rect),
       allow_overlay_(allow_overlay),
       size_changed_(false) {}
 
 }  // namespace media