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

Unified Diff: media/cast/transport/transport_audio_sender.cc

Issue 252923007: Cast: Fix two video freezing problems (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mac fix Created 6 years, 8 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
« no previous file with comments | « media/cast/transport/transport/udp_transport.cc ('k') | media/cast/transport/transport_video_sender.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b704e23b80a67d68fdc56bb07b717d7e5fa2e4d9..36351379790d1b864660abcb6195b413c66e264f 100644
--- a/media/cast/transport/transport_audio_sender.cc
+++ b/media/cast/transport/transport_audio_sender.cc
@@ -20,9 +20,9 @@ TransportAudioSender::TransportAudioSender(
PacedSender* const paced_packet_sender)
: rtp_sender_(clock, transport_task_runner, paced_packet_sender),
encryptor_() {
- rtp_sender_.InitializeAudio(config);
- initialized_ =
- encryptor_.Initialize(config.base.aes_key, config.base.aes_iv_mask);
+ initialized_ = rtp_sender_.InitializeAudio(config) &&
+ encryptor_.Initialize(config.rtp.config.aes_key,
+ config.rtp.config.aes_iv_mask);
}
TransportAudioSender::~TransportAudioSender() {}
@@ -30,6 +30,9 @@ TransportAudioSender::~TransportAudioSender() {}
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)) {
@@ -44,6 +47,9 @@ void TransportAudioSender::InsertCodedAudioFrame(
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;
@@ -56,6 +62,9 @@ bool TransportAudioSender::EncryptAudioFrame(
void TransportAudioSender::ResendPackets(
const MissingFramesAndPacketsMap& missing_frames_and_packets) {
+ if (!initialized_) {
+ return;
+ }
rtp_sender_.ResendPackets(missing_frames_and_packets);
}
« no previous file with comments | « media/cast/transport/transport/udp_transport.cc ('k') | media/cast/transport/transport_video_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698