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

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

Issue 2045243002: NetEq: Rename Nack to NackTracker to avoid name collisions in GN (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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 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 24 matching lines...) Expand all
35 class BufferLevelFilter; 35 class BufferLevelFilter;
36 class ComfortNoise; 36 class ComfortNoise;
37 class DecisionLogic; 37 class DecisionLogic;
38 class DecoderDatabase; 38 class DecoderDatabase;
39 class DelayManager; 39 class DelayManager;
40 class DelayPeakDetector; 40 class DelayPeakDetector;
41 class DtmfBuffer; 41 class DtmfBuffer;
42 class DtmfToneGenerator; 42 class DtmfToneGenerator;
43 class Expand; 43 class Expand;
44 class Merge; 44 class Merge;
45 class Nack; 45 class NackTracker;
46 class Normal; 46 class Normal;
47 class PacketBuffer; 47 class PacketBuffer;
48 class PayloadSplitter; 48 class PayloadSplitter;
49 class PostDecodeVad; 49 class PostDecodeVad;
50 class PreemptiveExpand; 50 class PreemptiveExpand;
51 class RandomVector; 51 class RandomVector;
52 class SyncBuffer; 52 class SyncBuffer;
53 class TimestampScaler; 53 class TimestampScaler;
54 struct AccelerateFactory; 54 struct AccelerateFactory;
55 struct DtmfEvent; 55 struct DtmfEvent;
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 bool reset_decoder_ GUARDED_BY(crit_sect_); 398 bool reset_decoder_ GUARDED_BY(crit_sect_);
399 uint8_t current_rtp_payload_type_ GUARDED_BY(crit_sect_); 399 uint8_t current_rtp_payload_type_ GUARDED_BY(crit_sect_);
400 uint8_t current_cng_rtp_payload_type_ GUARDED_BY(crit_sect_); 400 uint8_t current_cng_rtp_payload_type_ GUARDED_BY(crit_sect_);
401 uint32_t ssrc_ GUARDED_BY(crit_sect_); 401 uint32_t ssrc_ GUARDED_BY(crit_sect_);
402 bool first_packet_ GUARDED_BY(crit_sect_); 402 bool first_packet_ GUARDED_BY(crit_sect_);
403 int error_code_ GUARDED_BY(crit_sect_); // Store last error code. 403 int error_code_ GUARDED_BY(crit_sect_); // Store last error code.
404 int decoder_error_code_ GUARDED_BY(crit_sect_); 404 int decoder_error_code_ GUARDED_BY(crit_sect_);
405 const BackgroundNoiseMode background_noise_mode_ GUARDED_BY(crit_sect_); 405 const BackgroundNoiseMode background_noise_mode_ GUARDED_BY(crit_sect_);
406 NetEqPlayoutMode playout_mode_ GUARDED_BY(crit_sect_); 406 NetEqPlayoutMode playout_mode_ GUARDED_BY(crit_sect_);
407 bool enable_fast_accelerate_ GUARDED_BY(crit_sect_); 407 bool enable_fast_accelerate_ GUARDED_BY(crit_sect_);
408 std::unique_ptr<Nack> nack_ GUARDED_BY(crit_sect_); 408 std::unique_ptr<NackTracker> nack_ GUARDED_BY(crit_sect_);
409 bool nack_enabled_ GUARDED_BY(crit_sect_); 409 bool nack_enabled_ GUARDED_BY(crit_sect_);
410 const bool enable_muted_state_ GUARDED_BY(crit_sect_); 410 const bool enable_muted_state_ GUARDED_BY(crit_sect_);
411 AudioFrame::VADActivity last_vad_activity_ GUARDED_BY(crit_sect_) = 411 AudioFrame::VADActivity last_vad_activity_ GUARDED_BY(crit_sect_) =
412 AudioFrame::kVadPassive; 412 AudioFrame::kVadPassive;
413 std::unique_ptr<TickTimer::Stopwatch> generated_noise_stopwatch_ 413 std::unique_ptr<TickTimer::Stopwatch> generated_noise_stopwatch_
414 GUARDED_BY(crit_sect_); 414 GUARDED_BY(crit_sect_);
415 415
416 private: 416 private:
417 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl); 417 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl);
418 }; 418 };
419 419
420 } // namespace webrtc 420 } // namespace webrtc
421 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ 421 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq.gypi ('k') | webrtc/modules/audio_coding/neteq/neteq_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698