Cast: Refactoring Cast API's

media/cast/video_sender/video_sender.cc

 // Copyright 2013 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.
 
 #include "media/cast/video_sender/video_sender.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 76 matching lines @@
   base::TimeTicks time_sent_;
   uint32 rtp_timestamp_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(LocalRtpVideoSenderStatistics);
 };
 
 VideoSender::VideoSender(
     scoped_refptr<CastEnvironment> cast_environment,
     const VideoSenderConfig& video_config,
     const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
-    const CastInitializationCallback& initialization_status,
+    const CastInitializationCallback& cast_initialization_cb,
     transport::CastTransportSender* const transport_sender)
     : rtp_max_delay_(base::TimeDelta::FromMilliseconds(
           video_config.rtp_config.max_delay_ms)),
       max_frame_rate_(video_config.max_frame_rate),
       cast_environment_(cast_environment),
       transport_sender_(transport_sender),
       event_subscriber_(kMaxEventSubscriberEntries),
       rtcp_feedback_(new LocalRtcpVideoSenderFeedback(this)),
       last_acked_frame_id_(-1),
       last_sent_frame_id_(-1),
@@ skipping 30 matching lines @@
                transport_sender_,
                NULL,  // paced sender.
                rtp_video_sender_statistics_.get(),
                NULL,
                video_config.rtcp_mode,
                base::TimeDelta::FromMilliseconds(video_config.rtcp_interval),
                video_config.sender_ssrc,
                video_config.incoming_feedback_ssrc,
                video_config.rtcp_c_name));
 
-  // TODO(pwestin): pass cast_initialization to |video_encoder_|
+  // TODO(pwestin): pass cast_initialization_cb to |video_encoder_|
   // and remove this call.
   cast_environment_->PostTask(
       CastEnvironment::MAIN, FROM_HERE,
-      base::Bind(initialization_status, STATUS_INITIALIZED));
+      base::Bind(cast_initialization_cb, STATUS_VIDEO_INITIALIZED));
   cast_environment_->Logging()->AddRawEventSubscriber(&event_subscriber_);
 }
 
 VideoSender::~VideoSender() {
   cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber_);
 }
 
 void VideoSender::InitializeTimers() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   if (!initialized_) {
@@ skipping 317 matching lines @@
 
 void VideoSender::ResendPacketsOnTransportThread(
     const transport::MissingFramesAndPacketsMap& missing_packets) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::TRANSPORT));
   last_send_time_ = cast_environment_->Clock()->NowTicks();
   transport_sender_->ResendPackets(false, missing_packets);
 }
 
 }  // namespace cast
 }  // namespace media