zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Creating Simulcast offer and answer in Peer Connection.

Browse Source 
CreateOffer and CreateAnswer will now examine the layers on the
transceiver to determine if multiple layers are requested (Simulcast).
In this scenario RIDs will be used in the layers (instead of SSRCs).
When the offer is created, only RIDs are signalled in the offer.
When the offer is set locally SetLocalDescription() SSRCs will be
generated for each layer by the Channel and sent downstream to the
MediaChannel.
The MediaChannel receives configuration that looks identical to that of
legacy simulcast, and should be able to integrate the streams correctly
regardless of how they were signalled.
Setting multiple layers on the transciever is still not supported
through the API.

Bug: webrtc:10075
Change-Id: Id4ad3637b87b68ef6ca7eec69166fee2d9dfa36f
Reviewed-on: https://webrtc-review.googlesource.com/c/119780
Reviewed-by: Seth Hampson <shampson@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Amit Hilbuch <amithi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26428}
This commit is contained in:
Amit Hilbuch
2019-01-25 17:13:56 -08:00
committed by Commit Bot
parent e76ca61238
commit bcd39d483d
20 changed files with 625 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
media/base/stream_params_unittest.cc
View File

@ -14,8 +14,12 @@
#include "media/base/test_utils.h"
#include "rtc_base/arraysize.h"
#include "test/gmock.h"
#include "test/gtest.h"
using ::testing::Each;
using ::testing::Ne;
static const uint32_t kSsrcs1[] = {1};
static const uint32_t kSsrcs2[] = {1, 2};
static const uint32_t kSsrcs3[] = {1, 2, 3};
@ -321,3 +325,72 @@ TEST(StreamParams, TestIsSimulcastStream_InvalidStreams) {
stream3.ssrc_groups.push_back(sg);
EXPECT_FALSE(cricket::IsSimulcastStream(stream3));
}
TEST(StreamParams, TestGenerateSsrcs_SingleStreamWithRtxAndFlex) {
rtc::UniqueRandomIdGenerator generator;
cricket::StreamParams stream;
stream.GenerateSsrcs(1, true, true, &generator);
uint32_t primary_ssrc = stream.first_ssrc();
ASSERT_NE(0u, primary_ssrc);
uint32_t rtx_ssrc = 0;
uint32_t flex_ssrc = 0;
EXPECT_EQ(3u, stream.ssrcs.size());
EXPECT_TRUE(stream.GetFidSsrc(primary_ssrc, &rtx_ssrc));
EXPECT_NE(0u, rtx_ssrc);
EXPECT_TRUE(stream.GetFecFrSsrc(primary_ssrc, &flex_ssrc));
EXPECT_NE(0u, flex_ssrc);
EXPECT_FALSE(stream.has_ssrc_group(cricket::kSimSsrcGroupSemantics));
EXPECT_TRUE(stream.has_ssrc_group(cricket::kFidSsrcGroupSemantics));
EXPECT_TRUE(stream.has_ssrc_group(cricket::kFecFrSsrcGroupSemantics));
}
TEST(StreamParams, TestGenerateSsrcs_SingleStreamWithRtx) {
rtc::UniqueRandomIdGenerator generator;
cricket::StreamParams stream;
stream.GenerateSsrcs(1, true, false, &generator);
uint32_t primary_ssrc = stream.first_ssrc();
ASSERT_NE(0u, primary_ssrc);
uint32_t rtx_ssrc = 0;
uint32_t flex_ssrc = 0;
EXPECT_EQ(2u, stream.ssrcs.size());
EXPECT_TRUE(stream.GetFidSsrc(primary_ssrc, &rtx_ssrc));
EXPECT_NE(0u, rtx_ssrc);
EXPECT_FALSE(stream.GetFecFrSsrc(primary_ssrc, &flex_ssrc));
EXPECT_EQ(0u, flex_ssrc);
EXPECT_FALSE(stream.has_ssrc_group(cricket::kSimSsrcGroupSemantics));
EXPECT_TRUE(stream.has_ssrc_group(cricket::kFidSsrcGroupSemantics));
}
TEST(StreamParams, TestGenerateSsrcs_SingleStreamWithFlex) {
rtc::UniqueRandomIdGenerator generator;
cricket::StreamParams stream;
stream.GenerateSsrcs(1, false, true, &generator);
uint32_t primary_ssrc = stream.first_ssrc();
ASSERT_NE(0u, primary_ssrc);
uint32_t rtx_ssrc = 0;
uint32_t flex_ssrc = 0;
EXPECT_EQ(2u, stream.ssrcs.size());
EXPECT_FALSE(stream.GetFidSsrc(primary_ssrc, &rtx_ssrc));
EXPECT_EQ(0u, rtx_ssrc);
EXPECT_TRUE(stream.GetFecFrSsrc(primary_ssrc, &flex_ssrc));
EXPECT_NE(0u, flex_ssrc);
EXPECT_FALSE(stream.has_ssrc_group(cricket::kSimSsrcGroupSemantics));
EXPECT_TRUE(stream.has_ssrc_group(cricket::kFecFrSsrcGroupSemantics));
}
TEST(StreamParams, TestGenerateSsrcs_SimulcastLayersAndRtx) {
const size_t kNumStreams = 3;
rtc::UniqueRandomIdGenerator generator;
cricket::StreamParams stream;
stream.GenerateSsrcs(kNumStreams, true, false, &generator);
EXPECT_EQ(kNumStreams * 2, stream.ssrcs.size());
std::vector<uint32_t> primary_ssrcs, rtx_ssrcs;
stream.GetPrimarySsrcs(&primary_ssrcs);
EXPECT_EQ(kNumStreams, primary_ssrcs.size());
EXPECT_THAT(primary_ssrcs, Each(Ne(0u)));
stream.GetFidSsrcs(primary_ssrcs, &rtx_ssrcs);
EXPECT_EQ(kNumStreams, rtx_ssrcs.size());
EXPECT_THAT(rtx_ssrcs, Each(Ne(0u)));
EXPECT_TRUE(stream.has_ssrc_group(cricket::kSimSsrcGroupSemantics));
EXPECT_TRUE(stream.has_ssrc_group(cricket::kFidSsrcGroupSemantics));
}