Media Remoting: Data/Control plumbing between renderer and Media Router.

chrome/browser/media/cast_remoting_sender.h

Index: chrome/browser/media/cast_remoting_sender.h
diff --git a/chrome/browser/media/cast_remoting_sender.h b/chrome/browser/media/cast_remoting_sender.h
index 6db6164d9af4c590f0b77e5f57fd6e5f2ed3967d..fccb209948b50cc89b3993d7eaeb504b008d591a 100644
--- a/chrome/browser/media/cast_remoting_sender.h
+++ b/chrome/browser/media/cast_remoting_sender.h
@@ -12,28 +12,49 @@
 #include "media/cast/cast_environment.h"
 #include "media/cast/net/cast_transport.h"
 #include "media/cast/net/rtcp/rtcp_defines.h"
+#include "media/mojo/interfaces/remoting.mojom.h"
+#include "mojo/public/cpp/bindings/binding.h"
 
 namespace cast {
 
 // RTP sender for a single Cast Remoting RTP stream. The client calls Send() to
-// instruct the sender to transmit the data using a CastTransport.
+// instruct the sender to read from a Mojo data pipe and transmit the data using
+// a CastTransport. This entire class executes on the IO BrowserThread.
 //
 // This class is instantiated and owned by CastTransportHostFilter in response
 // to IPC messages from an extension process to create RTP streams for the media
 // remoting use case. CastTransportHostFilter is also responsible for destroying
 // the instance in response to later IPCs.
 //
-// TODO(miu): Mojo service bindings/implementation to read from data pipes will
-// be added in a soon-upcoming change.
-
-class CastRemotingSender {
+// The Media Router provider extension controls the entire set-up process:
+// First, it uses the cast.streaming APIs to create remoting API streams (which
+// instantiates one or more CastRemotingSenders). Then, it sends a message via
+// Media Router to a CastRemotingConnector to indicate the bitstream transport
+// is ready. Finally, CastRemotingConnector calls FindAndBind() to look-up the
+// CastRemotingSender instances and establish the Mojo bindings and data flows.
+class CastRemotingSender : public media::mojom::RemotingDataStreamSender {
  public:
   // |transport| is expected to outlive this class.
-  explicit CastRemotingSender(
+  CastRemotingSender(
       scoped_refptr<media::cast::CastEnvironment> cast_environment,
       media::cast::CastTransport* transport,
       const media::cast::CastTransportRtpConfig& config);
-  ~CastRemotingSender();
+  ~CastRemotingSender() final;
+
+  // Look-up a CastRemotingSender instance by its |rtp_stream_id| and then bind
+  // to the given |request|. The client of the RemotingDataStreamSender will
+  // then instruct this CastRemotingSender when to read from the data |pipe| and
+  // send the data to the Cast Receiver. If the bind fails, or an error occurs
+  // reading from the data pipe during later operation, the |error_callback| is
+  // run.
+  //
+  // Threading note: This function is thread-safe, but its internal
+  // implementation runs on the IO BrowserThread. If |error_callback| is run, it
+  // will execute on the thread that called this function.
+  static void FindAndBind(int32_t rtp_stream_id,
+                          mojo::ScopedDataPipeConsumerHandle pipe,
+                          media::mojom::RemotingDataStreamSenderRequest request,
+                          const base::Closure& error_callback);
 
  private:
   // Friend class for unit tests.
@@ -41,19 +62,21 @@ class CastRemotingSender {
 
   class RemotingRtcpClient;
 
-  // Called to send the serialized frame data.
-  void SendFrame();
-
-  // Called to cancel all the in flight frames when seeking happens.
-  void CancelFramesInFlight();
+  // media::mojom::RemotingDataStreamSender implementation.
+  void ConsumeDataChunk(uint32_t offset, uint32_t size,
+                        uint32_t total_payload_size) final;
+  void SendFrame() final;
+  void CancelInFlightData() final;
 
   // These are called to deliver RTCP feedback from the receiver.
   void OnReceivedCastMessage(const media::cast::RtcpCastMessage& cast_feedback);
   void OnReceivedRtt(base::TimeDelta round_trip_time);
 
-  // Returns the number of frames that were sent but not yet acknowledged. This
-  // does not account for frames acknowledged out-of-order, and is always a high
-  // watermark estimate.
+  // Returns the number of frames that were sent to the CastTransport, but not
+  // yet acknowledged. This is always a high watermark estimate, as frames may
+  // have been acknowledged out-of-order. Also, this does not account for any
+  // frames queued-up in input pipeline (i.e., in the Mojo data pipe, nor in
+  // |next_frame_data_|).
   int NumberOfFramesInFlight() const;
 
   // Schedule and execute periodic checks for re-sending packets.  If no
@@ -71,7 +94,7 @@ class CastRemotingSender {
       media::cast::FrameId frame_id) const;
 
   // Unique identifier for the RTP stream and this CastRemotingSender.
-  const int32_t remoting_stream_id_;
+  const int32_t rtp_stream_id_;
 
   const scoped_refptr<media::cast::CastEnvironment> cast_environment_;
 
@@ -83,6 +106,17 @@ class CastRemotingSender {
 
   const bool is_audio_;
 
+  // Callback that is run to notify when a fatal error occurs.
+  base::Closure error_callback_;
+
+  // Mojo data pipe from which to consume data.
+  mojo::ScopedDataPipeConsumerHandle pipe_;
+
+  // Mojo binding for this instance. Implementation at the other end of the
+  // message pipe uses the RemotingDataStreamSender interface to control when
+  // this CastRemotingSender consumes from |pipe_|.
+  mojo::Binding<RemotingDataStreamSender> binding_;
+
   // This is the maximum delay that the sender should get ack from receiver.
   // Otherwise, sender will call ResendForKickstart().
   base::TimeDelta max_ack_delay_;
@@ -110,7 +144,6 @@ class CastRemotingSender {
 
   // The next frame's payload data. Populated by one or more calls to
   // ConsumeDataChunk().
-  // TODO(miu): To be implemented in soon upcoming change.
   std::string next_frame_data_;
 
   // Ring buffer to keep track of recent frame RTP timestamps. This should
@@ -118,8 +151,12 @@ class CastRemotingSender {
   // ring buffer is the lower 8 bits of the FrameId.
   media::cast::RtpTimeTicks frame_rtp_timestamps_[256];
 
-  // This flag indicates whether CancelFramesInFlight() was called.
-  bool last_frame_was_canceled_;
+  // Current flow control state.
+  enum {
+    RESTARTING,      // Starting new, or restarting after CancelInFlightData().

[xjz, 2016/09/15 18:01:49]

nit: How about just STARTING? Actually this status seems indicating both
starting and restarting. So maybe either one is good.

[miu, 2016/09/16 16:39:28]

Done.

+    CONSUMING,       // Reading from Mojo data pipes.
+    CONSUME_PAUSED,  // Too many frames in-flight; paused Mojo input.
+  } flow_control_state_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<CastRemotingSender> weak_factory_;