webrtc_m130/pc/track_media_info_map_unittest.cc

463 lines
18 KiB
C++
Raw Normal View History

/*
* Copyright 2016 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 "pc/track_media_info_map.h"
#include <stddef.h>
#include <cstdint>
#include <initializer_list>
#include <string>
#include <type_traits>
#include <utility>
#include <vector>
#include "api/media_types.h"
#include "api/rtp_parameters.h"
#include "api/test/mock_video_track.h"
#include "media/base/media_channel.h"
#include "pc/audio_track.h"
#include "pc/test/fake_video_track_source.h"
#include "pc/test/mock_rtp_receiver_internal.h"
#include "pc/test/mock_rtp_sender_internal.h"
#include "pc/video_track.h"
#include "rtc_base/checks.h"
#include "rtc_base/ref_counted_object.h"
#include "rtc_base/thread.h"
#include "test/gmock.h"
#include "test/gtest.h"
namespace webrtc {
namespace {
RtpParameters CreateRtpParametersWithSsrcs(
std::initializer_list<uint32_t> ssrcs) {
RtpParameters params;
for (uint32_t ssrc : ssrcs) {
RtpEncodingParameters encoding_params;
encoding_params.ssrc = ssrc;
params.encodings.push_back(encoding_params);
}
return params;
}
rtc::scoped_refptr<MockRtpSenderInternal> CreateMockRtpSender(
cricket::MediaType media_type,
std::initializer_list<uint32_t> ssrcs,
rtc::scoped_refptr<MediaStreamTrackInterface> track) {
uint32_t first_ssrc;
if (ssrcs.size()) {
first_ssrc = *ssrcs.begin();
} else {
first_ssrc = 0;
}
auto sender = rtc::make_ref_counted<MockRtpSenderInternal>();
EXPECT_CALL(*sender, track())
.WillRepeatedly(::testing::Return(std::move(track)));
EXPECT_CALL(*sender, ssrc()).WillRepeatedly(::testing::Return(first_ssrc));
EXPECT_CALL(*sender, media_type())
.WillRepeatedly(::testing::Return(media_type));
EXPECT_CALL(*sender, GetParameters())
.WillRepeatedly(::testing::Return(CreateRtpParametersWithSsrcs(ssrcs)));
EXPECT_CALL(*sender, AttachmentId()).WillRepeatedly(::testing::Return(1));
return sender;
}
rtc::scoped_refptr<MockRtpReceiverInternal> CreateMockRtpReceiver(
cricket::MediaType media_type,
std::initializer_list<uint32_t> ssrcs,
rtc::scoped_refptr<MediaStreamTrackInterface> track) {
auto receiver = rtc::make_ref_counted<MockRtpReceiverInternal>();
EXPECT_CALL(*receiver, track())
.WillRepeatedly(::testing::Return(std::move(track)));
EXPECT_CALL(*receiver, media_type())
.WillRepeatedly(::testing::Return(media_type));
EXPECT_CALL(*receiver, GetParameters())
.WillRepeatedly(::testing::Return(CreateRtpParametersWithSsrcs(ssrcs)));
EXPECT_CALL(*receiver, AttachmentId()).WillRepeatedly(::testing::Return(1));
return receiver;
}
Reland "Fix race between enabled() and set_enabled() in VideoTrack." This reverts commit 096ad02c02b4bc6c046282b8793ef84d041dd0d8. Reason for revert: Including a fix for the test issue. Original change's description: > Revert "Fix race between enabled() and set_enabled() in VideoTrack." > > This reverts commit 5ffefe9d2d743c66f8a8bcbc5ad9662a3138840a. > > Reason for revert: Breaks Chromium Android browser tests on fyi bots. > > Original change's description: > > Fix race between enabled() and set_enabled() in VideoTrack. > > > > Along the way I introduced VideoSourceBaseGuarded, which is equivalent > > to VideoSourceBase except that it applies thread checks. I found that > > it's easy to use VideoSourceBase incorrectly and in fact there appear > > to be tests that do this. > > > > I made the source object const in VideoTrack, as it already was in > > AudioTrack, and that allowed for making the GetSource() accessors > > bypass the proxy thread hop and give the caller direct access. > > > > Bug: webrtc:12773, b/188139639, webrtc:12780 > > Change-Id: I022175c4239a1306ef54059c131d81411d5124fe > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219160 > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Reviewed-by: Andrey Logvin <landrey@webrtc.org> > > Commit-Queue: Tommi <tommi@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#34096} > > TBR=mbonadei@webrtc.org,tommi@webrtc.org,landrey@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com > > Change-Id: I16323d459c76eb6a87cc602a0048f6ee01c81626 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:12773 > Bug: b/188139639 > Bug: webrtc:12780 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219637 > Reviewed-by: Evan Shrubsole <eshr@google.com> > Commit-Queue: Evan Shrubsole <eshr@google.com> > Cr-Commit-Position: refs/heads/master@{#34101} # Not skipping CQ checks because this is a reland. Bug: webrtc:12773 Bug: b/188139639 Bug: webrtc:12780 Change-Id: Ib35fe15a6c43de8f286d60aff02b19df1ab76925 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219639 Reviewed-by: Tommi <tommi@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Andrey Logvin <landrey@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@google.com> Commit-Queue: Tommi <tommi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34104}
2021-05-24 16:54:41 +02:00
rtc::scoped_refptr<VideoTrackInterface> CreateVideoTrack(
const std::string& id) {
return VideoTrack::Create(id, FakeVideoTrackSource::Create(false),
rtc::Thread::Current());
}
rtc::scoped_refptr<VideoTrackInterface> CreateMockVideoTrack(
const std::string& id) {
auto track = MockVideoTrack::Create();
Reland "Fix race between enabled() and set_enabled() in VideoTrack." This reverts commit 096ad02c02b4bc6c046282b8793ef84d041dd0d8. Reason for revert: Including a fix for the test issue. Original change's description: > Revert "Fix race between enabled() and set_enabled() in VideoTrack." > > This reverts commit 5ffefe9d2d743c66f8a8bcbc5ad9662a3138840a. > > Reason for revert: Breaks Chromium Android browser tests on fyi bots. > > Original change's description: > > Fix race between enabled() and set_enabled() in VideoTrack. > > > > Along the way I introduced VideoSourceBaseGuarded, which is equivalent > > to VideoSourceBase except that it applies thread checks. I found that > > it's easy to use VideoSourceBase incorrectly and in fact there appear > > to be tests that do this. > > > > I made the source object const in VideoTrack, as it already was in > > AudioTrack, and that allowed for making the GetSource() accessors > > bypass the proxy thread hop and give the caller direct access. > > > > Bug: webrtc:12773, b/188139639, webrtc:12780 > > Change-Id: I022175c4239a1306ef54059c131d81411d5124fe > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219160 > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Reviewed-by: Andrey Logvin <landrey@webrtc.org> > > Commit-Queue: Tommi <tommi@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#34096} > > TBR=mbonadei@webrtc.org,tommi@webrtc.org,landrey@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com > > Change-Id: I16323d459c76eb6a87cc602a0048f6ee01c81626 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:12773 > Bug: b/188139639 > Bug: webrtc:12780 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219637 > Reviewed-by: Evan Shrubsole <eshr@google.com> > Commit-Queue: Evan Shrubsole <eshr@google.com> > Cr-Commit-Position: refs/heads/master@{#34101} # Not skipping CQ checks because this is a reland. Bug: webrtc:12773 Bug: b/188139639 Bug: webrtc:12780 Change-Id: Ib35fe15a6c43de8f286d60aff02b19df1ab76925 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219639 Reviewed-by: Tommi <tommi@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Andrey Logvin <landrey@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@google.com> Commit-Queue: Tommi <tommi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34104}
2021-05-24 16:54:41 +02:00
EXPECT_CALL(*track, kind())
.WillRepeatedly(::testing::Return(VideoTrack::kVideoKind));
return track;
}
class TrackMediaInfoMapTest : public ::testing::Test {
public:
TrackMediaInfoMapTest() : TrackMediaInfoMapTest(true) {}
Reland "Fix race between enabled() and set_enabled() in VideoTrack." This reverts commit 096ad02c02b4bc6c046282b8793ef84d041dd0d8. Reason for revert: Including a fix for the test issue. Original change's description: > Revert "Fix race between enabled() and set_enabled() in VideoTrack." > > This reverts commit 5ffefe9d2d743c66f8a8bcbc5ad9662a3138840a. > > Reason for revert: Breaks Chromium Android browser tests on fyi bots. > > Original change's description: > > Fix race between enabled() and set_enabled() in VideoTrack. > > > > Along the way I introduced VideoSourceBaseGuarded, which is equivalent > > to VideoSourceBase except that it applies thread checks. I found that > > it's easy to use VideoSourceBase incorrectly and in fact there appear > > to be tests that do this. > > > > I made the source object const in VideoTrack, as it already was in > > AudioTrack, and that allowed for making the GetSource() accessors > > bypass the proxy thread hop and give the caller direct access. > > > > Bug: webrtc:12773, b/188139639, webrtc:12780 > > Change-Id: I022175c4239a1306ef54059c131d81411d5124fe > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219160 > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Reviewed-by: Andrey Logvin <landrey@webrtc.org> > > Commit-Queue: Tommi <tommi@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#34096} > > TBR=mbonadei@webrtc.org,tommi@webrtc.org,landrey@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com > > Change-Id: I16323d459c76eb6a87cc602a0048f6ee01c81626 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:12773 > Bug: b/188139639 > Bug: webrtc:12780 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219637 > Reviewed-by: Evan Shrubsole <eshr@google.com> > Commit-Queue: Evan Shrubsole <eshr@google.com> > Cr-Commit-Position: refs/heads/master@{#34101} # Not skipping CQ checks because this is a reland. Bug: webrtc:12773 Bug: b/188139639 Bug: webrtc:12780 Change-Id: Ib35fe15a6c43de8f286d60aff02b19df1ab76925 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219639 Reviewed-by: Tommi <tommi@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Andrey Logvin <landrey@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@google.com> Commit-Queue: Tommi <tommi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34104}
2021-05-24 16:54:41 +02:00
explicit TrackMediaInfoMapTest(bool use_real_video_track)
: voice_media_info_(new cricket::VoiceMediaInfo()),
video_media_info_(new cricket::VideoMediaInfo()),
local_audio_track_(AudioTrack::Create("LocalAudioTrack", nullptr)),
remote_audio_track_(AudioTrack::Create("RemoteAudioTrack", nullptr)),
Reland "Fix race between enabled() and set_enabled() in VideoTrack." This reverts commit 096ad02c02b4bc6c046282b8793ef84d041dd0d8. Reason for revert: Including a fix for the test issue. Original change's description: > Revert "Fix race between enabled() and set_enabled() in VideoTrack." > > This reverts commit 5ffefe9d2d743c66f8a8bcbc5ad9662a3138840a. > > Reason for revert: Breaks Chromium Android browser tests on fyi bots. > > Original change's description: > > Fix race between enabled() and set_enabled() in VideoTrack. > > > > Along the way I introduced VideoSourceBaseGuarded, which is equivalent > > to VideoSourceBase except that it applies thread checks. I found that > > it's easy to use VideoSourceBase incorrectly and in fact there appear > > to be tests that do this. > > > > I made the source object const in VideoTrack, as it already was in > > AudioTrack, and that allowed for making the GetSource() accessors > > bypass the proxy thread hop and give the caller direct access. > > > > Bug: webrtc:12773, b/188139639, webrtc:12780 > > Change-Id: I022175c4239a1306ef54059c131d81411d5124fe > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219160 > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Reviewed-by: Andrey Logvin <landrey@webrtc.org> > > Commit-Queue: Tommi <tommi@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#34096} > > TBR=mbonadei@webrtc.org,tommi@webrtc.org,landrey@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com > > Change-Id: I16323d459c76eb6a87cc602a0048f6ee01c81626 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:12773 > Bug: b/188139639 > Bug: webrtc:12780 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219637 > Reviewed-by: Evan Shrubsole <eshr@google.com> > Commit-Queue: Evan Shrubsole <eshr@google.com> > Cr-Commit-Position: refs/heads/master@{#34101} # Not skipping CQ checks because this is a reland. Bug: webrtc:12773 Bug: b/188139639 Bug: webrtc:12780 Change-Id: Ib35fe15a6c43de8f286d60aff02b19df1ab76925 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219639 Reviewed-by: Tommi <tommi@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Andrey Logvin <landrey@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@google.com> Commit-Queue: Tommi <tommi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34104}
2021-05-24 16:54:41 +02:00
local_video_track_(use_real_video_track
? CreateVideoTrack("LocalVideoTrack")
: CreateMockVideoTrack("LocalVideoTrack")),
remote_video_track_(use_real_video_track
? CreateVideoTrack("RemoteVideoTrack")
: CreateMockVideoTrack("LocalVideoTrack")) {}
~TrackMediaInfoMapTest() {
// If we have a map the ownership has been passed to the map, only delete if
Reland "Use backticks not vertical bars to denote variables in comments for /pc" Original change's description: > Revert "Use backticks not vertical bars to denote variables in comments for /pc" > > This reverts commit 37ee0f5e594dd772ec6d620b5e5ea8a751b684f0. > > Reason for revert: Revert in order to be able to revert https://webrtc-review.googlesource.com/c/src/+/225642 > > Original change's description: > > Use backticks not vertical bars to denote variables in comments for /pc > > > > Bug: webrtc:12338 > > Change-Id: I88cf10afa5fc810b95d2a585ab2e895dcc163b63 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/226953 > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Commit-Queue: Artem Titov <titovartem@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#34575} > > TBR=hta@webrtc.org,titovartem@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com > > Change-Id: I5eddd3a14e1f664bf831e5c294fbc4de5f6a88af > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:12338 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227082 > Reviewed-by: Björn Terelius <terelius@webrtc.org> > Commit-Queue: Björn Terelius <terelius@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#34577} Bug: webrtc:12338 Change-Id: I96bd229b73613c162d11d75fa4f5934e1b4295c7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227087 Commit-Queue: Artem Titov <titovartem@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34611}
2021-07-30 22:30:23 +02:00
// `CreateMap` has not been called.
if (!map_) {
delete voice_media_info_;
delete video_media_info_;
}
}
void AddRtpSenderWithSsrcs(std::initializer_list<uint32_t> ssrcs,
MediaStreamTrackInterface* local_track) {
rtc::scoped_refptr<MockRtpSenderInternal> rtp_sender = CreateMockRtpSender(
local_track->kind() == MediaStreamTrackInterface::kAudioKind
? cricket::MEDIA_TYPE_AUDIO
: cricket::MEDIA_TYPE_VIDEO,
ssrcs, rtc::scoped_refptr<MediaStreamTrackInterface>(local_track));
rtp_senders_.push_back(rtp_sender);
if (local_track->kind() == MediaStreamTrackInterface::kAudioKind) {
cricket::VoiceSenderInfo voice_sender_info;
size_t i = 0;
for (uint32_t ssrc : ssrcs) {
voice_sender_info.local_stats.push_back(cricket::SsrcSenderInfo());
voice_sender_info.local_stats[i++].ssrc = ssrc;
}
voice_media_info_->senders.push_back(voice_sender_info);
} else {
cricket::VideoSenderInfo video_sender_info;
size_t i = 0;
for (uint32_t ssrc : ssrcs) {
video_sender_info.local_stats.push_back(cricket::SsrcSenderInfo());
video_sender_info.local_stats[i++].ssrc = ssrc;
}
video_media_info_->senders.push_back(video_sender_info);
Reland "Improve outbound-rtp statistics for simulcast" This reverts commit 9a925c9ce33a6ccdd11b545b11ba68e985c2a65d. Reason for revert: The original CL is updated in PS #2 to fix the googRtt issue which was that when the legacy sender stats were put in "aggregated_senders" we forgot to update rtt_ms the same way that we do it for "senders". Original change's description: > Revert "Improve outbound-rtp statistics for simulcast" > > This reverts commit da6cda839dac7d9d18eba8d365188fa94831e0b1. > > Reason for revert: Breaks googRtt in legacy getStats API > > Original change's description: > > Improve outbound-rtp statistics for simulcast > > > > Bug: webrtc:9547 > > Change-Id: Iec4eb976aa11ee743805425bedb77dcea7c2c9be > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168120 > > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > > Reviewed-by: Erik Språng <sprang@webrtc.org> > > Reviewed-by: Henrik Boström <hbos@webrtc.org> > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Commit-Queue: Eldar Rello <elrello@microsoft.com> > > Cr-Commit-Position: refs/heads/master@{#31097} > > TBR=hbos@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,srte@webrtc.org,hta@webrtc.org,elrello@microsoft.com > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:9547 > Change-Id: I06673328c2a5293a7eef03b3aaf2ded9d13df1b3 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174443 > Reviewed-by: Henrik Boström <hbos@webrtc.org> > Commit-Queue: Henrik Boström <hbos@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#31165} TBR=hbos@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,srte@webrtc.org,hta@webrtc.org,elrello@microsoft.com # Not skipping CQ checks because this is a reland. Bug: webrtc:9547 Change-Id: I723744c496c3c65f95ab6a8940862c8b9f544338 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174480 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Henrik Boström <hbos@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31169}
2020-05-05 15:54:46 +02:00
video_media_info_->aggregated_senders.push_back(video_sender_info);
}
}
void AddRtpReceiverWithSsrcs(std::initializer_list<uint32_t> ssrcs,
MediaStreamTrackInterface* remote_track) {
auto rtp_receiver = CreateMockRtpReceiver(
remote_track->kind() == MediaStreamTrackInterface::kAudioKind
? cricket::MEDIA_TYPE_AUDIO
: cricket::MEDIA_TYPE_VIDEO,
ssrcs, rtc::scoped_refptr<MediaStreamTrackInterface>(remote_track));
rtp_receivers_.push_back(rtp_receiver);
if (remote_track->kind() == MediaStreamTrackInterface::kAudioKind) {
cricket::VoiceReceiverInfo voice_receiver_info;
size_t i = 0;
for (uint32_t ssrc : ssrcs) {
voice_receiver_info.local_stats.push_back(cricket::SsrcReceiverInfo());
voice_receiver_info.local_stats[i++].ssrc = ssrc;
}
voice_media_info_->receivers.push_back(voice_receiver_info);
} else {
cricket::VideoReceiverInfo video_receiver_info;
size_t i = 0;
for (uint32_t ssrc : ssrcs) {
video_receiver_info.local_stats.push_back(cricket::SsrcReceiverInfo());
video_receiver_info.local_stats[i++].ssrc = ssrc;
}
video_media_info_->receivers.push_back(video_receiver_info);
}
}
void CreateMap() {
RTC_DCHECK(!map_);
map_.reset(new TrackMediaInfoMap(
std::unique_ptr<cricket::VoiceMediaInfo>(voice_media_info_),
std::unique_ptr<cricket::VideoMediaInfo>(video_media_info_),
rtp_senders_, rtp_receivers_));
}
protected:
cricket::VoiceMediaInfo* voice_media_info_;
cricket::VideoMediaInfo* video_media_info_;
std::vector<rtc::scoped_refptr<RtpSenderInternal>> rtp_senders_;
std::vector<rtc::scoped_refptr<RtpReceiverInternal>> rtp_receivers_;
std::unique_ptr<TrackMediaInfoMap> map_;
rtc::scoped_refptr<AudioTrack> local_audio_track_;
rtc::scoped_refptr<AudioTrack> remote_audio_track_;
Reland "Fix race between enabled() and set_enabled() in VideoTrack." This reverts commit 096ad02c02b4bc6c046282b8793ef84d041dd0d8. Reason for revert: Including a fix for the test issue. Original change's description: > Revert "Fix race between enabled() and set_enabled() in VideoTrack." > > This reverts commit 5ffefe9d2d743c66f8a8bcbc5ad9662a3138840a. > > Reason for revert: Breaks Chromium Android browser tests on fyi bots. > > Original change's description: > > Fix race between enabled() and set_enabled() in VideoTrack. > > > > Along the way I introduced VideoSourceBaseGuarded, which is equivalent > > to VideoSourceBase except that it applies thread checks. I found that > > it's easy to use VideoSourceBase incorrectly and in fact there appear > > to be tests that do this. > > > > I made the source object const in VideoTrack, as it already was in > > AudioTrack, and that allowed for making the GetSource() accessors > > bypass the proxy thread hop and give the caller direct access. > > > > Bug: webrtc:12773, b/188139639, webrtc:12780 > > Change-Id: I022175c4239a1306ef54059c131d81411d5124fe > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219160 > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Reviewed-by: Andrey Logvin <landrey@webrtc.org> > > Commit-Queue: Tommi <tommi@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#34096} > > TBR=mbonadei@webrtc.org,tommi@webrtc.org,landrey@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com > > Change-Id: I16323d459c76eb6a87cc602a0048f6ee01c81626 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:12773 > Bug: b/188139639 > Bug: webrtc:12780 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219637 > Reviewed-by: Evan Shrubsole <eshr@google.com> > Commit-Queue: Evan Shrubsole <eshr@google.com> > Cr-Commit-Position: refs/heads/master@{#34101} # Not skipping CQ checks because this is a reland. Bug: webrtc:12773 Bug: b/188139639 Bug: webrtc:12780 Change-Id: Ib35fe15a6c43de8f286d60aff02b19df1ab76925 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219639 Reviewed-by: Tommi <tommi@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Andrey Logvin <landrey@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@google.com> Commit-Queue: Tommi <tommi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34104}
2021-05-24 16:54:41 +02:00
rtc::scoped_refptr<VideoTrackInterface> local_video_track_;
rtc::scoped_refptr<VideoTrackInterface> remote_video_track_;
};
} // namespace
TEST_F(TrackMediaInfoMapTest, SingleSenderReceiverPerTrackWithOneSsrc) {
AddRtpSenderWithSsrcs({1}, local_audio_track_);
AddRtpReceiverWithSsrcs({2}, remote_audio_track_);
AddRtpSenderWithSsrcs({3}, local_video_track_);
AddRtpReceiverWithSsrcs({4}, remote_video_track_);
CreateMap();
// Local audio track <-> RTP audio sender
ASSERT_TRUE(map_->GetVoiceSenderInfos(*local_audio_track_));
EXPECT_EQ(
*map_->GetVoiceSenderInfos(*local_audio_track_),
std::vector<cricket::VoiceSenderInfo*>({&voice_media_info_->senders[0]}));
EXPECT_EQ(map_->GetAudioTrack(voice_media_info_->senders[0]),
local_audio_track_.get());
// Remote audio track <-> RTP audio receiver
EXPECT_EQ(map_->GetVoiceReceiverInfo(*remote_audio_track_),
&voice_media_info_->receivers[0]);
EXPECT_EQ(map_->GetAudioTrack(voice_media_info_->receivers[0]),
remote_audio_track_.get());
// Local video track <-> RTP video sender
ASSERT_TRUE(map_->GetVideoSenderInfos(*local_video_track_));
EXPECT_EQ(
*map_->GetVideoSenderInfos(*local_video_track_),
std::vector<cricket::VideoSenderInfo*>({&video_media_info_->senders[0]}));
EXPECT_EQ(map_->GetVideoTrack(video_media_info_->senders[0]),
local_video_track_.get());
// Remote video track <-> RTP video receiver
EXPECT_EQ(map_->GetVideoReceiverInfo(*remote_video_track_),
&video_media_info_->receivers[0]);
EXPECT_EQ(map_->GetVideoTrack(video_media_info_->receivers[0]),
remote_video_track_.get());
}
TEST_F(TrackMediaInfoMapTest, SingleSenderReceiverPerTrackWithMissingSsrc) {
AddRtpSenderWithSsrcs({}, local_audio_track_);
AddRtpSenderWithSsrcs({}, local_video_track_);
AddRtpReceiverWithSsrcs({}, remote_audio_track_);
AddRtpReceiverWithSsrcs({}, remote_video_track_);
CreateMap();
EXPECT_FALSE(map_->GetVoiceSenderInfos(*local_audio_track_));
EXPECT_FALSE(map_->GetVideoSenderInfos(*local_video_track_));
EXPECT_FALSE(map_->GetVoiceReceiverInfo(*remote_audio_track_));
EXPECT_FALSE(map_->GetVideoReceiverInfo(*remote_video_track_));
}
TEST_F(TrackMediaInfoMapTest,
SingleSenderReceiverPerTrackWithAudioAndVideoUseSameSsrc) {
AddRtpSenderWithSsrcs({1}, local_audio_track_);
AddRtpReceiverWithSsrcs({2}, remote_audio_track_);
AddRtpSenderWithSsrcs({1}, local_video_track_);
AddRtpReceiverWithSsrcs({2}, remote_video_track_);
CreateMap();
// Local audio track <-> RTP audio sender
ASSERT_TRUE(map_->GetVoiceSenderInfos(*local_audio_track_));
EXPECT_EQ(
*map_->GetVoiceSenderInfos(*local_audio_track_),
std::vector<cricket::VoiceSenderInfo*>({&voice_media_info_->senders[0]}));
EXPECT_EQ(map_->GetAudioTrack(voice_media_info_->senders[0]),
local_audio_track_.get());
// Remote audio track <-> RTP audio receiver
EXPECT_EQ(map_->GetVoiceReceiverInfo(*remote_audio_track_),
&voice_media_info_->receivers[0]);
EXPECT_EQ(map_->GetAudioTrack(voice_media_info_->receivers[0]),
remote_audio_track_.get());
// Local video track <-> RTP video sender
ASSERT_TRUE(map_->GetVideoSenderInfos(*local_video_track_));
EXPECT_EQ(
*map_->GetVideoSenderInfos(*local_video_track_),
std::vector<cricket::VideoSenderInfo*>({&video_media_info_->senders[0]}));
EXPECT_EQ(map_->GetVideoTrack(video_media_info_->senders[0]),
local_video_track_.get());
// Remote video track <-> RTP video receiver
EXPECT_EQ(map_->GetVideoReceiverInfo(*remote_video_track_),
&video_media_info_->receivers[0]);
EXPECT_EQ(map_->GetVideoTrack(video_media_info_->receivers[0]),
remote_video_track_.get());
}
TEST_F(TrackMediaInfoMapTest, SingleMultiSsrcSenderPerTrack) {
AddRtpSenderWithSsrcs({1, 2}, local_audio_track_);
AddRtpSenderWithSsrcs({3, 4}, local_video_track_);
CreateMap();
// Local audio track <-> RTP audio senders
ASSERT_TRUE(map_->GetVoiceSenderInfos(*local_audio_track_));
EXPECT_EQ(
*map_->GetVoiceSenderInfos(*local_audio_track_),
std::vector<cricket::VoiceSenderInfo*>({&voice_media_info_->senders[0]}));
EXPECT_EQ(map_->GetAudioTrack(voice_media_info_->senders[0]),
local_audio_track_.get());
// Local video track <-> RTP video senders
ASSERT_TRUE(map_->GetVideoSenderInfos(*local_video_track_));
EXPECT_EQ(
*map_->GetVideoSenderInfos(*local_video_track_),
std::vector<cricket::VideoSenderInfo*>({&video_media_info_->senders[0]}));
EXPECT_EQ(map_->GetVideoTrack(video_media_info_->senders[0]),
local_video_track_.get());
}
TEST_F(TrackMediaInfoMapTest, MultipleOneSsrcSendersPerTrack) {
AddRtpSenderWithSsrcs({1}, local_audio_track_);
AddRtpSenderWithSsrcs({2}, local_audio_track_);
AddRtpSenderWithSsrcs({3}, local_video_track_);
AddRtpSenderWithSsrcs({4}, local_video_track_);
CreateMap();
// Local audio track <-> RTP audio senders
ASSERT_TRUE(map_->GetVoiceSenderInfos(*local_audio_track_));
EXPECT_EQ(
*map_->GetVoiceSenderInfos(*local_audio_track_),
std::vector<cricket::VoiceSenderInfo*>(
{&voice_media_info_->senders[0], &voice_media_info_->senders[1]}));
EXPECT_EQ(map_->GetAudioTrack(voice_media_info_->senders[0]),
local_audio_track_.get());
EXPECT_EQ(map_->GetAudioTrack(voice_media_info_->senders[1]),
local_audio_track_.get());
// Local video track <-> RTP video senders
ASSERT_TRUE(map_->GetVideoSenderInfos(*local_video_track_));
EXPECT_EQ(
*map_->GetVideoSenderInfos(*local_video_track_),
std::vector<cricket::VideoSenderInfo*>(
{&video_media_info_->senders[0], &video_media_info_->senders[1]}));
EXPECT_EQ(map_->GetVideoTrack(video_media_info_->senders[0]),
local_video_track_.get());
EXPECT_EQ(map_->GetVideoTrack(video_media_info_->senders[1]),
local_video_track_.get());
}
TEST_F(TrackMediaInfoMapTest, MultipleMultiSsrcSendersPerTrack) {
AddRtpSenderWithSsrcs({1, 2}, local_audio_track_);
AddRtpSenderWithSsrcs({3, 4}, local_audio_track_);
AddRtpSenderWithSsrcs({5, 6}, local_video_track_);
AddRtpSenderWithSsrcs({7, 8}, local_video_track_);
CreateMap();
// Local audio track <-> RTP audio senders
ASSERT_TRUE(map_->GetVoiceSenderInfos(*local_audio_track_));
EXPECT_EQ(
*map_->GetVoiceSenderInfos(*local_audio_track_),
std::vector<cricket::VoiceSenderInfo*>(
{&voice_media_info_->senders[0], &voice_media_info_->senders[1]}));
EXPECT_EQ(map_->GetAudioTrack(voice_media_info_->senders[0]),
local_audio_track_.get());
EXPECT_EQ(map_->GetAudioTrack(voice_media_info_->senders[1]),
local_audio_track_.get());
// Local video track <-> RTP video senders
ASSERT_TRUE(map_->GetVideoSenderInfos(*local_video_track_));
EXPECT_EQ(
*map_->GetVideoSenderInfos(*local_video_track_),
std::vector<cricket::VideoSenderInfo*>(
{&video_media_info_->senders[0], &video_media_info_->senders[1]}));
EXPECT_EQ(map_->GetVideoTrack(video_media_info_->senders[0]),
local_video_track_.get());
EXPECT_EQ(map_->GetVideoTrack(video_media_info_->senders[1]),
local_video_track_.get());
}
// SSRCs can be reused for send and receive in loopback.
TEST_F(TrackMediaInfoMapTest, SingleSenderReceiverPerTrackWithSsrcNotUnique) {
AddRtpSenderWithSsrcs({1}, local_audio_track_);
AddRtpReceiverWithSsrcs({1}, remote_audio_track_);
AddRtpSenderWithSsrcs({2}, local_video_track_);
AddRtpReceiverWithSsrcs({2}, remote_video_track_);
CreateMap();
// Local audio track <-> RTP audio senders
ASSERT_TRUE(map_->GetVoiceSenderInfos(*local_audio_track_));
EXPECT_EQ(
*map_->GetVoiceSenderInfos(*local_audio_track_),
std::vector<cricket::VoiceSenderInfo*>({&voice_media_info_->senders[0]}));
EXPECT_EQ(map_->GetAudioTrack(voice_media_info_->senders[0]),
local_audio_track_.get());
// Remote audio track <-> RTP audio receiver
EXPECT_EQ(map_->GetVoiceReceiverInfo(*remote_audio_track_),
&voice_media_info_->receivers[0]);
EXPECT_EQ(map_->GetAudioTrack(voice_media_info_->receivers[0]),
remote_audio_track_.get());
// Local video track <-> RTP video senders
ASSERT_TRUE(map_->GetVideoSenderInfos(*local_video_track_));
EXPECT_EQ(
*map_->GetVideoSenderInfos(*local_video_track_),
std::vector<cricket::VideoSenderInfo*>({&video_media_info_->senders[0]}));
EXPECT_EQ(map_->GetVideoTrack(video_media_info_->senders[0]),
local_video_track_.get());
// Remote video track <-> RTP video receiver
EXPECT_EQ(map_->GetVideoReceiverInfo(*remote_video_track_),
&video_media_info_->receivers[0]);
EXPECT_EQ(map_->GetVideoTrack(video_media_info_->receivers[0]),
remote_video_track_.get());
}
TEST_F(TrackMediaInfoMapTest, SsrcLookupFunction) {
AddRtpSenderWithSsrcs({1}, local_audio_track_);
AddRtpReceiverWithSsrcs({2}, remote_audio_track_);
AddRtpSenderWithSsrcs({3}, local_video_track_);
AddRtpReceiverWithSsrcs({4}, remote_video_track_);
CreateMap();
EXPECT_TRUE(map_->GetVoiceSenderInfoBySsrc(1));
EXPECT_TRUE(map_->GetVoiceReceiverInfoBySsrc(2));
EXPECT_TRUE(map_->GetVideoSenderInfoBySsrc(3));
EXPECT_TRUE(map_->GetVideoReceiverInfoBySsrc(4));
EXPECT_FALSE(map_->GetVoiceSenderInfoBySsrc(2));
EXPECT_FALSE(map_->GetVoiceSenderInfoBySsrc(1024));
}
TEST_F(TrackMediaInfoMapTest, GetAttachmentIdByTrack) {
AddRtpSenderWithSsrcs({1}, local_audio_track_);
CreateMap();
EXPECT_EQ(rtp_senders_[0]->AttachmentId(),
map_->GetAttachmentIdByTrack(local_audio_track_));
EXPECT_EQ(absl::nullopt, map_->GetAttachmentIdByTrack(local_video_track_));
}
// Death tests.
// Disabled on Android because death tests misbehave on Android, see
// base/test/gtest_util.h.
#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
class TrackMediaInfoMapDeathTest : public TrackMediaInfoMapTest {
public:
TrackMediaInfoMapDeathTest() : TrackMediaInfoMapTest(false) {}
};
TEST_F(TrackMediaInfoMapDeathTest, MultipleOneSsrcReceiversPerTrack) {
AddRtpReceiverWithSsrcs({1}, remote_audio_track_);
AddRtpReceiverWithSsrcs({2}, remote_audio_track_);
AddRtpReceiverWithSsrcs({3}, remote_video_track_);
AddRtpReceiverWithSsrcs({4}, remote_video_track_);
EXPECT_DEATH(CreateMap(), "");
}
TEST_F(TrackMediaInfoMapDeathTest, MultipleMultiSsrcReceiversPerTrack) {
AddRtpReceiverWithSsrcs({1, 2}, remote_audio_track_);
AddRtpReceiverWithSsrcs({3, 4}, remote_audio_track_);
AddRtpReceiverWithSsrcs({5, 6}, remote_video_track_);
AddRtpReceiverWithSsrcs({7, 8}, remote_video_track_);
EXPECT_DEATH(CreateMap(), "");
}
#endif // RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
} // namespace webrtc