From 80ed9b8eb9b0413027fe82335e2a85bbfbc97c1a Mon Sep 17 00:00:00 2001 From: Byoungchan Lee Date: Wed, 7 Sep 2022 09:35:01 +0900 Subject: [PATCH] Remove unused VP9 TemporalStructureMode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit kTemporalStructureMode4 is not used anywhere in the code. Bug: None Change-Id: I9a396f6706d26940fae68d1318942b5f31afa3bf Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/274380 Reviewed-by: Erik Språng Commit-Queue: Daniel.L (Byoungchan) Lee Cr-Commit-Position: refs/heads/main@{#38079} --- .../codecs/vp9/include/vp9_globals.h | 47 ----------- .../rtp_vp9_ref_finder_unittest.cc | 82 ------------------- 2 files changed, 129 deletions(-) diff --git a/modules/video_coding/codecs/vp9/include/vp9_globals.h b/modules/video_coding/codecs/vp9/include/vp9_globals.h index e6f644ec11..f67215ec77 100644 --- a/modules/video_coding/codecs/vp9/include/vp9_globals.h +++ b/modules/video_coding/codecs/vp9/include/vp9_globals.h @@ -37,7 +37,6 @@ enum TemporalStructureMode { kTemporalStructureMode1, // 1 temporal layer structure - i.e., IPPP... kTemporalStructureMode2, // 2 temporal layers 01... kTemporalStructureMode3, // 3 temporal layers 0212... - kTemporalStructureMode4 // 3 temporal layers 02120212... }; struct GofInfoVP9 { @@ -84,52 +83,6 @@ struct GofInfoVP9 { num_ref_pics[3] = 1; pid_diff[3][0] = 1; break; - case kTemporalStructureMode4: - num_frames_in_gof = 8; - temporal_idx[0] = 0; - temporal_up_switch[0] = true; - num_ref_pics[0] = 1; - pid_diff[0][0] = 4; - - temporal_idx[1] = 2; - temporal_up_switch[1] = true; - num_ref_pics[1] = 1; - pid_diff[1][0] = 1; - - temporal_idx[2] = 1; - temporal_up_switch[2] = false; - num_ref_pics[2] = 1; - pid_diff[2][0] = 2; - - temporal_idx[3] = 2; - temporal_up_switch[3] = true; - num_ref_pics[3] = 2; - pid_diff[3][0] = 1; - pid_diff[3][1] = 2; - - temporal_idx[4] = 0; - temporal_up_switch[4] = false; - num_ref_pics[4] = 1; - pid_diff[4][0] = 4; - - temporal_idx[5] = 2; - temporal_up_switch[5] = true; - num_ref_pics[5] = 2; - pid_diff[5][0] = 1; - pid_diff[5][1] = 2; - - temporal_idx[6] = 1; - temporal_up_switch[6] = false; - num_ref_pics[6] = 2; - pid_diff[6][0] = 2; - pid_diff[6][1] = 4; - - temporal_idx[7] = 2; - temporal_up_switch[7] = true; - num_ref_pics[7] = 2; - pid_diff[7][0] = 1; - pid_diff[7][1] = 2; - break; default: RTC_DCHECK_NOTREACHED(); } diff --git a/modules/video_coding/rtp_vp9_ref_finder_unittest.cc b/modules/video_coding/rtp_vp9_ref_finder_unittest.cc index 66b284f020..51fae50902 100644 --- a/modules/video_coding/rtp_vp9_ref_finder_unittest.cc +++ b/modules/video_coding/rtp_vp9_ref_finder_unittest.cc @@ -464,88 +464,6 @@ TEST_F(RtpVp9RefFinderTest, GofTemporalLayersReordered_0212) { EXPECT_THAT(frames_, HasFrameWithIdAndRefs(55, {50})); } -TEST_F(RtpVp9RefFinderTest, GofTemporalLayersUpSwitch_02120212) { - GofInfoVP9 ss; - ss.SetGofInfoVP9(kTemporalStructureMode4); // 02120212 pattern - - Insert(Frame().Pid(0).SidAndTid(0, 0).Tl0(0).AsKeyFrame().NotAsInterPic().Gof( - &ss)); - Insert(Frame().Pid(1).SidAndTid(0, 2).Tl0(0)); - Insert(Frame().Pid(2).SidAndTid(0, 1).Tl0(0)); - Insert(Frame().Pid(3).SidAndTid(0, 2).Tl0(0)); - Insert(Frame().Pid(4).SidAndTid(0, 0).Tl0(1)); - Insert(Frame().Pid(5).SidAndTid(0, 2).Tl0(1)); - Insert(Frame().Pid(6).SidAndTid(0, 1).Tl0(1).AsUpswitch()); - Insert(Frame().Pid(7).SidAndTid(0, 2).Tl0(1)); - Insert(Frame().Pid(8).SidAndTid(0, 0).Tl0(2).AsUpswitch()); - Insert(Frame().Pid(9).SidAndTid(0, 2).Tl0(2)); - Insert(Frame().Pid(10).SidAndTid(0, 1).Tl0(2)); - Insert(Frame().Pid(11).SidAndTid(0, 2).Tl0(2).AsUpswitch()); - Insert(Frame().Pid(12).SidAndTid(0, 0).Tl0(3)); - Insert(Frame().Pid(13).SidAndTid(0, 2).Tl0(3)); - Insert(Frame().Pid(14).SidAndTid(0, 1).Tl0(3)); - Insert(Frame().Pid(15).SidAndTid(0, 2).Tl0(3)); - - ASSERT_EQ(16UL, frames_.size()); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(0, {})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(5, {0})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(10, {0})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(15, {5, 10})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(20, {0})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(25, {15, 20})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(30, {10, 20})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(35, {30})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(40, {20})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(45, {40})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(50, {40})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(55, {45, 50})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(60, {40})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(65, {55, 60})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(70, {50, 60})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(75, {65, 70})); -} - -TEST_F(RtpVp9RefFinderTest, GofTemporalLayersUpSwitchReordered_02120212) { - GofInfoVP9 ss; - ss.SetGofInfoVP9(kTemporalStructureMode4); // 02120212 pattern - - Insert(Frame().Pid(1).SidAndTid(0, 2).Tl0(0)); - Insert(Frame().Pid(0).SidAndTid(0, 0).Tl0(0).AsKeyFrame().NotAsInterPic().Gof( - &ss)); - Insert(Frame().Pid(4).SidAndTid(0, 0).Tl0(1)); - Insert(Frame().Pid(2).SidAndTid(0, 1).Tl0(0)); - Insert(Frame().Pid(5).SidAndTid(0, 2).Tl0(1)); - Insert(Frame().Pid(3).SidAndTid(0, 2).Tl0(0)); - Insert(Frame().Pid(7).SidAndTid(0, 2).Tl0(1)); - Insert(Frame().Pid(9).SidAndTid(0, 2).Tl0(2)); - Insert(Frame().Pid(6).SidAndTid(0, 1).Tl0(1).AsUpswitch()); - Insert(Frame().Pid(12).SidAndTid(0, 0).Tl0(3)); - Insert(Frame().Pid(10).SidAndTid(0, 1).Tl0(2)); - Insert(Frame().Pid(8).SidAndTid(0, 0).Tl0(2).AsUpswitch()); - Insert(Frame().Pid(11).SidAndTid(0, 2).Tl0(2).AsUpswitch()); - Insert(Frame().Pid(13).SidAndTid(0, 2).Tl0(3)); - Insert(Frame().Pid(15).SidAndTid(0, 2).Tl0(3)); - Insert(Frame().Pid(14).SidAndTid(0, 1).Tl0(3)); - - ASSERT_EQ(16UL, frames_.size()); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(0, {})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(5, {0})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(10, {0})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(15, {5, 10})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(20, {0})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(25, {15, 20})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(30, {10, 20})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(35, {30})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(40, {20})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(45, {40})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(50, {40})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(55, {45, 50})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(60, {40})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(65, {55, 60})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(70, {50, 60})); - EXPECT_THAT(frames_, HasFrameWithIdAndRefs(75, {65, 70})); -} - TEST_F(RtpVp9RefFinderTest, GofTemporalLayersReordered_01_0212) { GofInfoVP9 ss; ss.SetGofInfoVP9(kTemporalStructureMode2); // 01 pattern