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 #ifndef MEDIA_VIDEO_PICTURE_H_ | 5 #ifndef MEDIA_VIDEO_PICTURE_H_ |
6 #define MEDIA_VIDEO_PICTURE_H_ | 6 #define MEDIA_VIDEO_PICTURE_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "gpu/command_buffer/common/mailbox.h" | 9 #include "gpu/command_buffer/common/mailbox.h" |
10 #include "media/base/media_export.h" | 10 #include "media/base/media_export.h" |
| 11 #include "ui/gfx/geometry/rect.h" |
11 #include "ui/gfx/size.h" | 12 #include "ui/gfx/size.h" |
12 | 13 |
13 namespace media { | 14 namespace media { |
14 | 15 |
15 // A picture buffer that is composed of a GLES2 texture. | 16 // A picture buffer that is composed of a GLES2 texture. |
16 // This is the media-namespace equivalent of PP_PictureBuffer_Dev. | 17 // This is the media-namespace equivalent of PP_PictureBuffer_Dev. |
17 class MEDIA_EXPORT PictureBuffer { | 18 class MEDIA_EXPORT PictureBuffer { |
18 public: | 19 public: |
19 PictureBuffer(int32 id, gfx::Size size, uint32 texture_id); | 20 PictureBuffer(int32 id, gfx::Size size, uint32 texture_id); |
20 PictureBuffer(int32 id, | 21 PictureBuffer(int32 id, |
(...skipping 26 matching lines...) Expand all Loading... |
47 int32 id_; | 48 int32 id_; |
48 gfx::Size size_; | 49 gfx::Size size_; |
49 uint32 texture_id_; | 50 uint32 texture_id_; |
50 gpu::Mailbox texture_mailbox_; | 51 gpu::Mailbox texture_mailbox_; |
51 }; | 52 }; |
52 | 53 |
53 // A decoded picture frame. | 54 // A decoded picture frame. |
54 // This is the media-namespace equivalent of PP_Picture_Dev. | 55 // This is the media-namespace equivalent of PP_Picture_Dev. |
55 class MEDIA_EXPORT Picture { | 56 class MEDIA_EXPORT Picture { |
56 public: | 57 public: |
57 Picture(int32 picture_buffer_id, int32 bitstream_buffer_id); | 58 Picture(int32 picture_buffer_id, |
| 59 int32 bitstream_buffer_id, |
| 60 const gfx::Rect& visible_rect); |
58 | 61 |
59 // Returns the id of the picture buffer where this picture is contained. | 62 // Returns the id of the picture buffer where this picture is contained. |
60 int32 picture_buffer_id() const { | 63 int32 picture_buffer_id() const { |
61 return picture_buffer_id_; | 64 return picture_buffer_id_; |
62 } | 65 } |
63 | 66 |
64 // Returns the id of the bitstream buffer from which this frame was decoded. | 67 // Returns the id of the bitstream buffer from which this frame was decoded. |
65 int32 bitstream_buffer_id() const { | 68 int32 bitstream_buffer_id() const { |
66 return bitstream_buffer_id_; | 69 return bitstream_buffer_id_; |
67 } | 70 } |
68 | 71 |
69 void set_bitstream_buffer_id(int32 bitstream_buffer_id) { | 72 void set_bitstream_buffer_id(int32 bitstream_buffer_id) { |
70 bitstream_buffer_id_ = bitstream_buffer_id; | 73 bitstream_buffer_id_ = bitstream_buffer_id; |
71 } | 74 } |
72 | 75 |
| 76 // Returns the visible rectangle of the picture. Its size may be smaller |
| 77 // than the size of the PictureBuffer, as it is the only visible part of the |
| 78 // Picture contained in the PictureBuffer. |
| 79 gfx::Rect visible_rect() const { return visible_rect_; } |
| 80 |
73 private: | 81 private: |
74 int32 picture_buffer_id_; | 82 int32 picture_buffer_id_; |
75 int32 bitstream_buffer_id_; | 83 int32 bitstream_buffer_id_; |
| 84 gfx::Rect visible_rect_; |
76 }; | 85 }; |
77 | 86 |
78 } // namespace media | 87 } // namespace media |
79 | 88 |
80 #endif // MEDIA_VIDEO_PICTURE_H_ | 89 #endif // MEDIA_VIDEO_PICTURE_H_ |
OLD | NEW |