Cast: Refactoring Cast API's

media/cast/cast_sender_impl.h

Index: media/cast/cast_sender_impl.h
diff --git a/media/cast/cast_sender_impl.h b/media/cast/cast_sender_impl.h
index bfb4041ec942391c552190eebeb5d67c44183ce5..d7badd388d55cebda3b41d89670720e1e53b944f 100644
--- a/media/cast/cast_sender_impl.h
+++ b/media/cast/cast_sender_impl.h
@@ -8,31 +8,31 @@
 #include "base/memory/scoped_ptr.h"
 #include "media/cast/audio_sender/audio_sender.h"
 #include "media/cast/cast_config.h"
+#include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/cast_sender.h"
 #include "media/cast/video_sender/video_sender.h"
 
 namespace media {
 class VideoFrame;
-}
 
-namespace media {
 namespace cast {
-
 class AudioSender;
 class VideoSender;
 
-// This calls is a pure owner class that group all required sending objects
-// together such as pacer, packet receiver, frame input, audio and video sender.
+// This class combines all required sending objects such as the audio and video
+// senders, pacer, packet receiver and frame input.
 class CastSenderImpl : public CastSender {
  public:
-  CastSenderImpl(
-      scoped_refptr<CastEnvironment> cast_environment,
-      const AudioSenderConfig* audio_config,
-      const VideoSenderConfig* video_config,
-      const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
-      const CastInitializationCallback& initialization_status,
-      transport::CastTransportSender* const transport_sender);
+  CastSenderImpl(scoped_refptr<CastEnvironment> cast_environment,
+                 const CastInitializationCallback& cast_initialization_cb,
+                 transport::CastTransportSender* const transport_sender);
+
+  virtual void InitializeAudio(const AudioSenderConfig& audio_config) OVERRIDE;
+  virtual void InitializeVideo(
+      const VideoSenderConfig& video_config,
+      const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories)
+      OVERRIDE;
 
   virtual ~CastSenderImpl();
 
@@ -41,8 +41,8 @@ class CastSenderImpl : public CastSender {
 
  private:
   void ReceivedPacket(scoped_ptr<Packet> packet);
-  // Used to trampoline the result back on the correct thread. And guaranteed
-  // not to be called until the creation is complete.
+  // Used to trampoline the result back on the correct thread. Guaranteed
+  // to be called only after creation is complete.
   void InitializationResult(CastInitializationStatus status) const;
 
   CastInitializationCallback initialization_callback_;
@@ -51,6 +51,8 @@ class CastSenderImpl : public CastSender {
   scoped_refptr<FrameInput> frame_input_;
   transport::PacketReceiverCallback packet_receiver_;
   scoped_refptr<CastEnvironment> cast_environment_;
+  transport::CastTransportSender* const
+      transport_sender_;  // Not owned by this class.

[Ami GONE FROM CHROMIUM, 2014/02/14 18:23:54]

I was hoping for a positive statement about who _does_ own this.  Because that's
basically a requirement that that owner outlive this class.

[mikhal1, 2014/02/18 19:20:43]

Done.

   uint32 ssrc_of_audio_sender_;
   uint32 ssrc_of_video_sender_;
   base::WeakPtrFactory<CastSenderImpl> weak_factory_;