Revert of Cast: Fix two video freezing problems

media/cast/audio_sender/audio_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/audio_sender/audio_sender.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "media/cast/audio_sender/audio_encoder.h"
@@ skipping 32 matching lines @@
       transport_sender_(transport_sender),
       rtp_stats_(audio_config.frequency),
       rtcp_feedback_(new LocalRtcpAudioSenderFeedback(this)),
       rtcp_(cast_environment,
             rtcp_feedback_.get(),
             transport_sender_,
             NULL,  // paced sender.
             NULL,
             audio_config.rtcp_mode,
             base::TimeDelta::FromMilliseconds(audio_config.rtcp_interval),
-            audio_config.rtp_config.ssrc,
+            audio_config.sender_ssrc,
             audio_config.incoming_feedback_ssrc,
             audio_config.rtcp_c_name),
       timers_initialized_(false),
       cast_initialization_cb_(STATUS_AUDIO_UNINITIALIZED),
       weak_factory_(this) {
   rtcp_.SetCastReceiverEventHistorySize(kReceiverRtcpEventHistorySize);
   if (!audio_config.use_external_encoder) {
     audio_encoder_.reset(
         new AudioEncoder(cast_environment,
                          audio_config,
                          base::Bind(&AudioSender::SendEncodedAudioFrame,
                                     weak_factory_.GetWeakPtr())));
     cast_initialization_cb_ = audio_encoder_->InitializationResult();
   }
-
-  media::cast::transport::CastTransportAudioConfig transport_config;
-  transport_config.codec = audio_config.codec;
-  transport_config.rtp.config = audio_config.rtp_config;
-  transport_config.frequency = audio_config.frequency;
-  transport_config.channels = audio_config.channels;
-  transport_config.rtp.max_outstanding_frames =
-      audio_config.rtp_config.max_delay_ms / 100 + 1;
-  transport_sender_->InitializeAudio(transport_config);
-
   transport_sender_->SubscribeAudioRtpStatsCallback(
       base::Bind(&AudioSender::StoreStatistics, weak_factory_.GetWeakPtr()));
 }
 
 AudioSender::~AudioSender() {}
 
 void AudioSender::InitializeTimers() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   if (!timers_initialized_) {
     timers_initialized_ = true;
@@ skipping 54 matching lines @@
   // We don't send audio logging messages since all captured audio frames will
   // be sent.
   transport::RtcpSenderLogMessage empty_msg;
   rtp_stats_.UpdateInfo(cast_environment_->Clock()->NowTicks());
   rtcp_.SendRtcpFromRtpSender(empty_msg, rtp_stats_.sender_info());
   ScheduleNextRtcpReport();
 }
 
 }  // namespace cast
 }  // namespace media