59b603fbed
Reason for revert:
Some internal tests keep failing after this change. Try to fix it by reverting it. Will reland it if this isn't the root cause.
Original issue's description:
> SSRC and RSID may only refer to one sink each in RtpDemuxer
>
> RTP demuxing should only match RTP packets with one sink.
>
> BUG=webrtc:7135
>
> Review-Url: https://codereview.webrtc.org/2968693002
> Cr-Commit-Position: refs/heads/master@{#19233}
> Committed: 7b7e06fd23
TBR=nisse@webrtc.org,danilchap@webrtc.org,perkj@webrtc.org,stefan@webrtc.org,holmer@google.com,deadbeef@webrtc.org,pthatcher@webrtc.org,steveanton@webrtc.org,eladalon@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:7135
Review-Url: https://codereview.webrtc.org/2993633002
Cr-Commit-Position: refs/heads/master@{#19239}
59 lines
1.9 KiB
C++
59 lines
1.9 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_stream_receiver_controller.h"
|
|
#include "webrtc/rtc_base/ptr_util.h"
|
|
|
|
namespace webrtc {
|
|
|
|
RtpStreamReceiverController::Receiver::Receiver(
|
|
RtpStreamReceiverController* controller,
|
|
uint32_t ssrc,
|
|
RtpPacketSinkInterface* sink)
|
|
: controller_(controller), sink_(sink) {
|
|
controller_->AddSink(ssrc, sink_);
|
|
}
|
|
|
|
RtpStreamReceiverController::Receiver::~Receiver() {
|
|
// Don't require return value > 0, since for RTX we currently may
|
|
// have multiple Receiver objects with the same sink.
|
|
// TODO(nisse): Consider adding a DCHECK when RtxReceiveStream is wired up.
|
|
controller_->RemoveSink(sink_);
|
|
}
|
|
|
|
RtpStreamReceiverController::RtpStreamReceiverController() = default;
|
|
RtpStreamReceiverController::~RtpStreamReceiverController() = default;
|
|
|
|
std::unique_ptr<RtpStreamReceiverInterface>
|
|
RtpStreamReceiverController::CreateReceiver(
|
|
uint32_t ssrc,
|
|
RtpPacketSinkInterface* sink) {
|
|
return rtc::MakeUnique<Receiver>(this, ssrc, sink);
|
|
}
|
|
|
|
bool RtpStreamReceiverController::OnRtpPacket(const RtpPacketReceived& packet) {
|
|
rtc::CritScope cs(&lock_);
|
|
return demuxer_.OnRtpPacket(packet);
|
|
}
|
|
|
|
void RtpStreamReceiverController::AddSink(uint32_t ssrc,
|
|
RtpPacketSinkInterface* sink) {
|
|
rtc::CritScope cs(&lock_);
|
|
return demuxer_.AddSink(ssrc, sink);
|
|
}
|
|
|
|
size_t RtpStreamReceiverController::RemoveSink(
|
|
const RtpPacketSinkInterface* sink) {
|
|
rtc::CritScope cs(&lock_);
|
|
return demuxer_.RemoveSink(sink);
|
|
}
|
|
|
|
} // namespace webrtc
|