Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(553)

Unified Diff: media/cast/sender/audio_sender.cc

Issue 2113783002: Refactoring: Merge VideoSenderConfig and AudioSenderConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cast/sender/audio_sender.cc
diff --git a/media/cast/sender/audio_sender.cc b/media/cast/sender/audio_sender.cc
index 12580f8c0bdae0b5fda64fa032a33b2c38076dfc..c51f27edd09f9ab80ec7ef653127f3d512fc3ae6 100644
--- a/media/cast/sender/audio_sender.cc
+++ b/media/cast/sender/audio_sender.cc
@@ -18,31 +18,27 @@ namespace media {
namespace cast {
AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
- const AudioSenderConfig& audio_config,
+ const FrameSenderConfig& audio_config,
const StatusChangeCallback& status_change_cb,
CastTransport* const transport_sender)
: FrameSender(cast_environment,
true,
transport_sender,
audio_config.frequency,
- audio_config.ssrc,
+ audio_config.sender_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.bitrate)),
+ NewFixedCongestionControl(audio_config.max_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.frequency,
- audio_config.bitrate,
- audio_config.codec,
- base::Bind(&AudioSender::OnEncodedAudioFrame,
- weak_factory_.GetWeakPtr(),
- audio_config.bitrate)));
+ audio_encoder_.reset(new AudioEncoder(
+ cast_environment, audio_config.channels, audio_config.frequency,
+ audio_config.max_bitrate, audio_config.codec,
+ base::Bind(&AudioSender::OnEncodedAudioFrame,
+ weak_factory_.GetWeakPtr(), audio_config.max_bitrate)));
}
// AudioEncoder provides no operational status changes during normal use.
@@ -62,7 +58,7 @@ AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
audio_config.frequency / audio_encoder_->GetSamplesPerFrame();
media::cast::CastTransportRtpConfig transport_config;
- transport_config.ssrc = audio_config.ssrc;
+ transport_config.ssrc = audio_config.sender_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;

Powered by Google App Engine
This is Rietveld 408576698