Cast:Adding cast_transport_config and cleaning up

media/cast/transport/cast_transport_sender.h

Index: media/cast/transport/cast_transport_sender.h
diff --git a/media/cast/transport/cast_transport_sender.h b/media/cast/transport/cast_transport_sender.h
index 5cfb40d0605ffcf6eab2fc5e80470f2cacf23725..cdd9359526ba93f6e21544f4a5ca7a90577cbead 100644
--- a/media/cast/transport/cast_transport_sender.h
+++ b/media/cast/transport/cast_transport_sender.h
@@ -13,7 +13,7 @@
 #include "base/basictypes.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/tick_clock.h"
-#include "media/cast/net/cast_transport_defines.h"
+#include "media/cast/transport/cast_transport_defines.h"
 
 namespace media {
 class AudioBus;
@@ -24,32 +24,25 @@ namespace media {
 namespace cast {
 namespace transport {
 
-class CastNetNotification {
-  public:
-    enum CastNetStatus {
-      UNINITIALIZED,
-      INITIALIZED,
-      INVALID_CRYPTO_CONFIG,
-      SOCKET_ERROR,
-      // TODO(mikhal): Add.
-    };
-
- virtual void NotifyStatusChange(CastNetStatus result) = 0;
- virtual ~CastNetNotification() {}
-};
+typedef base::Callback<void(CastTransportStatus status)>
+    CastTransportStatusCallback;
 
 // This Class is not thread safe.
 // The application should only trigger this class from one thread.
-class CastNetSender : public base::NonThreadSafe {
+class CastTransportSender : public base::NonThreadSafe {

[hubbe, 2013/12/27 23:49:58]

Since this is an interface, please make sure to document what the functions are
supposed to do and when they are supposed to be called.
Including caveats, like what thread it is supposed to be called on.

[mikhal1, 2013/12/30 17:33:46]

Done.

  public:
-  static CastNetSender* CreateCastNetSender(
+  static CastTransportSender* CreateCastNetSender(
       base::TickClock* clock,
-      const CastNetConfig& config,
-      CastNetNotification* const notifier,
-      scoped_refptr<PacketReceiver> packet_receiver);
+      const CastTransportConfig& config,
+      const CastTransportStatusCallback& status_callback,
+      scoped_refptr<base::TaskRunner> transport_thread);
+
+  virtual ~CastTransportSender() {}
+
+  virtual void SetPacketReceiver(
+      scoped_refptr<PacketReceiver> packet_receiver) = 0;
 
-  virtual ~CastNetSender() {}
-  virtual void InsertCodedAudioFrame(const AudioBus* audio_bus,
+  virtual void InsertCodedAudioFrame(const EncodedAudioFrame* audio_bus,

[hubbe, 2013/12/27 23:49:58]

audio_bus -> audio_frame

[mikhal1, 2013/12/30 17:33:46]

Done.

                                      const base::TimeTicks& recorded_time) = 0;
 
   virtual void InsertCodedVideoFrame(const EncodedVideoFrame* video_frame,
@@ -63,7 +56,12 @@ class CastNetSender : public base::NonThreadSafe {
 
   virtual void ResendPackets(
       const MissingFramesAndPacketsMap& missing_packets) = 0;
-};
+
+  virtual void RtpAudioStatistics(const base::TimeTicks& now,
+                                  RtcpSenderInfo* sender_info) = 0;
+
+  virtual void RtpVideoStatistics(const base::TimeTicks& now,
+                                  RtcpSenderInfo* sender_info) = 0;
 
 }  // namespace transport
 }  // namespace cast