Index: media/cast/sender/audio_sender.cc |
diff --git a/media/cast/sender/audio_sender.cc b/media/cast/sender/audio_sender.cc |
index 634afa619ec89fa09e476b9cf30367741aa3a221..12580f8c0bdae0b5fda64fa032a33b2c38076dfc 100644 |
--- a/media/cast/sender/audio_sender.cc |
+++ b/media/cast/sender/audio_sender.cc |
@@ -18,27 +18,31 @@ |
namespace cast { |
AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment, |
- const FrameSenderConfig& audio_config, |
+ const AudioSenderConfig& audio_config, |
const StatusChangeCallback& status_change_cb, |
CastTransport* const transport_sender) |
: FrameSender(cast_environment, |
true, |
transport_sender, |
- audio_config.rtp_timebase, |
- audio_config.sender_ssrc, |
+ audio_config.frequency, |
+ audio_config.ssrc, |
0, // |max_frame_rate_| is set after encoder initialization. |
audio_config.min_playout_delay, |
audio_config.max_playout_delay, |
audio_config.animated_playout_delay, |
- NewFixedCongestionControl(audio_config.max_bitrate)), |
+ NewFixedCongestionControl(audio_config.bitrate)), |
samples_in_encoder_(0), |
weak_factory_(this) { |
if (!audio_config.use_external_encoder) { |
- audio_encoder_.reset(new AudioEncoder( |
- cast_environment, audio_config.channels, audio_config.rtp_timebase, |
- audio_config.max_bitrate, audio_config.codec, |
- base::Bind(&AudioSender::OnEncodedAudioFrame, |
- weak_factory_.GetWeakPtr(), audio_config.max_bitrate))); |
+ audio_encoder_.reset( |
+ new AudioEncoder(cast_environment, |
+ audio_config.channels, |
+ audio_config.frequency, |
+ audio_config.bitrate, |
+ audio_config.codec, |
+ base::Bind(&AudioSender::OnEncodedAudioFrame, |
+ weak_factory_.GetWeakPtr(), |
+ audio_config.bitrate))); |
} |
// AudioEncoder provides no operational status changes during normal use. |
@@ -55,10 +59,10 @@ |
// initialization parameters. Now that we have an encoder, we can calculate |
// the maximum frame rate. |
max_frame_rate_ = |
- audio_config.rtp_timebase / audio_encoder_->GetSamplesPerFrame(); |
+ audio_config.frequency / audio_encoder_->GetSamplesPerFrame(); |
media::cast::CastTransportRtpConfig transport_config; |
- transport_config.ssrc = audio_config.sender_ssrc; |
+ 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; |