Add streams() to RtpReceiverInterface and implementations.
This makes the receiver know about its associated set of streams, the
equivalent of the [[AssociatedRemoteMediaStreams]] slot in the spec,
https://w3c.github.io/webrtc-pc/#dfn-x%5B%5Bassociatedremotemediastreams%5D%5D
This does not change layers below peerconnection.cc. The streams are set
upon the receiver's construction and is not modified for the duration of
its lifetime.
When we support modifying the associated set of streams of a receiver
the receiver needs to know about it. The receiver's streams() should be
used in all places where a receiver's streams need to be known.
Bug: webrtc:8473
Change-Id: I31202973aed98e61fa9b6a78b52e815227b6c17d
Reviewed-on: https://webrtc-review.googlesource.com/22922
Reviewed-by: Peter Thatcher <pthatcher@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20825}diff --git a/pc/rtpreceiver.cc b/pc/rtpreceiver.cc
index 4d69aa2..da7e642 100644
--- a/pc/rtpreceiver.cc
+++ b/pc/rtpreceiver.cc
@@ -10,6 +10,7 @@
#include "pc/rtpreceiver.h"
+#include <utility>
#include <vector>
#include "api/mediastreamtrackproxy.h"
@@ -20,9 +21,11 @@
namespace webrtc {
-AudioRtpReceiver::AudioRtpReceiver(const std::string& track_id,
- uint32_t ssrc,
- cricket::VoiceChannel* channel)
+AudioRtpReceiver::AudioRtpReceiver(
+ const std::string& track_id,
+ std::vector<rtc::scoped_refptr<MediaStreamInterface>> streams,
+ uint32_t ssrc,
+ cricket::VoiceChannel* channel)
: id_(track_id),
ssrc_(ssrc),
channel_(channel),
@@ -30,6 +33,7 @@
rtc::Thread::Current(),
AudioTrack::Create(track_id,
RemoteAudioSource::Create(ssrc, channel)))),
+ streams_(std::move(streams)),
cached_track_enabled_(track_->enabled()) {
RTC_DCHECK(track_->GetSource()->remote());
track_->RegisterObserver(this);
@@ -144,10 +148,12 @@
received_first_packet_ = true;
}
-VideoRtpReceiver::VideoRtpReceiver(const std::string& track_id,
- rtc::Thread* worker_thread,
- uint32_t ssrc,
- cricket::VideoChannel* channel)
+VideoRtpReceiver::VideoRtpReceiver(
+ const std::string& track_id,
+ std::vector<rtc::scoped_refptr<MediaStreamInterface>> streams,
+ rtc::Thread* worker_thread,
+ uint32_t ssrc,
+ cricket::VideoChannel* channel)
: id_(track_id),
ssrc_(ssrc),
channel_(channel),
@@ -161,7 +167,8 @@
VideoTrackSourceProxy::Create(rtc::Thread::Current(),
worker_thread,
source_),
- worker_thread))) {
+ worker_thread))),
+ streams_(std::move(streams)) {
source_->SetState(MediaSourceInterface::kLive);
if (!channel_) {
RTC_LOG(LS_ERROR)