zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused non-standard RtpEncodingParameters members

Browse Source 
Bug: webrtc:7580
Change-Id: Ic1a6e52f25eb35c797e669bffe8040ec84fec386
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160415
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29983}
This commit is contained in:
Florent Castelli
2019-11-28 15:48:24 +01:00
committed by Commit Bot
parent 6c0e94650e
commit a8c2f5180f
6 changed files with 3 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pc/rtp_parameters_conversion_unittest.cc
View File

@ -346,23 +346,6 @@ TEST(RtpParametersConversionTest, ToCricketStreamParamsVecSimple) {
EXPECT_EQ(0xbaadf00d, result.value()[0].first_ssrc());
}
TEST(RtpParametersConversionTest, ToCricketStreamParamsVecWithRtx) {
std::vector<RtpEncodingParameters> encodings;
RtpEncodingParameters encoding;
// Test a corner case SSRC of 0.
encoding.ssrc.emplace(0u);
encoding.rtx.emplace(0xdeadbeef);
encodings.push_back(encoding);
auto result = ToCricketStreamParamsVec(encodings);
ASSERT_TRUE(result.ok());
ASSERT_EQ(1u, result.value().size());
EXPECT_EQ(2u, result.value()[0].ssrcs.size());
EXPECT_EQ(0u, result.value()[0].first_ssrc());
uint32_t rtx_ssrc = 0;
EXPECT_TRUE(result.value()[0].GetFidSsrc(0u, &rtx_ssrc));
EXPECT_EQ(0xdeadbeef, rtx_ssrc);
}
// No encodings should be accepted; an endpoint may want to prepare a
// decoder/encoder without having something to receive/send yet.
TEST(RtpParametersConversionTest, ToCricketStreamParamsVecNoEncodings) {
@ -377,21 +360,11 @@ TEST(RtpParametersConversionTest, ToCricketStreamParamsVecNoEncodings) {
TEST(RtpParametersConversionTest, ToCricketStreamParamsVecMissingSsrcs) {
std::vector<RtpEncodingParameters> encodings = {{}};
// Creates RtxParameters with empty SSRC.
encodings[0].rtx.emplace();
auto result = ToCricketStreamParamsVec(encodings);
ASSERT_TRUE(result.ok());
EXPECT_EQ(0u, result.value().size());
}
// The media engine doesn't have a way of receiving an RTX SSRC that's known
// with a primary SSRC that's unknown, so this should produce an error.
TEST(RtpParametersConversionTest, ToStreamParamsWithPrimarySsrcSetAndRtxUnset) {
std::vector<RtpEncodingParameters> encodings = {{}};
encodings[0].rtx.emplace(0xdeadbeef);
EXPECT_EQ(RTCErrorType::UNSUPPORTED_PARAMETER,
ToCricketStreamParamsVec(encodings).error().type());
}
// TODO(deadbeef): Update this test when we support multiple encodings.
TEST(RtpParametersConversionTest, ToCricketStreamParamsVecMultipleEncodings) {
std::vector<RtpEncodingParameters> encodings = {{}, {}};
@ -511,11 +484,9 @@ TEST(RtpParametersConversionTest, ToRtpEncodingsWithMultipleStreamParams) {
cricket::StreamParamsVec streams;
cricket::StreamParams stream1;
stream1.ssrcs.push_back(1111u);
stream1.AddFidSsrc(1111u, 0xaaaaaaaa);
cricket::StreamParams stream2;
stream2.ssrcs.push_back(2222u);
stream2.AddFidSsrc(2222u, 0xaaaaaaab);
streams.push_back(stream1);
streams.push_back(stream2);
@ -523,9 +494,7 @@ TEST(RtpParametersConversionTest, ToRtpEncodingsWithMultipleStreamParams) {
auto rtp_encodings = ToRtpEncodings(streams);
ASSERT_EQ(2u, rtp_encodings.size());
EXPECT_EQ(1111u, rtp_encodings[0].ssrc);
EXPECT_EQ(0xaaaaaaaa, rtp_encodings[0].rtx->ssrc);
EXPECT_EQ(2222u, rtp_encodings[1].ssrc);
EXPECT_EQ(0xaaaaaaab, rtp_encodings[1].rtx->ssrc);
}
TEST(RtpParametersConversionTest, ToAudioRtpCodecParameters) {