Index: content/renderer/media/android/stream_texture_factory_android.h |
diff --git a/content/renderer/media/android/stream_texture_factory_android.h b/content/renderer/media/android/stream_texture_factory_android.h |
index d3c88e53a28385dbc083b048937845d36383c504..af7b437fc4783fd4e5c92fe3d5971cc442c5c478 100644 |
--- a/content/renderer/media/android/stream_texture_factory_android.h |
+++ b/content/renderer/media/android/stream_texture_factory_android.h |
@@ -8,6 +8,7 @@ |
#include "base/memory/scoped_ptr.h" |
#include "cc/layers/video_frame_provider.h" |
#include "content/renderer/gpu/stream_texture_host_android.h" |
+#include "gpu/command_buffer/common/mailbox.h" |
namespace WebKit { |
class WebGraphicsContext3D; |
@@ -73,10 +74,18 @@ class StreamTextureFactory { |
// the player_id. |
void EstablishPeer(int stream_id, int player_id); |
- // Create the streamTexture and return the stream Id and set the texture id. |
- unsigned CreateStreamTexture(unsigned* texture_id); |
- |
- // Destroy the streamTexture for the given texture Id. |
+ // Create the streamTexture and return the stream Id and create a client-side |
+ // texture id to refer to the streamTexture. The texture id is produced into |
+ // a mailbox so it can be used to ship in a VideoFrame, with a sync point for |
+ // when the mailbox can be accessed. |
+ unsigned CreateStreamTexture( |
+ unsigned texture_target, |
+ unsigned* texture_id, |
+ gpu::Mailbox* texture_mailbox, |
+ unsigned* texture_mailbox_sync_point); |
+ |
+ // Destroy the streamTexture for the given texture id, as well as the |
+ // client side texture. |
void DestroyStreamTexture(unsigned texture_id); |
private: |