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

Enforce stream id uniqueness in RtpSender::set_stream_ids

Browse Source 
https://w3c.github.io/webrtc-pc/#dfn-create-an-rtcrtpsender
has a step saying
  For each stream in streams, add stream.id to
  [[AssociatedMediaStreamIds]] if it's not already there

This applies to addTrack and setStreams and the set of streams in
addTransceiver.

Tests that default to the stream id as sync group add
"-sync" as a postfix

BUG=webrtc:14769

Change-Id: I806d2fd87a98d50e54709755541f3f1efff1d8ab
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288701
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38942}
This commit is contained in:
Philipp Hancke 2022-12-21 15:46:46 +01:00 committed by WebRTC LUCI CQ
parent 0b17d1466b
commit e04c397099
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pc/rtp_sender.cc
View File

@ -383,6 +383,14 @@ void RtpSenderBase::SetParametersAsync(const RtpParameters& parameters,
false);
}
void RtpSenderBase::set_stream_ids(const std::vector<std::string>& stream_ids) {
stream_ids_.clear();
absl::c_copy_if(stream_ids, std::back_inserter(stream_ids_),
[this](const std::string& stream_id) {
return !absl::c_linear_search(stream_ids_, stream_id);
});
}
void RtpSenderBase::SetStreams(const std::vector<std::string>& stream_ids) {
set_stream_ids(stream_ids);
if (set_streams_observer_)

6
pc/rtp_sender.h
View File

@ -164,9 +164,9 @@ class RtpSenderBase : public RtpSenderInternal, public ObserverInterface {
RTC_DCHECK_RUN_ON(signaling_thread_);
return stream_ids_;
}
void set_stream_ids(const std::vector<std::string>& stream_ids) override {
stream_ids_ = stream_ids;
}
// Set stream ids, eliminating duplicates in the process.
void set_stream_ids(const std::vector<std::string>& stream_ids) override;
void SetStreams(const std::vector<std::string>& stream_ids) override;
std::string id() const override { return id_; }

9
pc/rtp_sender_receiver_unittest.cc
View File

@ -1888,6 +1888,15 @@ TEST_F(RtpSenderReceiverTest,
EXPECT_TRUE(video_rtp_sender_->SetParameters(parameters).ok());
}
// Checks that the senders SetStreams eliminates duplicate stream ids.
TEST_F(RtpSenderReceiverTest, SenderSetStreamsEliminatesDuplicateIds) {
AddVideoTrack();
video_rtp_sender_ =
VideoRtpSender::Create(worker_thread_, video_track_->id(), nullptr);
video_rtp_sender_->SetStreams({"1", "2", "1"});
EXPECT_EQ(video_rtp_sender_->stream_ids().size(), 2u);
}
// Helper method for syntactic sugar for accepting a vector with '{}' notation.
std::pair<RidList, RidList> CreatePairOfRidVectors(
const std::vector<std::string>& first,

4
test/pc/e2e/media/media_helper.cc
View File

@ -36,7 +36,7 @@ void MediaHelper::MaybeAddAudio(TestPeer* peer) {
source.get());
std::string sync_group = audio_config.sync_group
? audio_config.sync_group.value()
: audio_config.stream_label.value();
: audio_config.stream_label.value() + "-sync";
peer->AddTrack(track, {sync_group, *audio_config.stream_label});
}
@ -71,7 +71,7 @@ MediaHelper::MaybeAddVideo(TestPeer* peer) {
}
std::string sync_group = video_config.sync_group
? video_config.sync_group.value()
: video_config.stream_label.value();
: video_config.stream_label.value() + "-sync";
RTCErrorOr<rtc::scoped_refptr<RtpSenderInterface>> sender =
peer->AddTrack(track, {sync_group, *video_config.stream_label});
RTC_CHECK(sender.ok());