Make stream_id internal to StreamTextureHost.

content/renderer/media/android/stream_texture_factory.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 23 matching lines @@
 // The proxy class for the gpu thread to notify the compositor thread
 // when a new video frame is available.
 class StreamTextureProxy : public StreamTextureHost::Listener {
  public:
   ~StreamTextureProxy() override;
 
   // Initialize and bind to |task_runner|, which becomes the thread that the
   // provided callback will be run on. This can be called on any thread, but
   // must be called with the same |task_runner| every time.
   void BindToTaskRunner(
-      int32_t stream_id,
       const base::Closure& received_frame_cb,
       scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
   // StreamTextureHost::Listener implementation:
   void OnFrameAvailable() override;
 
+  // Set the streamTexture size.
+  void SetStreamTextureSize(const gfx::Size& size);
+
+  // Send an IPC message to the browser process to request a java surface
+  // object for the given route_id. After the the surface is created,
+  // it will be passed back to the WebMediaPlayerAndroid object identified by
+  // the player_id.
+  void EstablishPeer(int player_id, int frame_id);
+
+  // Sends an IPC to the GPU process.
+  // Asks the StreamTexture to forward its SurfaceTexture to the
+  // ScopedSurfaceRequestManager, using the gpu::ScopedSurfaceRequestConduit.
+  void ForwardStreamTextureForSurfaceRequest(
+      const base::UnguessableToken& request_token);
+
   struct Deleter {
     inline void operator()(StreamTextureProxy* ptr) const { ptr->Release(); }
   };
  private:
   friend class StreamTextureFactory;
   explicit StreamTextureProxy(StreamTextureHost* host);
 
-  void BindOnThread(int32_t stream_id);
+  void BindOnThread();
   void Release();
 
   const std::unique_ptr<StreamTextureHost> host_;
 
   // Protects access to |received_frame_cb_| and |task_runner_|.
   base::Lock lock_;
   base::Closure received_frame_cb_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureProxy);
 };
 
 typedef std::unique_ptr<StreamTextureProxy, StreamTextureProxy::Deleter>
     ScopedStreamTextureProxy;
 
 // Factory class for managing stream textures.
 class CONTENT_EXPORT StreamTextureFactory
     : public base::RefCounted<StreamTextureFactory> {
  public:
   static scoped_refptr<StreamTextureFactory> Create(
       scoped_refptr<ContextProviderCommandBuffer> context_provider);
 
   // Create the StreamTextureProxy object.

[liberato (no reviews please), 2016/10/10 16:46:13]

please comment the function args, now that the caller doesn't call
CreateStreamTexture directly.

also, perhaps make this explicitly guarantee that |texture_id| will be set to 0
if it fails.  this can clean up wmpa a bit (please see comments there).

last, and this was an existing issue with the docs, you might want to mention
that the client has to clean up |texture_id|.

[sivag, 2016/10/12 11:25:33]

Done.

-  StreamTextureProxy* CreateProxy();
-
-  // Send an IPC message to the browser process to request a java surface
-  // object for the given stream_id. After the the surface is created,
-  // it will be passed back to the WebMediaPlayerAndroid object identified by
-  // the player_id.
-  void EstablishPeer(int32_t stream_id, int player_id, int frame_id);
-
-  // Sends an IPC to the GPU process.
-  // Asks the StreamTexture to forward its SurfaceTexture to the
-  // ScopedSurfaceRequestManager, using the gpu::ScopedSurfaceRequestConduit.
-  void ForwardStreamTextureForSurfaceRequest(
-      int32_t stream_id,
-      const base::UnguessableToken& request_token);
-
-  // Creates a gpu::StreamTexture and returns its id.  Sets |*texture_id| to the
-  // client-side id of the gpu::StreamTexture. The texture is produced into
-  // a mailbox so it can be shipped in a VideoFrame.
-  unsigned CreateStreamTexture(unsigned texture_target,
-                               unsigned* texture_id,
-                               gpu::Mailbox* texture_mailbox);
-
-  // Set the streamTexture size for the given stream Id.
-  void SetStreamTextureSize(int32_t texture_id, const gfx::Size& size);
+  StreamTextureProxy* CreateProxy(unsigned texture_target,
+                                  unsigned* texture_id,
+                                  gpu::Mailbox* texture_mailbox);
 
   gpu::gles2::GLES2Interface* ContextGL();
 
  private:
   friend class base::RefCounted<StreamTextureFactory>;
   StreamTextureFactory(
       scoped_refptr<ContextProviderCommandBuffer> context_provider);
   ~StreamTextureFactory();
+  // Creates a gpu::StreamTexture and returns its id.  Sets |*texture_id| to the
+  // client-side id of the gpu::StreamTexture. The texture is produced into
+  // a mailbox so it can be shipped in a VideoFrame.
+  unsigned CreateStreamTexture(unsigned texture_target,
+                               unsigned* texture_id,
+                               gpu::Mailbox* texture_mailbox);
 
   scoped_refptr<ContextProviderCommandBuffer> context_provider_;
   scoped_refptr<gpu::GpuChannelHost> channel_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureFactory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_