Remove references, mentions and test files for iLBC.
Bug: webrtc:397867162
Change-Id: Ie24333d73843b36eed6fc5b5d4fa7ec5eb4fed10
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378060
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Tomas Lundqvist <tomasl@google.com>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44033}
diff --git a/api/audio_codecs/audio_encoder.h b/api/audio_codecs/audio_encoder.h
index d84d2b5..55470ec 100644
--- a/api/audio_codecs/audio_encoder.h
+++ b/api/audio_codecs/audio_encoder.h
@@ -80,7 +80,6 @@
kPcmA = 3,
kPcmU = 4,
kG722 = 5,
- kIlbc = 6,
// Number of histogram bins in the UMA logging of codec types. The
// total number of different codecs that are logged cannot exceed this
diff --git a/call/payload_type_picker.cc b/call/payload_type_picker.cc
index 269c67b..4c6f501 100644
--- a/call/payload_type_picker.cc
+++ b/call/payload_type_picker.cc
@@ -168,7 +168,9 @@
// Payload type assignments currently used by WebRTC.
// Includes data to reduce collisions (and thus reassignments)
- {{cricket::kIlbcCodecName, 8000, 1}, 102},
+ // TODO(bugs.webrtc.org/400630582): Delete this, it's only for test
+ // stability.
+ {{"reserved-do-not-use", 0, 0}, 102},
{{cricket::kCnCodecName, 16000, 1}, 105},
{{cricket::kCnCodecName, 32000, 1}, 106},
{{cricket::kOpusCodecName,
diff --git a/common_audio/signal_processing/include/signal_processing_library.h b/common_audio/signal_processing/include/signal_processing_library.h
index d6e9d5e..72c5fc4 100644
--- a/common_audio/signal_processing/include/signal_processing_library.h
+++ b/common_audio/signal_processing/include/signal_processing_library.h
@@ -40,7 +40,7 @@
#define WEBRTC_SPL_MUL_16_U16(a, b) ((int32_t)(int16_t)(a) * (uint16_t)(b))
// clang-format off
-// clang-format would choose some identation
+// clang-format would choose some indentation
// leading to presubmit error (cpplint.py)
#ifndef WEBRTC_ARCH_ARM_V7
// For ARMv7 platforms, these are inline functions in spl_inl_armv7.h
@@ -1141,7 +1141,7 @@
// meaning that the first sample of `in_vector` is copied to the last sample of
// the `out_vector`. The procedure continues until the last sample of
// `in_vector` has been copied to the first sample of `out_vector`. This
-// creates a reversed vector. Used in e.g. prediction in iLBC.
+// creates a reversed vector.
//
// Input:
// - in_vector : Pointer to the first sample in a int16_t vector
diff --git a/docs/faq.md b/docs/faq.md
index ccaf104..3c48a39 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -164,7 +164,7 @@
### What codecs are supported in WebRTC?
-The currently supported voice codecs are G.711, G.722, iLBC, and iSAC, and VP8
+The currently supported voice codecs are G.711, G.722, and Opus, while VP8
is the supported video codec. The list of supported codecs may change in the
future.
diff --git a/examples/androidvoip/jni/android_voip_client.cc b/examples/androidvoip/jni/android_voip_client.cc
index 81ea27d..46e95fc 100644
--- a/examples/androidvoip/jni/android_voip_client.cc
+++ b/examples/androidvoip/jni/android_voip_client.cc
@@ -110,8 +110,6 @@
return static_cast<int>(PayloadType::kOpus);
} else if (codec_name == "ISAC") {
return static_cast<int>(PayloadType::kIsac);
- } else if (codec_name == "ILBC") {
- return static_cast<int>(PayloadType::kIlbc);
}
RTC_DCHECK_NOTREACHED();
diff --git a/media/base/media_constants.cc b/media/base/media_constants.cc
index 76a77bb..99ccddf 100644
--- a/media/base/media_constants.cc
+++ b/media/base/media_constants.cc
@@ -45,7 +45,6 @@
const char kOpusCodecName[] = "opus";
const char kL16CodecName[] = "L16";
const char kG722CodecName[] = "G722";
-const char kIlbcCodecName[] = "ILBC";
const char kPcmuCodecName[] = "PCMU";
const char kPcmaCodecName[] = "PCMA";
const char kCnCodecName[] = "CN";
diff --git a/media/base/media_constants.h b/media/base/media_constants.h
index 80e17b1..9ad8366 100644
--- a/media/base/media_constants.h
+++ b/media/base/media_constants.h
@@ -47,7 +47,6 @@
extern const char kOpusCodecName[];
extern const char kL16CodecName[];
extern const char kG722CodecName[];
-extern const char kIlbcCodecName[];
extern const char kPcmuCodecName[];
extern const char kPcmaCodecName[];
extern const char kCnCodecName[];
diff --git a/modules/audio_coding/acm2/acm_receive_test.cc b/modules/audio_coding/acm2/acm_receive_test.cc
index 5cc62f2..bc8ed2a 100644
--- a/modules/audio_coding/acm2/acm_receive_test.cc
+++ b/modules/audio_coding/acm2/acm_receive_test.cc
@@ -56,7 +56,6 @@
{110, {"PCMU", 8000, 2}},
{8, {"PCMA", 8000, 1}},
{118, {"PCMA", 8000, 2}},
- {102, {"ILBC", 8000, 1}},
{9, {"G722", 8000, 1}},
{119, {"G722", 8000, 2}},
{120, {"OPUS", 48000, 2, {{"stereo", "1"}}}},
diff --git a/modules/audio_coding/neteq/red_payload_splitter_unittest.cc b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc
index 156669d..7a5dde0 100644
--- a/modules/audio_coding/neteq/red_payload_splitter_unittest.cc
+++ b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc
@@ -283,8 +283,8 @@
// 0 = CNGnb
// 1 = PCMu
// 2 = DTMF (AVT)
-// 3 = iLBC
-// We expect the method CheckRedPayloads to discard the iLBC packet, since it
+// 3 = PCMa
+// We expect the method CheckRedPayloads to discard the PCMa packet, since it
// is a non-CNG, non-DTMF payload of another type than the first speech payload
// found in the list (which is PCMu).
TEST(RedPayloadSplitter, CheckRedPayloads) {
@@ -304,7 +304,7 @@
decoder_database.RegisterPayload(1, SdpAudioFormat("pcmu", 8000, 1));
decoder_database.RegisterPayload(2,
SdpAudioFormat("telephone-event", 8000, 1));
- decoder_database.RegisterPayload(3, SdpAudioFormat("ilbc", 8000, 1));
+ decoder_database.RegisterPayload(1, SdpAudioFormat("pcma", 8000, 1));
RedPayloadSplitter splitter;
splitter.CheckRedPayloads(&packet_list, decoder_database);
diff --git a/modules/audio_coding/neteq/test/neteq_decoding_test.cc b/modules/audio_coding/neteq/test/neteq_decoding_test.cc
index 50bfd4b..eee9cc3 100644
--- a/modules/audio_coding/neteq/test/neteq_decoding_test.cc
+++ b/modules/audio_coding/neteq/test/neteq_decoding_test.cc
@@ -39,10 +39,6 @@
neteq->RegisterPayloadType(0, SdpAudioFormat("pcmu", 8000, 1)));
ASSERT_EQ(true,
neteq->RegisterPayloadType(8, SdpAudioFormat("pcma", 8000, 1)));
-#ifdef WEBRTC_CODEC_ILBC
- ASSERT_EQ(true,
- neteq->RegisterPayloadType(102, SdpAudioFormat("ilbc", 8000, 1)));
-#endif
#if defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)
ASSERT_EQ(true,
neteq->RegisterPayloadType(103, SdpAudioFormat("isac", 16000, 1)));
diff --git a/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc
index 24e3ee7..4e19ae5 100644
--- a/modules/audio_coding/test/TestStereo.cc
+++ b/modules/audio_coding/test/TestStereo.cc
@@ -152,7 +152,6 @@
{110, {"PCMU", 8000, 2}},
{8, {"PCMA", 8000, 1}},
{118, {"PCMA", 8000, 2}},
- {102, {"ILBC", 8000, 1}},
{9, {"G722", 8000, 1}},
{119, {"G722", 8000, 2}},
{120, {"OPUS", 48000, 2, {{"stereo", "1"}}}},
diff --git a/pc/codec_vendor_unittest.cc b/pc/codec_vendor_unittest.cc
index f6631d6..178c8ee 100644
--- a/pc/codec_vendor_unittest.cc
+++ b/pc/codec_vendor_unittest.cc
@@ -36,7 +36,7 @@
const Codec kAudioCodecs1[] = {CreateAudioCodec(111, "opus", 48000, 2),
CreateRedAudioCodec("111"),
- CreateAudioCodec(102, "iLBC", 8000, 1),
+ CreateAudioCodec(102, "G722", 16000, 1),
CreateAudioCodec(0, "PCMU", 8000, 1),
CreateAudioCodec(8, "PCMA", 8000, 1),
CreateAudioCodec(107, "CN", 48000, 1)};
@@ -44,11 +44,11 @@
const Codec kAudioCodecs2[] = {
CreateAudioCodec(126, "foo", 16000, 1),
CreateAudioCodec(0, "PCMU", 8000, 1),
- CreateAudioCodec(127, "iLBC", 8000, 1),
+ CreateAudioCodec(127, "G722", 16000, 1),
};
const Codec kAudioCodecsAnswer[] = {
- CreateAudioCodec(102, "iLBC", 8000, 1),
+ CreateAudioCodec(102, "G722", 16000, 1),
CreateAudioCodec(0, "PCMU", 8000, 1),
};
@@ -65,17 +65,17 @@
const std::vector<Codec> sendrecv_codecs = MAKE_VECTOR(kAudioCodecsAnswer);
CodecList no_codecs;
- RTC_CHECK_EQ(send_codecs[2].name, "iLBC")
+ RTC_CHECK_EQ(send_codecs[2].name, "G722")
<< "Please don't change shared test data!";
- RTC_CHECK_EQ(recv_codecs[2].name, "iLBC")
+ RTC_CHECK_EQ(recv_codecs[2].name, "G722")
<< "Please don't change shared test data!";
// Alter iLBC send codec to have zero channels, to test that that is handled
// properly.
send_codecs[2].channels = 0;
- // Alter iLBC receive codec to be lowercase, to test that case conversions
+ // Alter PCMU receive codec to be lowercase, to test that case conversions
// are handled properly.
- recv_codecs[2].name = "ilbc";
+ recv_codecs[1].name = "pcmu";
// Test proper merge
codec_vendor.set_audio_codecs(CodecList::CreateFromTrustedData(send_codecs),
diff --git a/pc/media_session_unittest.cc b/pc/media_session_unittest.cc
index 09fbdf6..2b01a69 100644
--- a/pc/media_session_unittest.cc
+++ b/pc/media_session_unittest.cc
@@ -92,7 +92,7 @@
const Codec kAudioCodecs1[] = {CreateAudioCodec(111, "opus", 48000, 2),
CreateRedAudioCodec("111"),
- CreateAudioCodec(102, "iLBC", 8000, 1),
+ CreateAudioCodec(102, "G722", 16000, 1),
CreateAudioCodec(0, "PCMU", 8000, 1),
CreateAudioCodec(8, "PCMA", 8000, 1),
CreateAudioCodec(107, "CN", 48000, 1)};
@@ -100,11 +100,11 @@
const Codec kAudioCodecs2[] = {
CreateAudioCodec(126, "foo", 16000, 1),
CreateAudioCodec(0, "PCMU", 8000, 1),
- CreateAudioCodec(127, "iLBC", 8000, 1),
+ CreateAudioCodec(127, "G722", 16000, 1),
};
const Codec kAudioCodecsAnswer[] = {
- CreateAudioCodec(102, "iLBC", 8000, 1),
+ CreateAudioCodec(102, "G722", 16000, 1),
CreateAudioCodec(0, "PCMU", 8000, 1),
};
@@ -4628,7 +4628,7 @@
f1_.CreateOfferOrError(opts, nullptr).MoveValue();
ASSERT_TRUE(offer.get());
// Set the protocol for all the contents.
- for (auto& content : offer.get()->contents()) {
+ for (auto& content : offer->contents()) {
content.media_description()->set_protocol(GetParam());
}
std::unique_ptr<SessionDescription> answer =
diff --git a/resources/audio_coding/F00.BIT20.sha1 b/resources/audio_coding/F00.BIT20.sha1
deleted file mode 100644
index dcbaa09..0000000
--- a/resources/audio_coding/F00.BIT20.sha1
+++ /dev/null
@@ -1 +0,0 @@
-27e30ed5e0d449db1cd729c382e18455ad3834fe
\ No newline at end of file
diff --git a/resources/audio_coding/F00.BIT30.sha1 b/resources/audio_coding/F00.BIT30.sha1
deleted file mode 100644
index 874ce9d..0000000
--- a/resources/audio_coding/F00.BIT30.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6bafbd8667365939c327eef627fa0f94a75e5fa9
\ No newline at end of file
diff --git a/resources/audio_coding/F00.INP.sha1 b/resources/audio_coding/F00.INP.sha1
deleted file mode 100644
index 3166f99..0000000
--- a/resources/audio_coding/F00.INP.sha1
+++ /dev/null
@@ -1 +0,0 @@
-44bb846907928e958531e805758767bf9353e03c
\ No newline at end of file
diff --git a/resources/audio_coding/F00.OUT20.sha1 b/resources/audio_coding/F00.OUT20.sha1
deleted file mode 100644
index 9b9f4bd..0000000
--- a/resources/audio_coding/F00.OUT20.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bb80d3c48c42bb14c8e613a8576cb77283cda3a7
\ No newline at end of file
diff --git a/resources/audio_coding/F00.OUT30.sha1 b/resources/audio_coding/F00.OUT30.sha1
deleted file mode 100644
index cd62333..0000000
--- a/resources/audio_coding/F00.OUT30.sha1
+++ /dev/null
@@ -1 +0,0 @@
-450b538234feff02f35b3e57fbeea5d93a41abe0
\ No newline at end of file
diff --git a/resources/audio_coding/F01.BIT20.sha1 b/resources/audio_coding/F01.BIT20.sha1
deleted file mode 100644
index 7a26724..0000000
--- a/resources/audio_coding/F01.BIT20.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a6230cfa6786ba3d81510aabcaa68bd9b1610d1a
\ No newline at end of file
diff --git a/resources/audio_coding/F01.BIT30.sha1 b/resources/audio_coding/F01.BIT30.sha1
deleted file mode 100644
index e5a0e5a..0000000
--- a/resources/audio_coding/F01.BIT30.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4f706d94506e0a4dc56f63940caa588e2531a455
\ No newline at end of file
diff --git a/resources/audio_coding/F01.INP.sha1 b/resources/audio_coding/F01.INP.sha1
deleted file mode 100644
index a1c1b20..0000000
--- a/resources/audio_coding/F01.INP.sha1
+++ /dev/null
@@ -1 +0,0 @@
-23780ea4c8893813787f7ab1dc7ab68075ad89c0
\ No newline at end of file
diff --git a/resources/audio_coding/F01.OUT20.sha1 b/resources/audio_coding/F01.OUT20.sha1
deleted file mode 100644
index db6100b..0000000
--- a/resources/audio_coding/F01.OUT20.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1ffcead0db4293f5f36abfdc7cd959d6733358d4
\ No newline at end of file
diff --git a/resources/audio_coding/F01.OUT30.sha1 b/resources/audio_coding/F01.OUT30.sha1
deleted file mode 100644
index 2c8e141..0000000
--- a/resources/audio_coding/F01.OUT30.sha1
+++ /dev/null
@@ -1 +0,0 @@
-37b5e29f294c3612d4425775b422d7dc9b346965
\ No newline at end of file
diff --git a/resources/audio_coding/F02.BIT20.sha1 b/resources/audio_coding/F02.BIT20.sha1
deleted file mode 100644
index 98f5fc5..0000000
--- a/resources/audio_coding/F02.BIT20.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ea44732065b09eec558af1957da21c9061c19c08
\ No newline at end of file
diff --git a/resources/audio_coding/F02.BIT30.sha1 b/resources/audio_coding/F02.BIT30.sha1
deleted file mode 100644
index 6e64569..0000000
--- a/resources/audio_coding/F02.BIT30.sha1
+++ /dev/null
@@ -1 +0,0 @@
-40a5e2850e9e838429911cc3dbb1ff6c9bf38387
\ No newline at end of file
diff --git a/resources/audio_coding/F02.INP.sha1 b/resources/audio_coding/F02.INP.sha1
deleted file mode 100644
index d686220..0000000
--- a/resources/audio_coding/F02.INP.sha1
+++ /dev/null
@@ -1 +0,0 @@
-57bf2aaa27527d51085e040ccead4b99f160bb2f
\ No newline at end of file
diff --git a/resources/audio_coding/F02.OUT20.sha1 b/resources/audio_coding/F02.OUT20.sha1
deleted file mode 100644
index 8f9fb5a..0000000
--- a/resources/audio_coding/F02.OUT20.sha1
+++ /dev/null
@@ -1 +0,0 @@
-13bb10aca91ddd8af71751944e18243735bdda98
\ No newline at end of file
diff --git a/resources/audio_coding/F02.OUT30.sha1 b/resources/audio_coding/F02.OUT30.sha1
deleted file mode 100644
index 5427662..0000000
--- a/resources/audio_coding/F02.OUT30.sha1
+++ /dev/null
@@ -1 +0,0 @@
-21764cf8bb5e635e842eaf92403b22ce04732805
\ No newline at end of file
diff --git a/resources/audio_coding/F03.BIT20.sha1 b/resources/audio_coding/F03.BIT20.sha1
deleted file mode 100644
index 0ccdc7d..0000000
--- a/resources/audio_coding/F03.BIT20.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c145a1a211103145fbb21cf1c78ab90abce83228
\ No newline at end of file
diff --git a/resources/audio_coding/F03.BIT30.sha1 b/resources/audio_coding/F03.BIT30.sha1
deleted file mode 100644
index 565c4c6..0000000
--- a/resources/audio_coding/F03.BIT30.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2ccd6fe240e41906c9f06e05cbde486c1f2bebf7
\ No newline at end of file
diff --git a/resources/audio_coding/F03.INP.sha1 b/resources/audio_coding/F03.INP.sha1
deleted file mode 100644
index 80dbb9c..0000000
--- a/resources/audio_coding/F03.INP.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fb7ad10e20f2de4334f8c122c8582f18b91f0552
\ No newline at end of file
diff --git a/resources/audio_coding/F03.OUT20.sha1 b/resources/audio_coding/F03.OUT20.sha1
deleted file mode 100644
index 210e4f6..0000000
--- a/resources/audio_coding/F03.OUT20.sha1
+++ /dev/null
@@ -1 +0,0 @@
-db4e9d9e09b55c3fe5536628c1f2f07f4bad068b
\ No newline at end of file
diff --git a/resources/audio_coding/F03.OUT30.sha1 b/resources/audio_coding/F03.OUT30.sha1
deleted file mode 100644
index c8a733c..0000000
--- a/resources/audio_coding/F03.OUT30.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f48b05dce8cb0370cda4b93da45b4edc3fdd42d0
\ No newline at end of file
diff --git a/resources/audio_coding/READ.ME b/resources/audio_coding/READ.ME
index 4a021a6..0a19b38 100644
--- a/resources/audio_coding/READ.ME
+++ b/resources/audio_coding/READ.ME
@@ -2,17 +2,3 @@
testfile32kHz.pcm - mono speech file samples at 32 kHz
teststereo32kHz.pcm - stereo speech file samples at 32 kHz
-
-Test and reference vectors to verify correct execution of PacketCable
-iLBC Fixed Point Reference Code
-
-Version 1.0.6
-Format: all .INP and .OUT files contain 16 bit sampled data using the
-Intel (PC) format. The .BIT files are stored in the appropriate byte
-sequence (big-endian format).
-
-*.INP - input files
-*.BIT20 - bit stream files 20 ms mode
-*.OUT20 - output files 20 ms mode (on a channel without packet loss)
-*.BIT30 - bit stream files 30 ms mode
-*.OUT30 - output files 30 ms mode (on a channel without packet loss)
diff --git a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.h b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.h
index 2fdf680..9934f94 100644
--- a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.h
+++ b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.h
@@ -22,7 +22,6 @@
RTC_EXTERN const NSString *const kRTCIsacCodecName;
RTC_EXTERN const NSString *const kRTCL16CodecName;
RTC_EXTERN const NSString *const kRTCG722CodecName;
-RTC_EXTERN const NSString *const kRTCIlbcCodecName;
RTC_EXTERN const NSString *const kRTCPcmuCodecName;
RTC_EXTERN const NSString *const kRTCPcmaCodecName;
RTC_EXTERN const NSString *const kRTCDtmfCodecName;
diff --git a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm
index 8684d4b..fa69c36 100644
--- a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm
+++ b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm
@@ -23,7 +23,6 @@
const NSString *const kRTCOpusCodecName = @(cricket::kOpusCodecName);
const NSString *const kRTCL16CodecName = @(cricket::kL16CodecName);
const NSString *const kRTCG722CodecName = @(cricket::kG722CodecName);
-const NSString *const kRTCIlbcCodecName = @(cricket::kIlbcCodecName);
const NSString *const kRTCPcmuCodecName = @(cricket::kPcmuCodecName);
const NSString *const kRTCPcmaCodecName = @(cricket::kPcmaCodecName);
const NSString *const kRTCDtmfCodecName = @(cricket::kDtmfCodecName);
