Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 6624f1a

Browse files
Jakob Ivarssonjianjunz
authored andcommitted
Reland "Change default NetEq sample rate to 48k."
This is a reland of commit 38fcd58 Original change's description: > Change default NetEq sample rate to 48k. > > This should avoid some resampling before any packets have been received given that the vast majority of devices use 48k sample rate and the most common codec is Opus (which we always decode in 48k). > > Bug: none > Change-Id: Ie7baea57c3eb1b763a6460c3b06b56d67b2b258e > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/280662 > Commit-Queue: Jakob Ivarsson‎ <[email protected]> > Reviewed-by: Henrik Lundin <[email protected]> > Cr-Commit-Position: refs/heads/main@{#38536} Bug: none Change-Id: Id634799286f6d1f1eaf315ebe8e70de669d589db Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/281900 Reviewed-by: Henrik Lundin <[email protected]> Commit-Queue: Jakob Ivarsson‎ <[email protected]> Cr-Commit-Position: refs/heads/main@{#38572}
1 parent 3efaba1 commit 6624f1a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

api/neteq/neteq.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class NetEq {
128128

129129
std::string ToString() const;
130130

131-
int sample_rate_hz = 16000; // Initial value. Will change with input data.
131+
int sample_rate_hz = 48000; // Initial value. Will change with input data.
132132
bool enable_post_decode_vad = false;
133133
size_t max_packets_in_buffer = 200;
134134
int max_delay_ms = 0;

modules/audio_coding/acm2/audio_coding_module_unittest.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,15 +1030,15 @@ class AcmSenderBitExactnessNewApi : public AcmSenderBitExactnessOldApi {};
10301030
defined(NDEBUG) && defined(WEBRTC_LINUX) && defined(WEBRTC_ARCH_X86_64)
10311031
TEST_F(AcmSenderBitExactnessOldApi, IsacWb30ms) {
10321032
ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 480, 480));
1033-
Run(/*audio_checksum_ref=*/"a3077ac01b0137e8bbc237fb1f9816a5",
1033+
Run(/*audio_checksum_ref=*/"37ecdabad1698a857cf811e6d1fa91df",
10341034
/*payload_checksum_ref=*/"3c79f16f34218271f3dca4e2b1dfe1bb",
10351035
/*expected_packets=*/33,
10361036
/*expected_channels=*/test::AcmReceiveTestOldApi::kMonoOutput);
10371037
}
10381038

10391039
TEST_F(AcmSenderBitExactnessOldApi, IsacWb60ms) {
10401040
ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 960, 960));
1041-
Run(/*audio_checksum_ref=*/"76da9b7514f986fc2bb32b1c3170e8d4",
1041+
Run(/*audio_checksum_ref=*/"0e9078d23454901496a88362ba0740c3",
10421042
/*payload_checksum_ref=*/"9e0a0ab743ad987b55b8e14802769c56",
10431043
/*expected_packets=*/16,
10441044
/*expected_channels=*/test::AcmReceiveTestOldApi::kMonoOutput);
@@ -1067,7 +1067,7 @@ TEST_F(AcmSenderBitExactnessOldApi, Pcm16_8000khz_10ms) {
10671067

10681068
TEST_F(AcmSenderBitExactnessOldApi, Pcm16_16000khz_10ms) {
10691069
ASSERT_NO_FATAL_FAILURE(SetUpTest("L16", 16000, 1, 108, 160, 160));
1070-
Run(/*audio_checksum_ref=*/"bc6ab94d12a464921763d7544fdbd07e",
1070+
Run(/*audio_checksum_ref=*/"f95c87bdd33f631bcf80f4b19445bbd2",
10711071
/*payload_checksum_ref=*/"ad786526383178b08d80d6eee06e9bad",
10721072
/*expected_packets=*/100,
10731073
/*expected_channels=*/test::AcmReceiveTestOldApi::kMonoOutput);
@@ -1151,7 +1151,7 @@ TEST_F(AcmSenderBitExactnessOldApi, Ilbc_30ms) {
11511151
#if defined(WEBRTC_LINUX) && defined(WEBRTC_ARCH_X86_64)
11521152
TEST_F(AcmSenderBitExactnessOldApi, G722_20ms) {
11531153
ASSERT_NO_FATAL_FAILURE(SetUpTest("G722", 16000, 1, 9, 320, 160));
1154-
Run(/*audio_checksum_ref=*/"a87a91ec0124510a64967f5d768554ff",
1154+
Run(/*audio_checksum_ref=*/"f5264affff25cf2cbd2e1e8a5217f9a3",
11551155
/*payload_checksum_ref=*/"fc68a87e1380614e658087cb35d5ca10",
11561156
/*expected_packets=*/50,
11571157
/*expected_channels=*/test::AcmReceiveTestOldApi::kMonoOutput);

0 commit comments

Comments
 (0)