Index: media/cast/transport/transport_audio_sender.cc |
diff --git a/media/cast/transport/transport_audio_sender.cc b/media/cast/transport/transport_audio_sender.cc |
index 36351379790d1b864660abcb6195b413c66e264f..b704e23b80a67d68fdc56bb07b717d7e5fa2e4d9 100644 |
--- a/media/cast/transport/transport_audio_sender.cc |
+++ b/media/cast/transport/transport_audio_sender.cc |
@@ -20,9 +20,9 @@ |
PacedSender* const paced_packet_sender) |
: rtp_sender_(clock, transport_task_runner, paced_packet_sender), |
encryptor_() { |
- initialized_ = rtp_sender_.InitializeAudio(config) && |
- encryptor_.Initialize(config.rtp.config.aes_key, |
- config.rtp.config.aes_iv_mask); |
+ rtp_sender_.InitializeAudio(config); |
+ initialized_ = |
+ encryptor_.Initialize(config.base.aes_key, config.base.aes_iv_mask); |
} |
TransportAudioSender::~TransportAudioSender() {} |
@@ -30,9 +30,6 @@ |
void TransportAudioSender::InsertCodedAudioFrame( |
const EncodedAudioFrame* audio_frame, |
const base::TimeTicks& recorded_time) { |
- if (!initialized_) { |
- return; |
- } |
if (encryptor_.initialized()) { |
EncodedAudioFrame encrypted_frame; |
if (!EncryptAudioFrame(*audio_frame, &encrypted_frame)) { |
@@ -47,9 +44,6 @@ |
bool TransportAudioSender::EncryptAudioFrame( |
const EncodedAudioFrame& audio_frame, |
EncodedAudioFrame* encrypted_frame) { |
- if (!initialized_) { |
- return false; |
- } |
if (!encryptor_.Encrypt( |
audio_frame.frame_id, audio_frame.data, &encrypted_frame->data)) |
return false; |
@@ -62,9 +56,6 @@ |
void TransportAudioSender::ResendPackets( |
const MissingFramesAndPacketsMap& missing_frames_and_packets) { |
- if (!initialized_) { |
- return; |
- } |
rtp_sender_.ResendPackets(missing_frames_and_packets); |
} |