Index: webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc |
diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc |
index aed8a4675b6f84cf219d57d2c1f5e71f98f83091..b1cb45d2014299ce0a2c5c1fbd10c35c0cd573c5 100644 |
--- a/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc |
+++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc |
@@ -24,7 +24,8 @@ namespace webrtc { |
TEST(TimestampScaler, TestNoScaling) { |
MockDecoderDatabase db; |
DecoderDatabase::DecoderInfo info; |
- info.codec_type = kDecoderPCMu; // Does not use scaled timestamps. |
+ info.codec_type = |
+ NetEqDecoder::kDecoderPCMu; // Does not use scaled timestamps. |
static const uint8_t kRtpPayloadType = 0; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -44,7 +45,8 @@ TEST(TimestampScaler, TestNoScaling) { |
TEST(TimestampScaler, TestNoScalingLargeStep) { |
MockDecoderDatabase db; |
DecoderDatabase::DecoderInfo info; |
- info.codec_type = kDecoderPCMu; // Does not use scaled timestamps. |
+ info.codec_type = |
+ NetEqDecoder::kDecoderPCMu; // Does not use scaled timestamps. |
static const uint8_t kRtpPayloadType = 0; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -69,7 +71,7 @@ TEST(TimestampScaler, TestNoScalingLargeStep) { |
TEST(TimestampScaler, TestG722) { |
MockDecoderDatabase db; |
DecoderDatabase::DecoderInfo info; |
- info.codec_type = kDecoderG722; // Uses a factor 2 scaling. |
+ info.codec_type = NetEqDecoder::kDecoderG722; // Uses a factor 2 scaling. |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -93,7 +95,7 @@ TEST(TimestampScaler, TestG722) { |
TEST(TimestampScaler, TestG722LargeStep) { |
MockDecoderDatabase db; |
DecoderDatabase::DecoderInfo info; |
- info.codec_type = kDecoderG722; // Uses a factor 2 scaling. |
+ info.codec_type = NetEqDecoder::kDecoderG722; // Uses a factor 2 scaling. |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -121,8 +123,9 @@ TEST(TimestampScaler, TestG722LargeStep) { |
TEST(TimestampScaler, TestG722WithCng) { |
MockDecoderDatabase db; |
DecoderDatabase::DecoderInfo info_g722, info_cng; |
- info_g722.codec_type = kDecoderG722; // Uses a factor 2 scaling. |
- info_cng.codec_type = kDecoderCNGwb; |
+ info_g722.codec_type = |
+ NetEqDecoder::kDecoderG722; // Uses a factor 2 scaling. |
+ info_cng.codec_type = NetEqDecoder::kDecoderCNGwb; |
static const uint8_t kRtpPayloadTypeG722 = 17; |
static const uint8_t kRtpPayloadTypeCng = 13; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadTypeG722)) |
@@ -162,7 +165,8 @@ TEST(TimestampScaler, TestG722WithCng) { |
TEST(TimestampScaler, TestG722Packet) { |
MockDecoderDatabase db; |
DecoderDatabase::DecoderInfo info; |
- info.codec_type = kDecoderG722; // Does uses a factor 2 scaling. |
+ info.codec_type = |
+ NetEqDecoder::kDecoderG722; // Does uses a factor 2 scaling. |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -190,7 +194,7 @@ TEST(TimestampScaler, TestG722Packet) { |
TEST(TimestampScaler, TestG722PacketList) { |
MockDecoderDatabase db; |
DecoderDatabase::DecoderInfo info; |
- info.codec_type = kDecoderG722; // Uses a factor 2 scaling. |
+ info.codec_type = NetEqDecoder::kDecoderG722; // Uses a factor 2 scaling. |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -219,7 +223,7 @@ TEST(TimestampScaler, TestG722PacketList) { |
TEST(TimestampScaler, TestG722Reset) { |
MockDecoderDatabase db; |
DecoderDatabase::DecoderInfo info; |
- info.codec_type = kDecoderG722; // Uses a factor 2 scaling. |
+ info.codec_type = NetEqDecoder::kDecoderG722; // Uses a factor 2 scaling. |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -259,7 +263,7 @@ TEST(TimestampScaler, TestG722Reset) { |
TEST(TimestampScaler, TestOpusLargeStep) { |
MockDecoderDatabase db; |
DecoderDatabase::DecoderInfo info; |
- info.codec_type = kDecoderOpus; |
+ info.codec_type = NetEqDecoder::kDecoderOpus; |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |