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

Side by Side Diff: media/gpu/avda_shared_state.h

Issue 1939683002: Test X11 header pollution (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/gpu/avda_return_on_failure.h ('k') | media/gpu/avda_shared_state.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 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_AVDA_SHARED_STATE_H_ 5 #ifndef CONTENT_COMMON_GPU_AVDA_SHARED_STATE_H_
6 #define CONTENT_COMMON_GPU_AVDA_SHARED_STATE_H_ 6 #define CONTENT_COMMON_GPU_AVDA_SHARED_STATE_H_
7 7
8 #include "base/synchronization/waitable_event.h" 8 #include "base/synchronization/waitable_event.h"
9 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 9 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
10 #include "media/base/android/media_codec_bridge.h" 10 #include "media/base/android/media_codec_bridge.h"
11 #include "media/base/android/sdk_media_codec_bridge.h" 11 #include "media/base/android/sdk_media_codec_bridge.h"
12 #include "ui/gl/gl_context.h" 12 #include "ui/gl/gl_context.h"
13 #include "ui/gl/gl_image.h" 13 #include "ui/gl/gl_image.h"
14 #include "ui/gl/gl_surface.h" 14 #include "ui/gl/gl_surface.h"
15 15
16 namespace gfx { 16 namespace gfx {
17 class SurfaceTexture; 17 class SurfaceTexture;
18 } 18 }
19 19
20 namespace media { 20 namespace media {
21
22 class AVDACodecImage;
21 class MediaCodecBridge; 23 class MediaCodecBridge;
22 }
23
24 namespace content {
25 class AVDACodecImage;
26 24
27 // Shared state to allow communication between the AVDA and the 25 // Shared state to allow communication between the AVDA and the
28 // GLImages that configure GL for drawing the frames. 26 // GLImages that configure GL for drawing the frames.
29 class AVDASharedState : public base::RefCounted<AVDASharedState> { 27 class AVDASharedState : public base::RefCounted<AVDASharedState> {
30 public: 28 public:
31 AVDASharedState(); 29 AVDASharedState();
32 30
33 GLint surface_texture_service_id() const { 31 GLint surface_texture_service_id() const {
34 return surface_texture_service_id_; 32 return surface_texture_service_id_;
35 } 33 }
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 // currently attached. 98 // currently attached.
101 scoped_refptr<gfx::GLContext> context_; 99 scoped_refptr<gfx::GLContext> context_;
102 scoped_refptr<gfx::GLSurface> surface_; 100 scoped_refptr<gfx::GLSurface> surface_;
103 101
104 // Maps a picture buffer id to a AVDACodecImage. 102 // Maps a picture buffer id to a AVDACodecImage.
105 std::map<int, AVDACodecImage*> codec_images_; 103 std::map<int, AVDACodecImage*> codec_images_;
106 104
107 DISALLOW_COPY_AND_ASSIGN(AVDASharedState); 105 DISALLOW_COPY_AND_ASSIGN(AVDASharedState);
108 }; 106 };
109 107
110 } // namespace content 108 } // namespace media
111 109
112 #endif // CONTENT_COMMON_GPU_AVDA_SHARED_STATE_H_ 110 #endif // CONTENT_COMMON_GPU_AVDA_SHARED_STATE_H_
OLDNEW
« no previous file with comments | « media/gpu/avda_return_on_failure.h ('k') | media/gpu/avda_shared_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698