Reason for revert: About to fix problem and reland. Original issue's description: > Revert of Create RtcpDemuxer (patchset #13 id:240001 of https://codereview.webrtc.org/2943693003/ ) > > Reason for revert: > Breaks Chromium FYI bots. > > The problem is in the BUILD.gn file. > > Sample failure: > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/17829 > > Sample logs: > use_goma = true > """ to /b/c/b/Linux_Builder/src/out/Release/args.gn. > > /b/c/b/Linux_Builder/src/buildtools/linux64/gn gen //out/Release --check > -> returned 1 > ERROR at //third_party/webrtc/call/BUILD.gn:46:5: Can't load input file. > "//webrtc/base:rtc_base_approved", > ^-------------------------------- > > Original issue's description: > > Create RtcpDemuxer. Capabilities: > > 1. Demux RTCP messages according to the sender-SSRC. > > 2. Demux RTCP messages according to the RSID (resolved to an SSRC, then compared to the sender-RTCP). > > 3. Allow listening in on all RTCP messages passing through the demuxer ("broadcast sinks"). > > > > BUG=webrtc:7135 > > > > Review-Url: https://codereview.webrtc.org/2943693003 > > Cr-Commit-Position: refs/heads/master@{#18763} > > Committed:cb83bdf01f> > BUG=webrtc:7135 > > Review-Url: https://codereview.webrtc.org/2957763002 > Cr-Commit-Position: refs/heads/master@{#18764} > Committed:0e7e7869e7BUG=webrtc:7135 Review-Url: https://codereview.webrtc.org/2960623002 Cr-Commit-Position: refs/heads/master@{#18768}
56 lines
2.0 KiB
C++
56 lines
2.0 KiB
C++
/*
|
|
* Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/call/rtp_rtcp_demuxer_helper.h"
|
|
|
|
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
|
|
|
|
namespace webrtc {
|
|
|
|
rtc::Optional<uint32_t> ParseRtcpPacketSenderSsrc(
|
|
rtc::ArrayView<const uint8_t> packet) {
|
|
rtcp::CommonHeader header;
|
|
for (const uint8_t* next_packet = packet.begin(); next_packet < packet.end();
|
|
next_packet = header.NextPacket()) {
|
|
if (!header.Parse(next_packet, packet.end() - next_packet)) {
|
|
return rtc::Optional<uint32_t>();
|
|
}
|
|
|
|
switch (header.type()) {
|
|
case rtcp::Bye::kPacketType:
|
|
case rtcp::ExtendedReports::kPacketType:
|
|
case rtcp::Psfb::kPacketType:
|
|
case rtcp::ReceiverReport::kPacketType:
|
|
case rtcp::Rtpfb::kPacketType:
|
|
case rtcp::SenderReport::kPacketType: {
|
|
// Sender SSRC at the beginning of the RTCP payload.
|
|
if (header.payload_size_bytes() >= sizeof(uint32_t)) {
|
|
const uint32_t ssrc_sender =
|
|
ByteReader<uint32_t>::ReadBigEndian(header.payload());
|
|
return rtc::Optional<uint32_t>(ssrc_sender);
|
|
} else {
|
|
return rtc::Optional<uint32_t>();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return rtc::Optional<uint32_t>();
|
|
}
|
|
|
|
} // namespace webrtc
|