Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1346)

Side by Side Diff: media/video/picture.h

Issue 881893002: Revert of Plumb allow_overlay flag for video path into cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/video/picture.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 uint32 texture_id_; 50 uint32 texture_id_;
51 gpu::Mailbox texture_mailbox_; 51 gpu::Mailbox texture_mailbox_;
52 }; 52 };
53 53
54 // A decoded picture frame. 54 // A decoded picture frame.
55 // This is the media-namespace equivalent of PP_Picture_Dev. 55 // This is the media-namespace equivalent of PP_Picture_Dev.
56 class MEDIA_EXPORT Picture { 56 class MEDIA_EXPORT Picture {
57 public: 57 public:
58 Picture(int32 picture_buffer_id, 58 Picture(int32 picture_buffer_id,
59 int32 bitstream_buffer_id, 59 int32 bitstream_buffer_id,
60 const gfx::Rect& visible_rect, 60 const gfx::Rect& visible_rect);
61 bool allow_overlay);
62 61
63 // 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.
64 int32 picture_buffer_id() const { 63 int32 picture_buffer_id() const {
65 return picture_buffer_id_; 64 return picture_buffer_id_;
66 } 65 }
67 66
68 // 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.
69 int32 bitstream_buffer_id() const { 68 int32 bitstream_buffer_id() const {
70 return bitstream_buffer_id_; 69 return bitstream_buffer_id_;
71 } 70 }
72 71
73 void set_bitstream_buffer_id(int32 bitstream_buffer_id) { 72 void set_bitstream_buffer_id(int32 bitstream_buffer_id) {
74 bitstream_buffer_id_ = bitstream_buffer_id; 73 bitstream_buffer_id_ = bitstream_buffer_id;
75 } 74 }
76 75
77 // Returns the visible rectangle of the picture. Its size may be smaller 76 // Returns the visible rectangle of the picture. Its size may be smaller
78 // than the size of the PictureBuffer, as it is the only visible part of the 77 // than the size of the PictureBuffer, as it is the only visible part of the
79 // Picture contained in the PictureBuffer. 78 // Picture contained in the PictureBuffer.
80 gfx::Rect visible_rect() const { return visible_rect_; } 79 gfx::Rect visible_rect() const { return visible_rect_; }
81 80
82 bool allow_overlay() const { return allow_overlay_; }
83
84 private: 81 private:
85 int32 picture_buffer_id_; 82 int32 picture_buffer_id_;
86 int32 bitstream_buffer_id_; 83 int32 bitstream_buffer_id_;
87 gfx::Rect visible_rect_; 84 gfx::Rect visible_rect_;
88 bool allow_overlay_;
89 }; 85 };
90 86
91 } // namespace media 87 } // namespace media
92 88
93 #endif // MEDIA_VIDEO_PICTURE_H_ 89 #endif // MEDIA_VIDEO_PICTURE_H_
OLDNEW
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/video/picture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698