admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete RTPPayloadRegistry::IsRed.

Browse Source 
Bug: webrtc:8995
Change-Id: I92429fac4cec7e4b4fa22f01d09e680b61db1505
Reviewed-on: https://webrtc-review.googlesource.com/61301
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22417}
This commit is contained in:
Niels Möller 2018-03-14 10:13:43 +01:00 committed by Commit Bot
parent 2f639aca84
commit e10675a666
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/rtp_rtcp/include/rtp_payload_registry.h
View File

@ -46,8 +46,6 @@ class RTPPayloadRegistry {
int32_t ReceivePayloadType(const VideoCodec& video_codec,
int8_t* payload_type) const;
bool IsRed(const RTPHeader& header) const;
int GetPayloadTypeFrequency(uint8_t payload_type) const;
rtc::Optional<RtpUtility::Payload> PayloadTypeToPayload(

6
modules/rtp_rtcp/source/rtp_payload_registry.cc
View File

@ -259,12 +259,6 @@ int32_t RTPPayloadRegistry::ReceivePayloadType(const VideoCodec& video_codec,
return -1;
}
bool RTPPayloadRegistry::IsRed(const RTPHeader& header) const {
rtc::CritScope cs(&crit_sect_);
auto it = payload_type_map_.find(header.payloadType);
return it != payload_type_map_.end() && _stricmp(it->second.name, "red") == 0;
}
int RTPPayloadRegistry::GetPayloadTypeFrequency(
uint8_t payload_type) const {
const auto payload = PayloadTypeToPayload(payload_type);

15
video/rtp_video_stream_receiver.cc
View File

@ -138,13 +138,6 @@ RtpVideoStreamReceiver::RtpVideoStreamReceiver(
: kDefaultMaxReorderingThreshold;
rtp_receive_statistics_->SetMaxReorderingThreshold(max_reordering_threshold);
if (IsRedEnabled()) {
VideoCodec red_codec = {};
red_codec.codecType = kVideoCodecRED;
red_codec.plType = config_.rtp.red_payload_type;
RTC_CHECK(AddReceiveCodec(red_codec));
}
if (config_.rtp.rtcp_xr.receiver_reference_time_report)
rtp_rtcp_->SetRtcpXrRrtrStatus(true);
@ -344,10 +337,6 @@ bool RtpVideoStreamReceiver::IsUlpfecEnabled() const {
return config_.rtp.ulpfec_payload_type != -1;
}
bool RtpVideoStreamReceiver::IsRedEnabled() const {
return config_.rtp.red_payload_type != -1;
}
bool RtpVideoStreamReceiver::IsRetransmissionsEnabled() const {
return config_.rtp.nack.rtp_history_ms > 0;
}
@ -423,7 +412,7 @@ void RtpVideoStreamReceiver::RemoveSecondarySink(
void RtpVideoStreamReceiver::ReceivePacket(const uint8_t* packet,
size_t packet_length,
const RTPHeader& header) {
if (rtp_payload_registry_.IsRed(header)) {
if (header.payloadType == config_.rtp.red_payload_type) {
ParseAndHandleEncapsulatingHeader(packet, packet_length, header);
return;
}
@ -441,7 +430,7 @@ void RtpVideoStreamReceiver::ReceivePacket(const uint8_t* packet,
void RtpVideoStreamReceiver::ParseAndHandleEncapsulatingHeader(
const uint8_t* packet, size_t packet_length, const RTPHeader& header) {
RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_task_checker_);
if (rtp_payload_registry_.IsRed(header)) {
if (header.payloadType == config_.rtp.red_payload_type) {
if (packet[header.headerLength] == config_.rtp.ulpfec_payload_type) {
rtp_receive_statistics_->FecPacketReceived(header, packet_length);
// Notify video_receiver about received FEC packets to avoid NACKing these