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

Side by Side Diff: webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc

Issue 2537243004: Revert of Renaming AudioEncoder::SetTargetBitrate and SetProjectedPacketLossRate. (Closed)
Patch Set: Created 4 years 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 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 } 172 }
173 173
174 bool AudioEncoderCng::SetApplication(Application application) { 174 bool AudioEncoderCng::SetApplication(Application application) {
175 return speech_encoder_->SetApplication(application); 175 return speech_encoder_->SetApplication(application);
176 } 176 }
177 177
178 void AudioEncoderCng::SetMaxPlaybackRate(int frequency_hz) { 178 void AudioEncoderCng::SetMaxPlaybackRate(int frequency_hz) {
179 speech_encoder_->SetMaxPlaybackRate(frequency_hz); 179 speech_encoder_->SetMaxPlaybackRate(frequency_hz);
180 } 180 }
181 181
182 void AudioEncoderCng::SetProjectedPacketLossRate(double fraction) {
183 speech_encoder_->SetProjectedPacketLossRate(fraction);
184 }
185
186 void AudioEncoderCng::SetTargetBitrate(int bits_per_second) {
187 speech_encoder_->SetTargetBitrate(bits_per_second);
188 }
189
182 rtc::ArrayView<std::unique_ptr<AudioEncoder>> 190 rtc::ArrayView<std::unique_ptr<AudioEncoder>>
183 AudioEncoderCng::ReclaimContainedEncoders() { 191 AudioEncoderCng::ReclaimContainedEncoders() {
184 return rtc::ArrayView<std::unique_ptr<AudioEncoder>>(&speech_encoder_, 1); 192 return rtc::ArrayView<std::unique_ptr<AudioEncoder>>(&speech_encoder_, 1);
185 } 193 }
186 194
187 void AudioEncoderCng::OnReceivedUplinkPacketLossFraction(
188 float uplink_packet_loss_fraction) {
189 speech_encoder_->OnReceivedUplinkPacketLossFraction(
190 uplink_packet_loss_fraction);
191 }
192
193 void AudioEncoderCng::OnReceivedTargetAudioBitrate(
194 int target_audio_bitrate_bps) {
195 speech_encoder_->OnReceivedTargetAudioBitrate(target_audio_bitrate_bps);
196 }
197
198 AudioEncoder::EncodedInfo AudioEncoderCng::EncodePassive( 195 AudioEncoder::EncodedInfo AudioEncoderCng::EncodePassive(
199 size_t frames_to_encode, 196 size_t frames_to_encode,
200 rtc::Buffer* encoded) { 197 rtc::Buffer* encoded) {
201 bool force_sid = last_frame_active_; 198 bool force_sid = last_frame_active_;
202 bool output_produced = false; 199 bool output_produced = false;
203 const size_t samples_per_10ms_frame = SamplesPer10msFrame(); 200 const size_t samples_per_10ms_frame = SamplesPer10msFrame();
204 AudioEncoder::EncodedInfo info; 201 AudioEncoder::EncodedInfo info;
205 202
206 for (size_t i = 0; i < frames_to_encode; ++i) { 203 for (size_t i = 0; i < frames_to_encode; ++i) {
207 // It's important not to pass &info.encoded_bytes directly to 204 // It's important not to pass &info.encoded_bytes directly to
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 } 247 }
251 } 248 }
252 return info; 249 return info;
253 } 250 }
254 251
255 size_t AudioEncoderCng::SamplesPer10msFrame() const { 252 size_t AudioEncoderCng::SamplesPer10msFrame() const {
256 return rtc::CheckedDivExact(10 * SampleRateHz(), 1000); 253 return rtc::CheckedDivExact(10 * SampleRateHz(), 1000);
257 } 254 }
258 255
259 } // namespace webrtc 256 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698