Refactoring: CastTransport InitializeAudio/InitializeVideo.

media/cast/sender/audio_sender.cc

 // Copyright 2014 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/sender/audio_sender.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 43 matching lines @@
       base::Bind(status_change_cb,
                  audio_encoder_ ? audio_encoder_->InitializationResult() :
                      STATUS_INVALID_CONFIGURATION));
 
   // The number of samples per encoded audio frame depends on the codec and its
   // initialization parameters. Now that we have an encoder, we can calculate
   // the maximum frame rate.
   max_frame_rate_ =
       audio_config.frequency / audio_encoder_->GetSamplesPerFrame();
 
   media::cast::CastTransportRtpConfig transport_config;

[miu, 2016/07/06 21:45:42]

Lines 64-73 could be moved into the FrameSender constructor. (They are identical
to lines 135-144 in video_sender.cc.)

[xjz, 2016/07/13 20:31:17]

Done.

   transport_config.ssrc = audio_config.ssrc;
   transport_config.feedback_ssrc = audio_config.receiver_ssrc;
   transport_config.rtp_payload_type = audio_config.rtp_payload_type;
   transport_config.aes_key = audio_config.aes_key;
   transport_config.aes_iv_mask = audio_config.aes_iv_mask;
 
-  transport_sender->InitializeAudio(
+  transport_sender->InitializeStream(
       transport_config, base::WrapUnique(new FrameSender::RtcpClient(
                             weak_factory_.GetWeakPtr())));
 }
 
 AudioSender::~AudioSender() {}
 
 void AudioSender::InsertAudio(std::unique_ptr<AudioBus> audio_bus,
                               const base::TimeTicks& recorded_time) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
 
@@ skipping 31 matching lines @@
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
 
   samples_in_encoder_ -= audio_encoder_->GetSamplesPerFrame() + samples_skipped;
   DCHECK_GE(samples_in_encoder_, 0);
 
   SendEncodedFrame(encoder_bitrate, std::move(encoded_frame));
 }
 
 }  // namespace cast
 }  // namespace media