From c6f81a71e545913d7ea0dd3e9a8ba2bc82b87d93 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Thu, 16 Jan 2020 10:21:46 +0100 Subject: [PATCH] Remove higher_spatial_layers from RTPVideoHeader structure as unused. 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 Reviewed-by: Niels Moller Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#30278} --- call/rtp_payload_params_unittest.cc | 2 -- modules/rtp_rtcp/source/rtp_sender_video.cc | 5 ----- modules/rtp_rtcp/source/rtp_sender_video_unittest.cc | 4 +--- modules/rtp_rtcp/source/rtp_video_header.h | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/call/rtp_payload_params_unittest.cc b/call/rtp_payload_params_unittest.cc index d3bdf5615e..90b08a27e7 100644 --- a/call/rtp_payload_params_unittest.cc +++ b/call/rtp_payload_params_unittest.cc @@ -397,7 +397,6 @@ class RtpPayloadParamsVp8ToGenericTest : public ::testing::Test { params_.GetRtpVideoHeader(encoded_image, &codec_info, shared_frame_id); ASSERT_TRUE(header.generic); - EXPECT_TRUE(header.generic->higher_spatial_layers.empty()); EXPECT_EQ(header.generic->spatial_index, 0); 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); ASSERT_TRUE(header.generic); - EXPECT_TRUE(header.generic->higher_spatial_layers.empty()); EXPECT_EQ(header.generic->spatial_index, 0); EXPECT_EQ(header.generic->frame_id, shared_frame_id); diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc index d1822f2997..eafcdf084e 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -121,11 +121,6 @@ void AddRtpHeaderExtensions(const RTPVideoHeader& video_header, } 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.SetTemporalLayer(video_header.generic->temporal_index); diff --git a/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc index faf0decf98..1663ad5ea7 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc @@ -531,7 +531,6 @@ void RtpSenderVideoTest::PopulateGenericFrameDescriptor(int version) { generic.frame_id = kFrameId; generic.temporal_index = 3; generic.spatial_index = 2; - generic.higher_spatial_layers.push_back(4); generic.dependencies.push_back(kFrameId - 1); generic.dependencies.push_back(kFrameId - 500); hdr.frame_type = VideoFrameType::kVideoFrameDelta; @@ -552,8 +551,7 @@ void RtpSenderVideoTest::PopulateGenericFrameDescriptor(int version) { EXPECT_EQ(static_cast(generic.frame_id), descriptor_wire.FrameId()); EXPECT_EQ(generic.temporal_index, descriptor_wire.TemporalLayer()); EXPECT_THAT(descriptor_wire.FrameDependenciesDiffs(), ElementsAre(1, 500)); - uint8_t spatial_bitmask = 0x14; - EXPECT_EQ(spatial_bitmask, descriptor_wire.SpatialLayersBitmask()); + EXPECT_EQ(descriptor_wire.SpatialLayersBitmask(), 0b0000'0100); } TEST_P(RtpSenderVideoTest, PopulateGenericFrameDescriptor00) { diff --git a/modules/rtp_rtcp/source/rtp_video_header.h b/modules/rtp_rtcp/source/rtp_video_header.h index 78f8c4b2d1..9af2c094b6 100644 --- a/modules/rtp_rtcp/source/rtp_video_header.h +++ b/modules/rtp_rtcp/source/rtp_video_header.h @@ -43,7 +43,6 @@ struct RTPVideoHeader { int spatial_index = 0; int temporal_index = 0; absl::InlinedVector dependencies; - absl::InlinedVector higher_spatial_layers; bool discardable = false; };