commit c6f81a71e545913d7ea0dd3e9a8ba2bc82b87d93
author Danil Chapovalov <danilchap@webrtc.org> Thu Jan 16 09:21:46 2020
committer Commit Bot <commit-bot@chromium.org> Thu Jan 16 11:11:39 2020
tree 5c1ae2b007a8f7ee0b3103c81449de73ee6bbf02
parent 6ca908f48c88fda174516ec8edc5041f61a432b2

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 <handellm@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30278}

call/rtp_payload_params_unittest.cc

diff --git a/call/rtp_payload_params_unittest.cc b/call/rtp_payload_params_unittest.cc
index d3bdf56..90b08a2 100644
--- a/call/rtp_payload_params_unittest.cc
+++ b/call/rtp_payload_params_unittest.cc
@@ -397,7 +397,6 @@
         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 @@
         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);

modules/rtp_rtcp/source/rtp_sender_video.cc

diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc
index d1822f2..eafcdf0 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video.cc
@@ -121,11 +121,6 @@
       }
 
       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);

modules/rtp_rtcp/source/rtp_sender_video_unittest.cc

diff --git a/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc
index faf0dec..1663ad5 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 @@
   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 @@
   EXPECT_EQ(static_cast<uint16_t>(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) {

modules/rtp_rtcp/source/rtp_video_header.h

diff --git a/modules/rtp_rtcp/source/rtp_video_header.h b/modules/rtp_rtcp/source/rtp_video_header.h
index 78f8c4b..9af2c09 100644
--- a/modules/rtp_rtcp/source/rtp_video_header.h
+++ b/modules/rtp_rtcp/source/rtp_video_header.h
@@ -43,7 +43,6 @@
     int spatial_index = 0;
     int temporal_index = 0;
     absl::InlinedVector<int64_t, 5> dependencies;
-    absl::InlinedVector<int, 5> higher_spatial_layers;
     bool discardable = false;
   };