Remove references to AudioCodec and VideoCodec constructors
The preferred method to create codecs is to use the function
cricket::CreateAudioCodec or cricketCreateVideoCodec.
Empty codec objects are deprecated and should be replaced
with alternatives such as methods returning an
absl::optional object instead.
Bug: webrtc:15214
Change-Id: I7fe40f64673cd407830dbbb0e541b85a3aee93aa
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/307521
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40226}
diff --git a/pc/peer_connection_media_unittest.cc b/pc/peer_connection_media_unittest.cc
index c454536..dd497ba 100644
--- a/pc/peer_connection_media_unittest.cc
+++ b/pc/peer_connection_media_unittest.cc
@@ -572,12 +572,13 @@
// Test that raw packetization is not set in the offer by default.
TEST_P(PeerConnectionMediaTest, RawPacketizationNotSetInOffer) {
std::vector<cricket::VideoCodec> fake_codecs;
- fake_codecs.push_back(cricket::VideoCodec(111, cricket::kVp8CodecName));
- fake_codecs.push_back(cricket::VideoCodec(112, cricket::kRtxCodecName));
+ fake_codecs.push_back(cricket::CreateVideoCodec(111, cricket::kVp8CodecName));
+ fake_codecs.push_back(cricket::CreateVideoCodec(112, cricket::kRtxCodecName));
fake_codecs.back().params[cricket::kCodecParamAssociatedPayloadType] = "111";
- fake_codecs.push_back(cricket::VideoCodec(113, cricket::kVp9CodecName));
- fake_codecs.push_back(cricket::VideoCodec(114, cricket::kH264CodecName));
- fake_codecs.push_back(cricket::VideoCodec(115, "HEVC"));
+ fake_codecs.push_back(cricket::CreateVideoCodec(113, cricket::kVp9CodecName));
+ fake_codecs.push_back(
+ cricket::CreateVideoCodec(114, cricket::kH264CodecName));
+ fake_codecs.push_back(cricket::CreateVideoCodec(115, "HEVC"));
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
caller_fake_engine->SetVideoCodecs(fake_codecs);
@@ -594,12 +595,13 @@
// video payload when raw_packetization_for_video is true.
TEST_P(PeerConnectionMediaTest, RawPacketizationSetInOfferAndAnswer) {
std::vector<cricket::VideoCodec> fake_codecs;
- fake_codecs.push_back(cricket::VideoCodec(111, cricket::kVp8CodecName));
- fake_codecs.push_back(cricket::VideoCodec(112, cricket::kRtxCodecName));
+ fake_codecs.push_back(cricket::CreateVideoCodec(111, cricket::kVp8CodecName));
+ fake_codecs.push_back(cricket::CreateVideoCodec(112, cricket::kRtxCodecName));
fake_codecs.back().params[cricket::kCodecParamAssociatedPayloadType] = "111";
- fake_codecs.push_back(cricket::VideoCodec(113, cricket::kVp9CodecName));
- fake_codecs.push_back(cricket::VideoCodec(114, cricket::kH264CodecName));
- fake_codecs.push_back(cricket::VideoCodec(115, "HEVC"));
+ fake_codecs.push_back(cricket::CreateVideoCodec(113, cricket::kVp9CodecName));
+ fake_codecs.push_back(
+ cricket::CreateVideoCodec(114, cricket::kH264CodecName));
+ fake_codecs.push_back(cricket::CreateVideoCodec(115, "HEVC"));
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
caller_fake_engine->SetVideoCodecs(fake_codecs);
auto callee_fake_engine = std::make_unique<FakeMediaEngine>();
@@ -637,12 +639,13 @@
TEST_P(PeerConnectionMediaTest,
RawPacketizationNotSetInAnswerWhenNotSetInOffer) {
std::vector<cricket::VideoCodec> fake_codecs;
- fake_codecs.push_back(cricket::VideoCodec(111, cricket::kVp8CodecName));
- fake_codecs.push_back(cricket::VideoCodec(112, cricket::kRtxCodecName));
+ fake_codecs.push_back(cricket::CreateVideoCodec(111, cricket::kVp8CodecName));
+ fake_codecs.push_back(cricket::CreateVideoCodec(112, cricket::kRtxCodecName));
fake_codecs.back().params[cricket::kCodecParamAssociatedPayloadType] = "111";
- fake_codecs.push_back(cricket::VideoCodec(113, cricket::kVp9CodecName));
- fake_codecs.push_back(cricket::VideoCodec(114, cricket::kH264CodecName));
- fake_codecs.push_back(cricket::VideoCodec(115, "HEVC"));
+ fake_codecs.push_back(cricket::CreateVideoCodec(113, cricket::kVp9CodecName));
+ fake_codecs.push_back(
+ cricket::CreateVideoCodec(114, cricket::kH264CodecName));
+ fake_codecs.push_back(cricket::CreateVideoCodec(115, "HEVC"));
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
caller_fake_engine->SetVideoCodecs(fake_codecs);
auto callee_fake_engine = std::make_unique<FakeMediaEngine>();
@@ -878,10 +881,10 @@
}
void AddComfortNoiseCodecsToSend(cricket::FakeMediaEngine* media_engine) {
- const cricket::AudioCodec kComfortNoiseCodec8k(102, cricket::kCnCodecName,
- 8000, 0, 1);
- const cricket::AudioCodec kComfortNoiseCodec16k(103, cricket::kCnCodecName,
- 16000, 0, 1);
+ const cricket::AudioCodec kComfortNoiseCodec8k =
+ cricket::CreateAudioCodec(102, cricket::kCnCodecName, 8000, 1);
+ const cricket::AudioCodec kComfortNoiseCodec16k =
+ cricket::CreateAudioCodec(103, cricket::kCnCodecName, 16000, 1);
auto codecs = media_engine->voice().send_codecs();
codecs.push_back(kComfortNoiseCodec8k);
@@ -1358,15 +1361,15 @@
// fmtp line is modified to refer to the correct payload type.
TEST_P(PeerConnectionMediaTest, RedFmtpPayloadTypeReassigned) {
std::vector<cricket::AudioCodec> caller_fake_codecs;
- caller_fake_codecs.push_back(cricket::AudioCodec(100, "foo", 0, 0, 1));
+ caller_fake_codecs.push_back(cricket::CreateAudioCodec(100, "foo", 0, 1));
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
caller_fake_engine->SetAudioCodecs(caller_fake_codecs);
auto caller = CreatePeerConnectionWithAudio(std::move(caller_fake_engine));
std::vector<cricket::AudioCodec> callee_fake_codecs;
- callee_fake_codecs.push_back(cricket::AudioCodec(120, "foo", 0, 0, 1));
+ callee_fake_codecs.push_back(cricket::CreateAudioCodec(120, "foo", 0, 1));
callee_fake_codecs.push_back(
- cricket::AudioCodec(121, cricket::kRedCodecName, 0, 0, 1));
+ cricket::CreateAudioCodec(121, cricket::kRedCodecName, 0, 1));
callee_fake_codecs.back().SetParam(cricket::kCodecParamNotInNameValueFormat,
"120/120");
auto callee_fake_engine = std::make_unique<FakeMediaEngine>();
@@ -1401,17 +1404,17 @@
// Test that RED without fmtp does match RED without fmtp.
TEST_P(PeerConnectionMediaTest, RedFmtpPayloadTypeNoFmtpMatchNoFmtp) {
std::vector<cricket::AudioCodec> caller_fake_codecs;
- caller_fake_codecs.push_back(cricket::AudioCodec(100, "foo", 0, 0, 1));
+ caller_fake_codecs.push_back(cricket::CreateAudioCodec(100, "foo", 0, 1));
caller_fake_codecs.push_back(
- cricket::AudioCodec(101, cricket::kRedCodecName, 0, 0, 1));
+ cricket::CreateAudioCodec(101, cricket::kRedCodecName, 0, 1));
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
caller_fake_engine->SetAudioCodecs(caller_fake_codecs);
auto caller = CreatePeerConnectionWithAudio(std::move(caller_fake_engine));
std::vector<cricket::AudioCodec> callee_fake_codecs;
- callee_fake_codecs.push_back(cricket::AudioCodec(120, "foo", 0, 0, 1));
+ callee_fake_codecs.push_back(cricket::CreateAudioCodec(120, "foo", 0, 1));
callee_fake_codecs.push_back(
- cricket::AudioCodec(121, cricket::kRedCodecName, 0, 0, 1));
+ cricket::CreateAudioCodec(121, cricket::kRedCodecName, 0, 1));
auto callee_fake_engine = std::make_unique<FakeMediaEngine>();
callee_fake_engine->SetAudioCodecs(callee_fake_codecs);
auto callee = CreatePeerConnectionWithAudio(std::move(callee_fake_engine));
@@ -1443,17 +1446,17 @@
// Test that RED without fmtp does not match RED with fmtp.
TEST_P(PeerConnectionMediaTest, RedFmtpPayloadTypeNoFmtpNoMatchFmtp) {
std::vector<cricket::AudioCodec> caller_fake_codecs;
- caller_fake_codecs.push_back(cricket::AudioCodec(100, "foo", 0, 0, 1));
+ caller_fake_codecs.push_back(cricket::CreateAudioCodec(100, "foo", 0, 1));
caller_fake_codecs.push_back(
- cricket::AudioCodec(101, cricket::kRedCodecName, 0, 0, 1));
+ cricket::CreateAudioCodec(101, cricket::kRedCodecName, 0, 1));
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
caller_fake_engine->SetAudioCodecs(caller_fake_codecs);
auto caller = CreatePeerConnectionWithAudio(std::move(caller_fake_engine));
std::vector<cricket::AudioCodec> callee_fake_codecs;
- callee_fake_codecs.push_back(cricket::AudioCodec(120, "foo", 0, 0, 1));
+ callee_fake_codecs.push_back(cricket::CreateAudioCodec(120, "foo", 0, 1));
callee_fake_codecs.push_back(
- cricket::AudioCodec(121, cricket::kRedCodecName, 0, 0, 1));
+ cricket::CreateAudioCodec(121, cricket::kRedCodecName, 0, 1));
callee_fake_codecs.back().SetParam(cricket::kCodecParamNotInNameValueFormat,
"120/120");
auto callee_fake_engine = std::make_unique<FakeMediaEngine>();
@@ -1490,9 +1493,9 @@
// Test that RED with fmtp must match base codecs.
TEST_P(PeerConnectionMediaTest, RedFmtpPayloadTypeMustMatchBaseCodecs) {
std::vector<cricket::AudioCodec> caller_fake_codecs;
- caller_fake_codecs.push_back(cricket::AudioCodec(100, "foo", 0, 0, 1));
+ caller_fake_codecs.push_back(cricket::CreateAudioCodec(100, "foo", 0, 1));
caller_fake_codecs.push_back(
- cricket::AudioCodec(101, cricket::kRedCodecName, 0, 0, 1));
+ cricket::CreateAudioCodec(101, cricket::kRedCodecName, 0, 1));
caller_fake_codecs.back().SetParam(cricket::kCodecParamNotInNameValueFormat,
"100/100");
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
@@ -1500,10 +1503,10 @@
auto caller = CreatePeerConnectionWithAudio(std::move(caller_fake_engine));
std::vector<cricket::AudioCodec> callee_fake_codecs;
- callee_fake_codecs.push_back(cricket::AudioCodec(120, "foo", 0, 0, 1));
+ callee_fake_codecs.push_back(cricket::CreateAudioCodec(120, "foo", 0, 1));
callee_fake_codecs.push_back(
- cricket::AudioCodec(121, cricket::kRedCodecName, 0, 0, 1));
- callee_fake_codecs.push_back(cricket::AudioCodec(122, "bar", 0, 0, 1));
+ cricket::CreateAudioCodec(121, cricket::kRedCodecName, 0, 1));
+ callee_fake_codecs.push_back(cricket::CreateAudioCodec(122, "bar", 0, 1));
callee_fake_codecs.back().SetParam(cricket::kCodecParamNotInNameValueFormat,
"122/122");
auto callee_fake_engine = std::make_unique<FakeMediaEngine>();
@@ -1524,10 +1527,10 @@
// which is not supported.
TEST_P(PeerConnectionMediaTest, RedFmtpPayloadMixed) {
std::vector<cricket::AudioCodec> caller_fake_codecs;
- caller_fake_codecs.push_back(cricket::AudioCodec(100, "foo", 0, 0, 1));
- caller_fake_codecs.push_back(cricket::AudioCodec(102, "bar", 0, 0, 1));
+ caller_fake_codecs.push_back(cricket::CreateAudioCodec(100, "foo", 0, 1));
+ caller_fake_codecs.push_back(cricket::CreateAudioCodec(102, "bar", 0, 1));
caller_fake_codecs.push_back(
- cricket::AudioCodec(101, cricket::kRedCodecName, 0, 0, 1));
+ cricket::CreateAudioCodec(101, cricket::kRedCodecName, 0, 1));
caller_fake_codecs.back().SetParam(cricket::kCodecParamNotInNameValueFormat,
"100/102");
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
@@ -1535,9 +1538,9 @@
auto caller = CreatePeerConnectionWithAudio(std::move(caller_fake_engine));
std::vector<cricket::AudioCodec> callee_fake_codecs;
- callee_fake_codecs.push_back(cricket::AudioCodec(120, "foo", 0, 0, 1));
+ callee_fake_codecs.push_back(cricket::CreateAudioCodec(120, "foo", 0, 1));
callee_fake_codecs.push_back(
- cricket::AudioCodec(121, cricket::kRedCodecName, 0, 0, 1));
+ cricket::CreateAudioCodec(121, cricket::kRedCodecName, 0, 1));
callee_fake_codecs.back().SetParam(cricket::kCodecParamNotInNameValueFormat,
"120/120");
auto callee_fake_engine = std::make_unique<FakeMediaEngine>();
@@ -1558,9 +1561,9 @@
// redundancy.
TEST_P(PeerConnectionMediaTest, RedFmtpPayloadDifferentRedundancy) {
std::vector<cricket::AudioCodec> caller_fake_codecs;
- caller_fake_codecs.push_back(cricket::AudioCodec(100, "foo", 0, 0, 1));
+ caller_fake_codecs.push_back(cricket::CreateAudioCodec(100, "foo", 0, 1));
caller_fake_codecs.push_back(
- cricket::AudioCodec(101, cricket::kRedCodecName, 0, 0, 1));
+ cricket::CreateAudioCodec(101, cricket::kRedCodecName, 0, 1));
caller_fake_codecs.back().SetParam(cricket::kCodecParamNotInNameValueFormat,
"100/100");
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
@@ -1568,9 +1571,9 @@
auto caller = CreatePeerConnectionWithAudio(std::move(caller_fake_engine));
std::vector<cricket::AudioCodec> callee_fake_codecs;
- callee_fake_codecs.push_back(cricket::AudioCodec(120, "foo", 0, 0, 1));
+ callee_fake_codecs.push_back(cricket::CreateAudioCodec(120, "foo", 0, 1));
callee_fake_codecs.push_back(
- cricket::AudioCodec(121, cricket::kRedCodecName, 0, 0, 1));
+ cricket::CreateAudioCodec(121, cricket::kRedCodecName, 0, 1));
callee_fake_codecs.back().SetParam(cricket::kCodecParamNotInNameValueFormat,
"120/120/120");
auto callee_fake_engine = std::make_unique<FakeMediaEngine>();
@@ -1638,8 +1641,8 @@
SetCodecPreferencesAudioMissingRecvCodec) {
auto fake_engine = std::make_unique<FakeMediaEngine>();
auto send_codecs = fake_engine->voice().send_codecs();
- send_codecs.push_back(cricket::AudioCodec(send_codecs.back().id + 1,
- "send_only_codec", 0, 0, 1));
+ send_codecs.push_back(cricket::CreateAudioCodec(send_codecs.back().id + 1,
+ "send_only_codec", 0, 1));
fake_engine->SetAudioSendCodecs(send_codecs);
auto caller = CreatePeerConnectionWithAudio(std::move(fake_engine));
@@ -1662,8 +1665,8 @@
SetCodecPreferencesAudioMissingSendCodec) {
auto fake_engine = std::make_unique<FakeMediaEngine>();
auto recv_codecs = fake_engine->voice().recv_codecs();
- recv_codecs.push_back(cricket::AudioCodec(recv_codecs.back().id + 1,
- "recv_only_codec", 0, 0, 1));
+ recv_codecs.push_back(cricket::CreateAudioCodec(recv_codecs.back().id + 1,
+ "recv_only_codec", 0, 1));
fake_engine->SetAudioRecvCodecs(recv_codecs);
auto caller = CreatePeerConnectionWithAudio(std::move(fake_engine));
@@ -1703,14 +1706,14 @@
SetCodecPreferencesAudioRejectsOnlyRtxRedFec) {
auto fake_engine = std::make_unique<FakeMediaEngine>();
auto audio_codecs = fake_engine->voice().send_codecs();
- audio_codecs.push_back(cricket::AudioCodec(audio_codecs.back().id + 1,
- cricket::kRtxCodecName, 0, 0, 1));
+ audio_codecs.push_back(cricket::CreateAudioCodec(
+ audio_codecs.back().id + 1, cricket::kRtxCodecName, 0, 1));
audio_codecs.back().params[cricket::kCodecParamAssociatedPayloadType] =
std::to_string(audio_codecs.back().id - 1);
- audio_codecs.push_back(cricket::AudioCodec(audio_codecs.back().id + 1,
- cricket::kRedCodecName, 0, 0, 1));
- audio_codecs.push_back(cricket::AudioCodec(
- audio_codecs.back().id + 1, cricket::kUlpfecCodecName, 0, 0, 1));
+ audio_codecs.push_back(cricket::CreateAudioCodec(
+ audio_codecs.back().id + 1, cricket::kRedCodecName, 0, 1));
+ audio_codecs.push_back(cricket::CreateAudioCodec(
+ audio_codecs.back().id + 1, cricket::kUlpfecCodecName, 0, 1));
fake_engine->SetAudioCodecs(audio_codecs);
auto caller = CreatePeerConnectionWithAudio(std::move(fake_engine));
@@ -1800,14 +1803,14 @@
SetCodecPreferencesVideoRejectsOnlyRtxRedFec) {
auto fake_engine = std::make_unique<FakeMediaEngine>();
auto video_codecs = fake_engine->video().send_codecs();
- video_codecs.push_back(
- cricket::VideoCodec(video_codecs.back().id + 1, cricket::kRtxCodecName));
+ video_codecs.push_back(cricket::CreateVideoCodec(video_codecs.back().id + 1,
+ cricket::kRtxCodecName));
video_codecs.back().params[cricket::kCodecParamAssociatedPayloadType] =
std::to_string(video_codecs.back().id - 1);
- video_codecs.push_back(
- cricket::VideoCodec(video_codecs.back().id + 1, cricket::kRedCodecName));
- video_codecs.push_back(cricket::VideoCodec(video_codecs.back().id + 1,
- cricket::kUlpfecCodecName));
+ video_codecs.push_back(cricket::CreateVideoCodec(video_codecs.back().id + 1,
+ cricket::kRedCodecName));
+ video_codecs.push_back(cricket::CreateVideoCodec(video_codecs.back().id + 1,
+ cricket::kUlpfecCodecName));
fake_engine->SetVideoCodecs(video_codecs);
auto caller = CreatePeerConnectionWithVideo(std::move(fake_engine));
@@ -1908,15 +1911,15 @@
TEST_F(PeerConnectionMediaTestUnifiedPlan, SetCodecPreferencesVideoWithRtx) {
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
auto caller_video_codecs = caller_fake_engine->video().send_codecs();
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kVp8CodecName));
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kRtxCodecName));
caller_video_codecs.back().params[cricket::kCodecParamAssociatedPayloadType] =
std::to_string(caller_video_codecs.back().id - 1);
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kVp9CodecName));
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kRtxCodecName));
caller_video_codecs.back().params[cricket::kCodecParamAssociatedPayloadType] =
std::to_string(caller_video_codecs.back().id - 1);
@@ -1960,15 +1963,15 @@
SetCodecPreferencesVideoCodecsNegotiation) {
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
auto caller_video_codecs = caller_fake_engine->video().send_codecs();
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kVp8CodecName));
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kRtxCodecName));
caller_video_codecs.back().params[cricket::kCodecParamAssociatedPayloadType] =
std::to_string(caller_video_codecs.back().id - 1);
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kVp9CodecName));
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kRtxCodecName));
caller_video_codecs.back().params[cricket::kCodecParamAssociatedPayloadType] =
std::to_string(caller_video_codecs.back().id - 1);
@@ -2034,15 +2037,15 @@
SetCodecPreferencesVideoCodecsNegotiationReverseOrder) {
auto caller_fake_engine = std::make_unique<FakeMediaEngine>();
auto caller_video_codecs = caller_fake_engine->video().send_codecs();
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kVp8CodecName));
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kRtxCodecName));
caller_video_codecs.back().params[cricket::kCodecParamAssociatedPayloadType] =
std::to_string(caller_video_codecs.back().id - 1);
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kVp9CodecName));
- caller_video_codecs.push_back(cricket::VideoCodec(
+ caller_video_codecs.push_back(cricket::CreateVideoCodec(
caller_video_codecs.back().id + 1, cricket::kRtxCodecName));
caller_video_codecs.back().params[cricket::kCodecParamAssociatedPayloadType] =
std::to_string(caller_video_codecs.back().id - 1);
