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

Delete obsolete unused rtp header extension conversion

Browse Source 
Bug: None
Change-Id: Ice78a35502465c5f03ef66ee73788405fd4f7356
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/163025
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30188}
This commit is contained in:
Danil Chapovalov
2019-12-23 17:55:05 +01:00
committed by Commit Bot
parent af272d6eb8
commit b19eb399cb
4 changed files with 1 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/rtp_parameters.h
View File

@ -329,9 +329,6 @@ struct RTC_EXPORT RtpExtension {
bool encrypt = false; bool encrypt = false;
}; };
// TODO(deadbeef): This is missing the "encrypt" flag, which is unimplemented.
typedef RtpExtension RtpHeaderExtensionParameters;
struct RTC_EXPORT RtpFecParameters { struct RTC_EXPORT RtpFecParameters {
// If unset, a value is chosen by the implementation. // If unset, a value is chosen by the implementation.
// Works just like RtpEncodingParameters::ssrc. // Works just like RtpEncodingParameters::ssrc.
@ -590,7 +587,7 @@ struct RTC_EXPORT RtpParameters {
std::vector<RtpCodecParameters> codecs; std::vector<RtpCodecParameters> codecs;
std::vector<RtpHeaderExtensionParameters> header_extensions; std::vector<RtpExtension> header_extensions;
std::vector<RtpEncodingParameters> encodings; std::vector<RtpEncodingParameters> encodings;

23
pc/rtp_parameters_conversion.cc
View File

@ -200,29 +200,6 @@ template RTCErrorOr<std::vector<cricket::AudioCodec>> ToCricketCodecs<
template RTCErrorOr<std::vector<cricket::VideoCodec>> ToCricketCodecs< template RTCErrorOr<std::vector<cricket::VideoCodec>> ToCricketCodecs<
cricket::VideoCodec>(const std::vector<RtpCodecParameters>& codecs); cricket::VideoCodec>(const std::vector<RtpCodecParameters>& codecs);
RTCErrorOr<cricket::RtpHeaderExtensions> ToCricketRtpHeaderExtensions(
const std::vector<RtpHeaderExtensionParameters>& extensions) {
cricket::RtpHeaderExtensions cricket_extensions;
std::set<int> seen_header_extension_ids;
for (const RtpHeaderExtensionParameters& extension : extensions) {
if (extension.id < RtpHeaderExtensionParameters::kMinId ||
extension.id > RtpHeaderExtensionParameters::kMaxId) {
char buf[50];
rtc::SimpleStringBuilder sb(buf);
sb << "Invalid header extension id: " << extension.id;
LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_RANGE, sb.str());
}
if (!seen_header_extension_ids.insert(extension.id).second) {
char buf[50];
rtc::SimpleStringBuilder sb(buf);
sb << "Duplicate header extension id: " << extension.id;
LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER, sb.str());
}
cricket_extensions.push_back(extension);
}
return std::move(cricket_extensions);
}
RTCErrorOr<cricket::StreamParamsVec> ToCricketStreamParamsVec( RTCErrorOr<cricket::StreamParamsVec> ToCricketStreamParamsVec(
const std::vector<RtpEncodingParameters>& encodings) { const std::vector<RtpEncodingParameters>& encodings) {
if (encodings.size() > 1u) { if (encodings.size() > 1u) {

4
pc/rtp_parameters_conversion.h
View File

@ -58,10 +58,6 @@ template <typename C>
RTCErrorOr<std::vector<C>> ToCricketCodecs( RTCErrorOr<std::vector<C>> ToCricketCodecs(
const std::vector<RtpCodecParameters>& codecs); const std::vector<RtpCodecParameters>& codecs);
// Validates that header extension IDs aren't duplicated.
RTCErrorOr<cricket::RtpHeaderExtensions> ToCricketRtpHeaderExtensions(
const std::vector<RtpHeaderExtensionParameters>& extensions);
// SSRCs are allowed to be ommitted. This may be used for receive parameters // SSRCs are allowed to be ommitted. This may be used for receive parameters
// where SSRCs are unsignaled. // where SSRCs are unsignaled.
RTCErrorOr<cricket::StreamParamsVec> ToCricketStreamParamsVec( RTCErrorOr<cricket::StreamParamsVec> ToCricketStreamParamsVec(

33
pc/rtp_parameters_conversion_unittest.cc
View File

@ -301,39 +301,6 @@ TEST(RtpParametersConversionTest, ToCricketCodecsDuplicatePayloadType) {
EXPECT_TRUE(result.ok()); EXPECT_TRUE(result.ok());
} }
TEST(RtpParametersConversionTest, ToCricketRtpHeaderExtensions) {
std::vector<RtpHeaderExtensionParameters> extensions = {
{"http://example.com", 1},
{"urn:foo:bar", 14},
{"urn:first:two-byte-only:id", 15}};
auto result = ToCricketRtpHeaderExtensions(extensions);
ASSERT_TRUE(result.ok());
ASSERT_EQ(3u, result.value().size());
EXPECT_EQ("http://example.com", result.value()[0].uri);
EXPECT_EQ(1, result.value()[0].id);
EXPECT_EQ("urn:foo:bar", result.value()[1].uri);
EXPECT_EQ(14, result.value()[1].id);
EXPECT_EQ("urn:first:two-byte-only:id", result.value()[2].uri);
EXPECT_EQ(15, result.value()[2].id);
}
TEST(RtpParametersConversionTest, ToCricketRtpHeaderExtensionsErrors) {
// First, IDs outside the range 1-255.
std::vector<RtpHeaderExtensionParameters> extensions = {
{"http://example.com", 0}};
auto result = ToCricketRtpHeaderExtensions(extensions);
EXPECT_EQ(RTCErrorType::INVALID_RANGE, result.error().type());
extensions[0].id = 256;
result = ToCricketRtpHeaderExtensions(extensions);
EXPECT_EQ(RTCErrorType::INVALID_RANGE, result.error().type());
// Duplicate IDs.
extensions = {{"http://example.com", 1}, {"urn:foo:bar", 1}};
result = ToCricketRtpHeaderExtensions(extensions);
EXPECT_EQ(RTCErrorType::INVALID_PARAMETER, result.error().type());
}
TEST(RtpParametersConversionTest, ToCricketStreamParamsVecSimple) { TEST(RtpParametersConversionTest, ToCricketStreamParamsVecSimple) {
std::vector<RtpEncodingParameters> encodings; std::vector<RtpEncodingParameters> encodings;
RtpEncodingParameters encoding; RtpEncodingParameters encoding;