Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(255)

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc

Issue 2320703003: Remove handling unused rtcp packets. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_receiver.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
index 4d30bb0784742926b929b6ab936f778b14ab950f..71cf86f3ec872cbfc9380cfcf6b1fb128a583d9e 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -314,9 +314,6 @@ int32_t RTCPReceiver::IncomingRTCPPacket(
case RTCPPacketTypes::kXrDlrrReportBlock:
HandleXrDlrrReportBlock(*rtcpParser, rtcpPacketInformation);
break;
- case RTCPPacketTypes::kXrVoipMetric:
- HandleXRVOIPMetric(*rtcpParser, rtcpPacketInformation);
- break;
case RTCPPacketTypes::kBye:
HandleBYE(*rtcpParser);
break;
@@ -341,23 +338,12 @@ int32_t RTCPReceiver::IncomingRTCPPacket(
case RTCPPacketTypes::kPsfbRpsi:
HandleRPSI(*rtcpParser, rtcpPacketInformation);
break;
- case RTCPPacketTypes::kExtendedIj:
- HandleIJ(*rtcpParser, rtcpPacketInformation);
- break;
case RTCPPacketTypes::kPsfbFir:
HandleFIR(*rtcpParser, rtcpPacketInformation);
break;
case RTCPPacketTypes::kPsfbApp:
HandlePsfbApp(*rtcpParser, rtcpPacketInformation);
break;
- case RTCPPacketTypes::kApp:
- // generic application messages
- HandleAPP(*rtcpParser, rtcpPacketInformation);
- break;
- case RTCPPacketTypes::kAppItem:
- // generic application messages
- HandleAPPItem(*rtcpParser, rtcpPacketInformation);
- break;
case RTCPPacketTypes::kTransportFeedback:
HandleTransportFeedback(rtcpParser, &rtcpPacketInformation);
break;
@@ -909,49 +895,6 @@ void RTCPReceiver::HandleXrDlrrReportBlockItem(
rtcpPacketInformation.rtcpPacketTypeFlags |= kRtcpXrDlrrReportBlock;
}
-void RTCPReceiver::HandleXRVOIPMetric(
- RTCPUtility::RTCPParserV2& rtcpParser,
- RTCPPacketInformation& rtcpPacketInformation) {
- const RTCPUtility::RTCPPacket& rtcpPacket = rtcpParser.Packet();
-
- if (rtcpPacket.XRVOIPMetricItem.SSRC == main_ssrc_) {
- // Store VoIP metrics block if it's about me
- // from OriginatorSSRC do we filter it?
- // rtcpPacket.XR.OriginatorSSRC;
-
- RTCPVoIPMetric receivedVoIPMetrics;
- receivedVoIPMetrics.burstDensity = rtcpPacket.XRVOIPMetricItem.burstDensity;
- receivedVoIPMetrics.burstDuration =
- rtcpPacket.XRVOIPMetricItem.burstDuration;
- receivedVoIPMetrics.discardRate = rtcpPacket.XRVOIPMetricItem.discardRate;
- receivedVoIPMetrics.endSystemDelay =
- rtcpPacket.XRVOIPMetricItem.endSystemDelay;
- receivedVoIPMetrics.extRfactor = rtcpPacket.XRVOIPMetricItem.extRfactor;
- receivedVoIPMetrics.gapDensity = rtcpPacket.XRVOIPMetricItem.gapDensity;
- receivedVoIPMetrics.gapDuration = rtcpPacket.XRVOIPMetricItem.gapDuration;
- receivedVoIPMetrics.Gmin = rtcpPacket.XRVOIPMetricItem.Gmin;
- receivedVoIPMetrics.JBabsMax = rtcpPacket.XRVOIPMetricItem.JBabsMax;
- receivedVoIPMetrics.JBmax = rtcpPacket.XRVOIPMetricItem.JBmax;
- receivedVoIPMetrics.JBnominal = rtcpPacket.XRVOIPMetricItem.JBnominal;
- receivedVoIPMetrics.lossRate = rtcpPacket.XRVOIPMetricItem.lossRate;
- receivedVoIPMetrics.MOSCQ = rtcpPacket.XRVOIPMetricItem.MOSCQ;
- receivedVoIPMetrics.MOSLQ = rtcpPacket.XRVOIPMetricItem.MOSLQ;
- receivedVoIPMetrics.noiseLevel = rtcpPacket.XRVOIPMetricItem.noiseLevel;
- receivedVoIPMetrics.RERL = rtcpPacket.XRVOIPMetricItem.RERL;
- receivedVoIPMetrics.Rfactor = rtcpPacket.XRVOIPMetricItem.Rfactor;
- receivedVoIPMetrics.roundTripDelay =
- rtcpPacket.XRVOIPMetricItem.roundTripDelay;
- receivedVoIPMetrics.RXconfig = rtcpPacket.XRVOIPMetricItem.RXconfig;
- receivedVoIPMetrics.signalLevel = rtcpPacket.XRVOIPMetricItem.signalLevel;
-
- rtcpPacketInformation.AddVoIPMetric(&receivedVoIPMetrics);
-
- rtcpPacketInformation.rtcpPacketTypeFlags |=
- kRtcpXrVoipMetric; // received signal
- }
- rtcpParser.Iterate();
-}
-
void RTCPReceiver::HandlePLI(RTCPUtility::RTCPParserV2& rtcpParser,
RTCPPacketInformation& rtcpPacketInformation) {
const RTCPUtility::RTCPPacket& rtcpPacket = rtcpParser.Packet();
@@ -1118,24 +1061,6 @@ void RTCPReceiver::HandlePsfbApp(RTCPUtility::RTCPParserV2& rtcpParser,
}
}
-void RTCPReceiver::HandleIJ(RTCPUtility::RTCPParserV2& rtcpParser,
- RTCPPacketInformation& rtcpPacketInformation) {
- const RTCPUtility::RTCPPacket& rtcpPacket = rtcpParser.Packet();
-
- RTCPUtility::RTCPPacketTypes pktType = rtcpParser.Iterate();
- while (pktType == RTCPPacketTypes::kExtendedIjItem) {
- HandleIJItem(rtcpPacket, rtcpPacketInformation);
- pktType = rtcpParser.Iterate();
- }
-}
-
-void RTCPReceiver::HandleIJItem(const RTCPUtility::RTCPPacket& rtcpPacket,
- RTCPPacketInformation& rtcpPacketInformation) {
- rtcpPacketInformation.rtcpPacketTypeFlags |= kRtcpTransmissionTimeOffset;
- rtcpPacketInformation.interArrivalJitter =
- rtcpPacket.ExtendedJitterReportItem.Jitter;
-}
-
void RTCPReceiver::HandleREMBItem(
RTCPUtility::RTCPParserV2& rtcpParser,
RTCPPacketInformation& rtcpPacketInformation) {
@@ -1190,27 +1115,6 @@ void RTCPReceiver::HandleFIRItem(RTCPReceiveInformation* receiveInfo,
}
}
-void RTCPReceiver::HandleAPP(RTCPUtility::RTCPParserV2& rtcpParser,
- RTCPPacketInformation& rtcpPacketInformation) {
- const RTCPUtility::RTCPPacket& rtcpPacket = rtcpParser.Packet();
-
- rtcpPacketInformation.rtcpPacketTypeFlags |= kRtcpApp;
- rtcpPacketInformation.applicationSubType = rtcpPacket.APP.SubType;
- rtcpPacketInformation.applicationName = rtcpPacket.APP.Name;
-
- rtcpParser.Iterate();
-}
-
-void RTCPReceiver::HandleAPPItem(RTCPUtility::RTCPParserV2& rtcpParser,
- RTCPPacketInformation& rtcpPacketInformation) {
- const RTCPUtility::RTCPPacket& rtcpPacket = rtcpParser.Packet();
-
- rtcpPacketInformation.AddApplicationData(rtcpPacket.APP.Data,
- rtcpPacket.APP.Size);
-
- rtcpParser.Iterate();
-}
-
void RTCPReceiver::HandleTransportFeedback(
RTCPUtility::RTCPParserV2* rtcp_parser,
RTCPHelp::RTCPPacketInformation* rtcp_packet_information) {
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_receiver.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698