mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-14 14:20:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove higher_spatial_layers from RTPVideoHeader structure as unused.

Browse source 
The idea to communicate spatial dependencies with spatial layers bitmask
wasn't fully implemented and was dropped in later version of the descriptor.

Bug: webrtc:10342
Change-Id: I1ed191c3a2a9d2e1e9ddf313f781ca8257c34dfa
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166165
Reviewed-by: Markus Handell <handellm@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30278}
This commit is contained in:
Danil Chapovalov 2020-01-16 10:21:46 +01:00 committed by Commit Bot
parent 6ca908f48c
commit c6f81a71e5
4 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
call/rtp_payload_params_unittest.cc
View file

@ -397,7 +397,6 @@ class RtpPayloadParamsVp8ToGenericTest : public ::testing::Test {
params_.GetRtpVideoHeader(encoded_image, &codec_info, shared_frame_id); params_.GetRtpVideoHeader(encoded_image, &codec_info, shared_frame_id);
ASSERT_TRUE(header.generic); ASSERT_TRUE(header.generic);
EXPECT_TRUE(header.generic->higher_spatial_layers.empty());
EXPECT_EQ(header.generic->spatial_index, 0); EXPECT_EQ(header.generic->spatial_index, 0);
EXPECT_EQ(header.generic->frame_id, shared_frame_id); EXPECT_EQ(header.generic->frame_id, shared_frame_id);
@ -494,7 +493,6 @@ class RtpPayloadParamsH264ToGenericTest : public ::testing::Test {
params_.GetRtpVideoHeader(encoded_image, &codec_info, shared_frame_id); params_.GetRtpVideoHeader(encoded_image, &codec_info, shared_frame_id);
ASSERT_TRUE(header.generic); ASSERT_TRUE(header.generic);
EXPECT_TRUE(header.generic->higher_spatial_layers.empty());
EXPECT_EQ(header.generic->spatial_index, 0); EXPECT_EQ(header.generic->spatial_index, 0);
EXPECT_EQ(header.generic->frame_id, shared_frame_id); EXPECT_EQ(header.generic->frame_id, shared_frame_id);

5
modules/rtp_rtcp/source/rtp_sender_video.cc
View file

@ -121,11 +121,6 @@ void AddRtpHeaderExtensions(const RTPVideoHeader& video_header,
} }
uint8_t spatial_bimask = 1 << video_header.generic->spatial_index; uint8_t spatial_bimask = 1 << video_header.generic->spatial_index;
for (int layer : video_header.generic->higher_spatial_layers) {
RTC_DCHECK_GT(layer, video_header.generic->spatial_index);
RTC_DCHECK_LT(layer, 8);
spatial_bimask |= 1 << layer;
}
generic_descriptor.SetSpatialLayersBitmask(spatial_bimask); generic_descriptor.SetSpatialLayersBitmask(spatial_bimask);
generic_descriptor.SetTemporalLayer(video_header.generic->temporal_index); generic_descriptor.SetTemporalLayer(video_header.generic->temporal_index);

4
modules/rtp_rtcp/source/rtp_sender_video_unittest.cc
View file

@ -531,7 +531,6 @@ void RtpSenderVideoTest::PopulateGenericFrameDescriptor(int version) {
generic.frame_id = kFrameId; generic.frame_id = kFrameId;
generic.temporal_index = 3; generic.temporal_index = 3;
generic.spatial_index = 2; generic.spatial_index = 2;
generic.higher_spatial_layers.push_back(4);
generic.dependencies.push_back(kFrameId - 1); generic.dependencies.push_back(kFrameId - 1);
generic.dependencies.push_back(kFrameId - 500); generic.dependencies.push_back(kFrameId - 500);
hdr.frame_type = VideoFrameType::kVideoFrameDelta; hdr.frame_type = VideoFrameType::kVideoFrameDelta;
@ -552,8 +551,7 @@ void RtpSenderVideoTest::PopulateGenericFrameDescriptor(int version) {
EXPECT_EQ(static_cast<uint16_t>(generic.frame_id), descriptor_wire.FrameId()); EXPECT_EQ(static_cast<uint16_t>(generic.frame_id), descriptor_wire.FrameId());
EXPECT_EQ(generic.temporal_index, descriptor_wire.TemporalLayer()); EXPECT_EQ(generic.temporal_index, descriptor_wire.TemporalLayer());
EXPECT_THAT(descriptor_wire.FrameDependenciesDiffs(), ElementsAre(1, 500)); EXPECT_THAT(descriptor_wire.FrameDependenciesDiffs(), ElementsAre(1, 500));
uint8_t spatial_bitmask = 0x14; EXPECT_EQ(descriptor_wire.SpatialLayersBitmask(), 0b0000'0100);
EXPECT_EQ(spatial_bitmask, descriptor_wire.SpatialLayersBitmask());
} }
TEST_P(RtpSenderVideoTest, PopulateGenericFrameDescriptor00) { TEST_P(RtpSenderVideoTest, PopulateGenericFrameDescriptor00) {

1
modules/rtp_rtcp/source/rtp_video_header.h
View file

@ -43,7 +43,6 @@ struct RTPVideoHeader {
int spatial_index = 0; int spatial_index = 0;
int temporal_index = 0; int temporal_index = 0;
absl::InlinedVector<int64_t, 5> dependencies; absl::InlinedVector<int64_t, 5> dependencies;
absl::InlinedVector<int, 5> higher_spatial_layers;
bool discardable = false; bool discardable = false;
}; };