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

Side by Side Diff: content/renderer/media/android/stream_texture_factory.h

Issue 532993002: work-in-progress patch to fix context lost black video (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop_proxy.h"
10 #include "cc/layers/video_frame_provider.h" 11 #include "cc/layers/video_frame_provider.h"
11 #include "gpu/command_buffer/common/mailbox.h" 12 #include "gpu/command_buffer/common/mailbox.h"
12 #include "ui/gfx/size.h" 13 #include "ui/gfx/size.h"
13 14
14 namespace gpu { 15 namespace gpu {
15 namespace gles2 { 16 namespace gles2 {
16 class GLES2Interface; 17 class GLES2Interface;
17 } // namespace gles2 18 } // namespace gles2
18 } // namespace gpu 19 } // namespace gpu
19 20
20 namespace content { 21 namespace content {
21 22
22 // The proxy class for the gpu thread to notify the compositor thread 23 // The proxy class for the gpu thread to notify the compositor thread
23 // when a new video frame is available. 24 // when a new video frame is available.
24 class StreamTextureProxy { 25 class StreamTextureProxy {
25 public: 26 public:
26 virtual ~StreamTextureProxy() {} 27 virtual ~StreamTextureProxy() {}
27 28
28 // Initialize and bind to the current thread, which becomes the thread that 29 // Initialize and bind to the loop, which becomes the thread that
29 // a connected client will receive callbacks on. 30 // a connected client will receive callbacks on. This can be called
30 virtual void BindToCurrentThread(int32 stream_id) = 0; 31 // on any thread, but must be called with the same loop every time.
31 32 virtual void BindToLoop(int32 stream_id,
32 // Setting the target for callback when a frame is available. This function 33 cc::VideoFrameProvider::Client* client,
33 // could be called on both the main thread and the compositor thread. 34 scoped_refptr<base::MessageLoopProxy> loop) = 0;
34 virtual void SetClient(cc::VideoFrameProvider::Client* client) = 0;
35 35
36 // Causes this instance to be deleted on the thread it is bound to. 36 // Causes this instance to be deleted on the thread it is bound to.
37 virtual void Release() = 0; 37 virtual void Release() = 0;
38 38
39 struct Deleter { 39 struct Deleter {
40 inline void operator()(StreamTextureProxy* ptr) const { ptr->Release(); } 40 inline void operator()(StreamTextureProxy* ptr) const { ptr->Release(); }
41 }; 41 };
42 }; 42 };
43 43
44 typedef scoped_ptr<StreamTextureProxy, StreamTextureProxy::Deleter> 44 typedef scoped_ptr<StreamTextureProxy, StreamTextureProxy::Deleter>
45 ScopedStreamTextureProxy; 45 ScopedStreamTextureProxy;
46 46
47 class StreamTextureFactoryContextObserver {
48 public:
49 virtual ~StreamTextureFactoryContextObserver() {}
50 virtual void ResetStreamTextureProxy() = 0;
51 };
52
47 // Factory class for managing stream textures. 53 // Factory class for managing stream textures.
48 class StreamTextureFactory : public base::RefCounted<StreamTextureFactory> { 54 class StreamTextureFactory : public base::RefCounted<StreamTextureFactory> {
49 public: 55 public:
50 // Create the StreamTextureProxy object. 56 // Create the StreamTextureProxy object.
51 virtual StreamTextureProxy* CreateProxy() = 0; 57 virtual StreamTextureProxy* CreateProxy() = 0;
52 58
53 // Send an IPC message to the browser process to request a java surface 59 // Send an IPC message to the browser process to request a java surface
54 // object for the given stream_id. After the the surface is created, 60 // object for the given stream_id. After the the surface is created,
55 // it will be passed back to the WebMediaPlayerAndroid object identified by 61 // it will be passed back to the WebMediaPlayerAndroid object identified by
56 // the player_id. 62 // the player_id.
57 virtual void EstablishPeer(int32 stream_id, int player_id) = 0; 63 virtual void EstablishPeer(int32 stream_id, int player_id) = 0;
58 64
59 // Creates a StreamTexture and returns its id. Sets |*texture_id| to the 65 // Creates a StreamTexture and returns its id. Sets |*texture_id| to the
60 // client-side id of the StreamTexture. The texture is produced into 66 // client-side id of the StreamTexture. The texture is produced into
61 // a mailbox so it can be shipped in a VideoFrame. 67 // a mailbox so it can be shipped in a VideoFrame.
62 virtual unsigned CreateStreamTexture(unsigned texture_target, 68 virtual unsigned CreateStreamTexture(unsigned texture_target,
63 unsigned* texture_id, 69 unsigned* texture_id,
64 gpu::Mailbox* texture_mailbox) = 0; 70 gpu::Mailbox* texture_mailbox) = 0;
65 71
66 // Set the streamTexture size for the given stream Id. 72 // Set the streamTexture size for the given stream Id.
67 virtual void SetStreamTextureSize(int32 texture_id, 73 virtual void SetStreamTextureSize(int32 texture_id,
68 const gfx::Size& size) = 0; 74 const gfx::Size& size) = 0;
69 75
70 virtual gpu::gles2::GLES2Interface* ContextGL() = 0; 76 virtual gpu::gles2::GLES2Interface* ContextGL() = 0;
71 77
78 virtual void AddObserver(StreamTextureFactoryContextObserver* obs) = 0;
79 virtual void RemoveObserver(StreamTextureFactoryContextObserver* obs) = 0;
80
72 protected: 81 protected:
73 friend class base::RefCounted<StreamTextureFactory>; 82 friend class base::RefCounted<StreamTextureFactory>;
74 virtual ~StreamTextureFactory() {} 83 virtual ~StreamTextureFactory() {}
75 }; 84 };
76 85
77 } // namespace content 86 } // namespace content
78 87
79 #endif // CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_ 88 #endif // CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698