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

Unified Diff: webrtc/modules/audio_coding/neteq/timestamp_scaler.cc

Issue 1424083002: Make an enum class out of NetEqDecoder, and hide the neteq_decoders_ table (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 2 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
Index: webrtc/modules/audio_coding/neteq/timestamp_scaler.cc
diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc b/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc
index 0b0c73741cd13a43f3c9917a35f366ab4b712e1b..eb69ac78899ce9ff9670493bcc96def7046a3603 100644
--- a/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc
+++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc
@@ -44,15 +44,15 @@ uint32_t TimestampScaler::ToInternal(uint32_t external_timestamp,
return external_timestamp;
}
switch (info->codec_type) {
- case kDecoderG722:
- case kDecoderG722_2ch: {
+ case NetEqDecoder::kDecoderG722:
+ case NetEqDecoder::kDecoderG722_2ch: {
// Use timestamp scaling with factor 2 (two output samples per RTP
// timestamp).
numerator_ = 2;
denominator_ = 1;
break;
}
- case kDecoderCNGswb48kHz: {
+ case NetEqDecoder::kDecoderCNGswb48kHz: {
// Use timestamp scaling with factor 2/3 (32 kHz sample rate, but RTP
// timestamps run on 48 kHz).
// TODO(tlegrand): Remove scaling for kDecoderCNGswb48kHz once ACM has
@@ -61,10 +61,10 @@ uint32_t TimestampScaler::ToInternal(uint32_t external_timestamp,
denominator_ = 3;
break;
}
- case kDecoderAVT:
- case kDecoderCNGnb:
- case kDecoderCNGwb:
- case kDecoderCNGswb32kHz: {
+ case NetEqDecoder::kDecoderAVT:
+ case NetEqDecoder::kDecoderCNGnb:
+ case NetEqDecoder::kDecoderCNGwb:
+ case NetEqDecoder::kDecoderCNGswb32kHz: {
// Do not change the timestamp scaling settings for DTMF or CNG.
break;
}

Powered by Google App Engine
This is Rietveld 408576698