| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/macros.h" |
| 5 #include "media/video/picture.h" | 6 #include "media/video/picture.h" |
| 6 | 7 |
| 7 namespace media { | 8 namespace media { |
| 8 | 9 |
| 9 PictureBuffer::PictureBuffer(int32_t id, gfx::Size size, uint32_t texture_id) | 10 PictureBuffer::PictureBuffer(int32_t id, gfx::Size size, TextureIds texture_ids) |
| 10 : id_(id), size_(size), texture_id_(texture_id), internal_texture_id_(0) {} | 11 : id_(id), size_(size), texture_ids_(texture_ids) {} |
| 11 | 12 |
| 12 PictureBuffer::PictureBuffer(int32_t id, | 13 PictureBuffer::PictureBuffer(int32_t id, |
| 13 gfx::Size size, | 14 gfx::Size size, |
| 14 uint32_t texture_id, | 15 TextureIds texture_ids, |
| 15 uint32_t internal_texture_id) | 16 TextureIds internal_texture_ids) |
| 16 : id_(id), | 17 : id_(id), |
| 17 size_(size), | 18 size_(size), |
| 18 texture_id_(texture_id), | 19 texture_ids_(texture_ids), |
| 19 internal_texture_id_(internal_texture_id) {} | 20 internal_texture_ids_(internal_texture_ids) {} |
| 20 | 21 |
| 21 PictureBuffer::PictureBuffer(int32_t id, | 22 PictureBuffer::PictureBuffer(int32_t id, |
| 22 gfx::Size size, | 23 gfx::Size size, |
| 23 uint32_t texture_id, | 24 TextureIds texture_ids, |
| 24 const gpu::Mailbox& texture_mailbox) | 25 gpu::Mailbox texture_mailbox[kMaxPlanes]) |
| 25 : id_(id), | 26 : id_(id), size_(size), texture_ids_(texture_ids) { |
| 26 size_(size), | 27 for (size_t i = 0; i < arraysize(texture_mailbox_); ++i) { |
| 27 texture_id_(texture_id), | 28 texture_mailbox_[i] = texture_mailbox[i]; |
| 28 internal_texture_id_(0), | 29 } |
| 29 texture_mailbox_(texture_mailbox) {} | 30 } |
| 30 | 31 |
| 31 Picture::Picture(int32_t picture_buffer_id, | 32 Picture::Picture(int32_t picture_buffer_id, |
| 32 int32_t bitstream_buffer_id, | 33 int32_t bitstream_buffer_id, |
| 33 const gfx::Rect& visible_rect, | 34 const gfx::Rect& visible_rect, |
| 34 bool allow_overlay) | 35 bool allow_overlay) |
| 35 : picture_buffer_id_(picture_buffer_id), | 36 : picture_buffer_id_(picture_buffer_id), |
| 36 bitstream_buffer_id_(bitstream_buffer_id), | 37 bitstream_buffer_id_(bitstream_buffer_id), |
| 37 visible_rect_(visible_rect), | 38 visible_rect_(visible_rect), |
| 38 allow_overlay_(allow_overlay), | 39 allow_overlay_(allow_overlay), |
| 39 size_changed_(false) {} | 40 size_changed_(false) {} |
| 40 | 41 |
| 41 } // namespace media | 42 } // namespace media |
| OLD | NEW |