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

Side by Side Diff: media/cast/audio_sender/audio_sender.cc

Issue 62843002: Cast: Added support for AES-CTR crypto. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits Created 7 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/audio_sender/audio_sender.h" 5 #include "media/cast/audio_sender/audio_sender.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "crypto/symmetric_key.h"
10 #include "media/cast/audio_sender/audio_encoder.h" 11 #include "media/cast/audio_sender/audio_encoder.h"
11 #include "media/cast/rtcp/rtcp.h" 12 #include "media/cast/rtcp/rtcp.h"
12 #include "media/cast/rtp_sender/rtp_sender.h" 13 #include "media/cast/rtp_sender/rtp_sender.h"
13 14
14 namespace media { 15 namespace media {
15 namespace cast { 16 namespace cast {
16 17
17 const int64 kMinSchedulingDelayMs = 1; 18 const int64 kMinSchedulingDelayMs = 1;
18 19
19 class LocalRtcpAudioSenderFeedback : public RtcpSenderFeedback { 20 class LocalRtcpAudioSenderFeedback : public RtcpSenderFeedback {
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 rtcp_feedback_.get(), 87 rtcp_feedback_.get(),
87 paced_packet_sender, 88 paced_packet_sender,
88 rtp_audio_sender_statistics_.get(), 89 rtp_audio_sender_statistics_.get(),
89 NULL, 90 NULL,
90 audio_config.rtcp_mode, 91 audio_config.rtcp_mode,
91 base::TimeDelta::FromMilliseconds(audio_config.rtcp_interval), 92 base::TimeDelta::FromMilliseconds(audio_config.rtcp_interval),
92 true, 93 true,
93 audio_config.sender_ssrc, 94 audio_config.sender_ssrc,
94 audio_config.rtcp_c_name), 95 audio_config.rtcp_c_name),
95 weak_factory_(this) { 96 weak_factory_(this) {
97 if (audio_config.aes_iv_mask.size() == kAesBlockSize * 2 &&
98 audio_config.aes_key.size() == kAesBlockSize * 2) {
99 iv_mask_ = ConvertFromBase16String(audio_config.aes_iv_mask);
Alpha Left Google 2013/11/07 01:10:11 The IV should be a binary string instead of a base
pwestin 2013/11/07 17:16:04 Done.
100 crypto::SymmetricKey* key = crypto::SymmetricKey::Import(
101 crypto::SymmetricKey::AES,
102 ConvertFromBase16String(audio_config.aes_key));
Alpha Left Google 2013/11/07 01:10:11 The key should be a binary string instead of a bas
pwestin 2013/11/07 17:16:04 Done.
103 encryptor_.reset(new crypto::Encryptor());
104 encryptor_->Init(key, crypto::Encryptor::CTR, std::string());
105 } else if (audio_config.aes_iv_mask.size() != 0 ||
106 audio_config.aes_iv_mask.size() != 0) {
107 DCHECK(false) << "Invalid crypto configuration";
108 }
109
96 rtcp_.SetRemoteSSRC(audio_config.incoming_feedback_ssrc); 110 rtcp_.SetRemoteSSRC(audio_config.incoming_feedback_ssrc);
97 111
98 if (!audio_config.use_external_encoder) { 112 if (!audio_config.use_external_encoder) {
99 audio_encoder_ = new AudioEncoder(cast_environment, audio_config); 113 audio_encoder_ = new AudioEncoder(cast_environment, audio_config);
100 } 114 }
101 ScheduleNextRtcpReport(); 115 ScheduleNextRtcpReport();
102 } 116 }
103 117
104 AudioSender::~AudioSender() {} 118 AudioSender::~AudioSender() {}
105 119
106 void AudioSender::InsertRawAudioFrame( 120 void AudioSender::InsertRawAudioFrame(
107 const PcmAudioFrame* audio_frame, 121 const PcmAudioFrame* audio_frame,
108 const base::TimeTicks& recorded_time, 122 const base::TimeTicks& recorded_time,
109 const base::Closure callback) { 123 const base::Closure callback) {
110 DCHECK(audio_encoder_.get()) << "Invalid internal state"; 124 DCHECK(audio_encoder_.get()) << "Invalid internal state";
111 125
112 audio_encoder_->InsertRawAudioFrame(audio_frame, recorded_time, 126 audio_encoder_->InsertRawAudioFrame(audio_frame, recorded_time,
113 base::Bind(&AudioSender::SendEncodedAudioFrame, 127 base::Bind(&AudioSender::SendEncodedAudioFrame,
114 weak_factory_.GetWeakPtr()), 128 weak_factory_.GetWeakPtr()),
115 callback); 129 callback);
116 } 130 }
117 131
118 void AudioSender::InsertCodedAudioFrame(const EncodedAudioFrame* audio_frame, 132 void AudioSender::InsertCodedAudioFrame(const EncodedAudioFrame* audio_frame,
119 const base::TimeTicks& recorded_time, 133 const base::TimeTicks& recorded_time,
120 const base::Closure callback) { 134 const base::Closure callback) {
121 DCHECK(audio_encoder_.get() == NULL) << "Invalid internal state"; 135 DCHECK(audio_encoder_.get() == NULL) << "Invalid internal state";
122 rtp_sender_.IncomingEncodedAudioFrame(audio_frame, recorded_time); 136
137 if (encryptor_) {
138 EncodedAudioFrame encrypted_frame;
139 if (EncryptAudioFrame(audio_frame, &encrypted_frame)) {
140 rtp_sender_.IncomingEncodedAudioFrame(&encrypted_frame, recorded_time);
141 } else {
142 DCHECK(false) << "Encryption error";
143 return;
144 }
145 } else {
146 rtp_sender_.IncomingEncodedAudioFrame(audio_frame, recorded_time);
147 }
123 callback.Run(); 148 callback.Run();
124 } 149 }
125 150
151 bool AudioSender::EncryptAudioFrame(const EncodedAudioFrame* audio_frame,
152 EncodedAudioFrame* encrypted_frame) {
153 DCHECK(encryptor_) << "Invalid state";
154
155 encryptor_->SetCounter(GetAesNounce(audio_frame->frame_id, iv_mask_));
156
157 encrypted_frame->codec = audio_frame->codec;
158 encrypted_frame->frame_id = audio_frame->frame_id;
159 encrypted_frame->samples = audio_frame->samples;
160
161 return encryptor_->Encrypt(audio_frame->data, &encrypted_frame->data);
162 }
163
126 void AudioSender::SendEncodedAudioFrame( 164 void AudioSender::SendEncodedAudioFrame(
127 scoped_ptr<EncodedAudioFrame> audio_frame, 165 scoped_ptr<EncodedAudioFrame> audio_frame,
128 const base::TimeTicks& recorded_time) { 166 const base::TimeTicks& recorded_time) {
129 rtp_sender_.IncomingEncodedAudioFrame(audio_frame.get(), recorded_time); 167 if (encryptor_) {
168 EncodedAudioFrame encrypted_frame;
169 if (EncryptAudioFrame(audio_frame.get(), &encrypted_frame)) {
170 rtp_sender_.IncomingEncodedAudioFrame(&encrypted_frame, recorded_time);
171 } else {
172 DCHECK(false) << "Encryption error";
173 return;
174 }
175 } else {
176 rtp_sender_.IncomingEncodedAudioFrame(audio_frame.get(), recorded_time);
177 }
130 } 178 }
131 179
132 void AudioSender::ResendPackets( 180 void AudioSender::ResendPackets(
133 const MissingFramesAndPacketsMap& missing_frames_and_packets) { 181 const MissingFramesAndPacketsMap& missing_frames_and_packets) {
134 rtp_sender_.ResendPackets(missing_frames_and_packets); 182 rtp_sender_.ResendPackets(missing_frames_and_packets);
135 } 183 }
136 184
137 void AudioSender::IncomingRtcpPacket(const uint8* packet, size_t length, 185 void AudioSender::IncomingRtcpPacket(const uint8* packet, size_t length,
138 const base::Closure callback) { 186 const base::Closure callback) {
139 rtcp_.IncomingRtcpPacket(packet, length); 187 rtcp_.IncomingRtcpPacket(packet, length);
(...skipping 12 matching lines...) Expand all
152 time_to_next); 200 time_to_next);
153 } 201 }
154 202
155 void AudioSender::SendRtcpReport() { 203 void AudioSender::SendRtcpReport() {
156 rtcp_.SendRtcpReport(incoming_feedback_ssrc_); 204 rtcp_.SendRtcpReport(incoming_feedback_ssrc_);
157 ScheduleNextRtcpReport(); 205 ScheduleNextRtcpReport();
158 } 206 }
159 207
160 } // namespace cast 208 } // namespace cast
161 } // namespace media 209 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698