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

Side by Side Diff: content/common/gpu/media/android_deferred_rendering_backing_strategy.h

Issue 1421903006: ui/gl: Move GLImage into gl namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ozone demo Created 5 years, 1 month 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 CONTENT_COMMON_GPU_MEDIA_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_ 5 #ifndef CONTENT_COMMON_GPU_MEDIA_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_
6 #define CONTENT_COMMON_GPU_MEDIA_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_ 6 #define CONTENT_COMMON_GPU_MEDIA_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_
7 7
8 #include "content/common/content_export.h" 8 #include "content/common/content_export.h"
9 #include "content/common/gpu/media/android_video_decode_accelerator.h" 9 #include "content/common/gpu/media/android_video_decode_accelerator.h"
10 10
11 namespace gfx { 11 namespace gl {
12 class GLImage; 12 class GLImage;
13 } 13 }
14 14
15 namespace gpu { 15 namespace gpu {
16 namespace gles2 { 16 namespace gles2 {
17 class TextureRef; 17 class TextureRef;
18 } 18 }
19 } 19 }
20 20
21 namespace content { 21 namespace content {
(...skipping 30 matching lines...) Expand all
52 // Release any codec buffer that is associated with the given picture buffer 52 // Release any codec buffer that is associated with the given picture buffer
53 // back to the codec. It is okay if there is no such buffer. 53 // back to the codec. It is okay if there is no such buffer.
54 void ReleaseCodecBufferForPicture(const media::PictureBuffer& picture_buffer); 54 void ReleaseCodecBufferForPicture(const media::PictureBuffer& picture_buffer);
55 55
56 // Return the TextureRef for a given PictureBuffer's texture. 56 // Return the TextureRef for a given PictureBuffer's texture.
57 gpu::gles2::TextureRef* GetTextureForPicture(const media::PictureBuffer&); 57 gpu::gles2::TextureRef* GetTextureForPicture(const media::PictureBuffer&);
58 58
59 // Return the AVDACodecImage for a given PictureBuffer's texture. 59 // Return the AVDACodecImage for a given PictureBuffer's texture.
60 AVDACodecImage* GetImageForPicture(const media::PictureBuffer&); 60 AVDACodecImage* GetImageForPicture(const media::PictureBuffer&);
61 void SetImageForPicture(const media::PictureBuffer& picture_buffer, 61 void SetImageForPicture(const media::PictureBuffer& picture_buffer,
62 const scoped_refptr<gfx::GLImage>& image); 62 const scoped_refptr<gl::GLImage>& image);
63 63
64 scoped_refptr<AVDASharedState> shared_state_; 64 scoped_refptr<AVDASharedState> shared_state_;
65 65
66 AVDAStateProvider* state_provider_; 66 AVDAStateProvider* state_provider_;
67 67
68 scoped_refptr<gfx::SurfaceTexture> surface_texture_; 68 scoped_refptr<gfx::SurfaceTexture> surface_texture_;
69 69
70 media::VideoCodecBridge* media_codec_; 70 media::VideoCodecBridge* media_codec_;
71 71
72 DISALLOW_COPY_AND_ASSIGN(AndroidDeferredRenderingBackingStrategy); 72 DISALLOW_COPY_AND_ASSIGN(AndroidDeferredRenderingBackingStrategy);
73 }; 73 };
74 74
75 } // namespace content 75 } // namespace content
76 76
77 #endif // CONTENT_COMMON_GPU_MEDIA_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_ H_ 77 #endif // CONTENT_COMMON_GPU_MEDIA_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_ H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698