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

Side by Side Diff: webrtc/modules/audio_coding/neteq/neteq_impl.h

Issue 1467163002: NetEq: Add new method last_output_sample_rate_hz (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 161
162 // Enables post-decode VAD. When enabled, GetAudio() will return 162 // Enables post-decode VAD. When enabled, GetAudio() will return
163 // kOutputVADPassive when the signal contains no speech. 163 // kOutputVADPassive when the signal contains no speech.
164 void EnableVad() override; 164 void EnableVad() override;
165 165
166 // Disables post-decode VAD. 166 // Disables post-decode VAD.
167 void DisableVad() override; 167 void DisableVad() override;
168 168
169 bool GetPlayoutTimestamp(uint32_t* timestamp) override; 169 bool GetPlayoutTimestamp(uint32_t* timestamp) override;
170 170
171 int last_output_sample_rate_hz() const override;
172
171 int SetTargetNumberOfChannels() override; 173 int SetTargetNumberOfChannels() override;
172 174
173 int SetTargetSampleRate() override; 175 int SetTargetSampleRate() override;
174 176
175 // Returns the error code for the last occurred error. If no error has 177 // Returns the error code for the last occurred error. If no error has
176 // occurred, 0 is returned. 178 // occurred, 0 is returned.
177 int LastError() const override; 179 int LastError() const override;
178 180
179 // Returns the error code last returned by a decoder (audio or comfort noise). 181 // Returns the error code last returned by a decoder (audio or comfort noise).
180 // When LastError() returns kDecoderErrorCode or kComfortNoiseErrorCode, check 182 // When LastError() returns kDecoderErrorCode or kComfortNoiseErrorCode, check
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 rtc::scoped_ptr<Normal> normal_ GUARDED_BY(crit_sect_); 370 rtc::scoped_ptr<Normal> normal_ GUARDED_BY(crit_sect_);
369 rtc::scoped_ptr<Merge> merge_ GUARDED_BY(crit_sect_); 371 rtc::scoped_ptr<Merge> merge_ GUARDED_BY(crit_sect_);
370 rtc::scoped_ptr<Accelerate> accelerate_ GUARDED_BY(crit_sect_); 372 rtc::scoped_ptr<Accelerate> accelerate_ GUARDED_BY(crit_sect_);
371 rtc::scoped_ptr<PreemptiveExpand> preemptive_expand_ GUARDED_BY(crit_sect_); 373 rtc::scoped_ptr<PreemptiveExpand> preemptive_expand_ GUARDED_BY(crit_sect_);
372 RandomVector random_vector_ GUARDED_BY(crit_sect_); 374 RandomVector random_vector_ GUARDED_BY(crit_sect_);
373 rtc::scoped_ptr<ComfortNoise> comfort_noise_ GUARDED_BY(crit_sect_); 375 rtc::scoped_ptr<ComfortNoise> comfort_noise_ GUARDED_BY(crit_sect_);
374 Rtcp rtcp_ GUARDED_BY(crit_sect_); 376 Rtcp rtcp_ GUARDED_BY(crit_sect_);
375 StatisticsCalculator stats_ GUARDED_BY(crit_sect_); 377 StatisticsCalculator stats_ GUARDED_BY(crit_sect_);
376 int fs_hz_ GUARDED_BY(crit_sect_); 378 int fs_hz_ GUARDED_BY(crit_sect_);
377 int fs_mult_ GUARDED_BY(crit_sect_); 379 int fs_mult_ GUARDED_BY(crit_sect_);
380 int last_output_sample_rate_hz_ GUARDED_BY(crit_sect_);
378 size_t output_size_samples_ GUARDED_BY(crit_sect_); 381 size_t output_size_samples_ GUARDED_BY(crit_sect_);
379 size_t decoder_frame_length_ GUARDED_BY(crit_sect_); 382 size_t decoder_frame_length_ GUARDED_BY(crit_sect_);
380 Modes last_mode_ GUARDED_BY(crit_sect_); 383 Modes last_mode_ GUARDED_BY(crit_sect_);
381 rtc::scoped_ptr<int16_t[]> mute_factor_array_ GUARDED_BY(crit_sect_); 384 rtc::scoped_ptr<int16_t[]> mute_factor_array_ GUARDED_BY(crit_sect_);
382 size_t decoded_buffer_length_ GUARDED_BY(crit_sect_); 385 size_t decoded_buffer_length_ GUARDED_BY(crit_sect_);
383 rtc::scoped_ptr<int16_t[]> decoded_buffer_ GUARDED_BY(crit_sect_); 386 rtc::scoped_ptr<int16_t[]> decoded_buffer_ GUARDED_BY(crit_sect_);
384 uint32_t playout_timestamp_ GUARDED_BY(crit_sect_); 387 uint32_t playout_timestamp_ GUARDED_BY(crit_sect_);
385 bool new_codec_ GUARDED_BY(crit_sect_); 388 bool new_codec_ GUARDED_BY(crit_sect_);
386 uint32_t timestamp_ GUARDED_BY(crit_sect_); 389 uint32_t timestamp_ GUARDED_BY(crit_sect_);
387 bool reset_decoder_ GUARDED_BY(crit_sect_); 390 bool reset_decoder_ GUARDED_BY(crit_sect_);
388 uint8_t current_rtp_payload_type_ GUARDED_BY(crit_sect_); 391 uint8_t current_rtp_payload_type_ GUARDED_BY(crit_sect_);
389 uint8_t current_cng_rtp_payload_type_ GUARDED_BY(crit_sect_); 392 uint8_t current_cng_rtp_payload_type_ GUARDED_BY(crit_sect_);
390 uint32_t ssrc_ GUARDED_BY(crit_sect_); 393 uint32_t ssrc_ GUARDED_BY(crit_sect_);
391 bool first_packet_ GUARDED_BY(crit_sect_); 394 bool first_packet_ GUARDED_BY(crit_sect_);
392 int error_code_ GUARDED_BY(crit_sect_); // Store last error code. 395 int error_code_ GUARDED_BY(crit_sect_); // Store last error code.
393 int decoder_error_code_ GUARDED_BY(crit_sect_); 396 int decoder_error_code_ GUARDED_BY(crit_sect_);
394 const BackgroundNoiseMode background_noise_mode_ GUARDED_BY(crit_sect_); 397 const BackgroundNoiseMode background_noise_mode_ GUARDED_BY(crit_sect_);
395 NetEqPlayoutMode playout_mode_ GUARDED_BY(crit_sect_); 398 NetEqPlayoutMode playout_mode_ GUARDED_BY(crit_sect_);
396 bool enable_fast_accelerate_ GUARDED_BY(crit_sect_); 399 bool enable_fast_accelerate_ GUARDED_BY(crit_sect_);
397 rtc::scoped_ptr<Nack> nack_ GUARDED_BY(crit_sect_); 400 rtc::scoped_ptr<Nack> nack_ GUARDED_BY(crit_sect_);
398 bool nack_enabled_ GUARDED_BY(crit_sect_); 401 bool nack_enabled_ GUARDED_BY(crit_sect_);
399 402
400 private: 403 private:
401 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl); 404 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl);
402 }; 405 };
403 406
404 } // namespace webrtc 407 } // namespace webrtc
405 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ 408 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698