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

Unified Diff: media/video/picture.h

Issue 2382113002: Use clearer names for the PictureBuffer texture id members (Closed)
Patch Set: Added comments Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/gpu/vt_video_decode_accelerator_mac.cc ('k') | media/video/picture.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/picture.h
diff --git a/media/video/picture.h b/media/video/picture.h
index 1da3fdaa41fff864f348d343586e2858f49eda8e..d7106ad8004fe7906666f492a31995639c848cac 100644
--- a/media/video/picture.h
+++ b/media/video/picture.h
@@ -16,20 +16,22 @@
namespace media {
-// A picture buffer that is composed of a GLES2 texture.
+// A picture buffer that is composed of one or more GLES2 textures.
// This is the media-namespace equivalent of PP_PictureBuffer_Dev.
class MEDIA_EXPORT PictureBuffer {
public:
using TextureIds = std::vector<uint32_t>;
- PictureBuffer(int32_t id, gfx::Size size, const TextureIds& texture_ids);
PictureBuffer(int32_t id,
gfx::Size size,
- const TextureIds& texture_ids,
- const TextureIds& internal_texture_ids);
+ const TextureIds& client_texture_ids);
PictureBuffer(int32_t id,
gfx::Size size,
- const TextureIds& texture_ids,
+ const TextureIds& client_texture_ids,
+ const TextureIds& service_texture_ids);
+ PictureBuffer(int32_t id,
+ gfx::Size size,
+ const TextureIds& client_texture_ids,
const std::vector<gpu::Mailbox>& texture_mailboxes);
PictureBuffer(const PictureBuffer& other);
~PictureBuffer();
@@ -38,19 +40,16 @@ class MEDIA_EXPORT PictureBuffer {
int32_t id() const { return id_; }
// Returns the size of the buffer.
- gfx::Size size() const {
- return size_;
- }
+ 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.
- const TextureIds& texture_ids() const { return texture_ids_; }
+ // The client texture ids, i.e., those returned by Chrome's GL service.
+ const TextureIds& client_texture_ids() const { return client_texture_ids_; }
- const TextureIds& internal_texture_ids() const {
- return internal_texture_ids_;
- }
+ // The service texture ids, i.e., the real platform ids corresponding to
+ // |client_texture_ids|.
+ const TextureIds& service_texture_ids() const { return service_texture_ids_; }
const gpu::Mailbox& texture_mailbox(size_t plane) const {
return texture_mailboxes_[plane];
@@ -59,8 +58,8 @@ class MEDIA_EXPORT PictureBuffer {
private:
int32_t id_;
gfx::Size size_;
- TextureIds texture_ids_;
- TextureIds internal_texture_ids_;
+ TextureIds client_texture_ids_;
+ TextureIds service_texture_ids_;
std::vector<gpu::Mailbox> texture_mailboxes_;
};
« no previous file with comments | « media/gpu/vt_video_decode_accelerator_mac.cc ('k') | media/video/picture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698