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

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

Issue 2355503002: Stopped using the NetEqDecoder enum internally in NetEq. (Closed)
Patch Set: Created 4 years, 3 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 1f28639e435efcd9a94fb1813a5f3687f050e353..cc9b34a27a231ac5ae65b1ccc885d85c3358289c 100644
--- a/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc
+++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc
@@ -45,7 +45,7 @@ uint32_t TimestampScaler::ToInternal(uint32_t external_timestamp,
if (!(info->IsComfortNoise() || info->IsDtmf())) {
// Do not change the timestamp scaling settings for DTMF or CNG.
numerator_ = info->SampleRateHz();
- if (info->codec_type == NetEqDecoder::kDecoderArbitrary) {
+ if (info->GetFormat().clockrate_hz == 0) {
// We have no format mapping for "arbitrary" external codecs, so we cannot
// support timestamp scaling of them.
kwiberg-webrtc 2016/09/20 16:05:43 The comment probably needs updating.
ossu 2016/09/21 09:10:56 The check is there to cover the exact same case, b
denominator_ = numerator_;

Powered by Google App Engine
This is Rietveld 408576698