From bed540a90c6cc1a5268e583d6ca9ef5eeb543c3e Mon Sep 17 00:00:00 2001 From: "marpan@webrtc.org" Date: Thu, 20 Sep 2012 21:47:11 +0000 Subject: [PATCH] Udpate to TL=2 pattern: update golden at base of cycle, and use alt ref as reference. Review URL: https://webrtc-codereview.appspot.com/820005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2796 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../codecs/vp8/temporal_layers.cc | 16 ++++----- .../codecs/vp8/temporal_layers_unittest.cc | 34 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/modules/video_coding/codecs/vp8/temporal_layers.cc b/src/modules/video_coding/codecs/vp8/temporal_layers.cc index fb6accfae3..b840840801 100644 --- a/src/modules/video_coding/codecs/vp8/temporal_layers.cc +++ b/src/modules/video_coding/codecs/vp8/temporal_layers.cc @@ -57,14 +57,14 @@ bool TemporalLayers::ConfigureBitrates(int bitrateKbit, temporal_ids_, sizeof(unsigned int) * temporal_ids_length_); temporal_pattern_length_ = 8; - temporal_pattern_[0] = kTemporalUpdateLast; - temporal_pattern_[1] = kTemporalUpdateGoldenWithoutDependency; - temporal_pattern_[2] = kTemporalUpdateLast; - temporal_pattern_[3] = kTemporalUpdateGolden; - temporal_pattern_[4] = kTemporalUpdateLast; - temporal_pattern_[5] = kTemporalUpdateGolden; - temporal_pattern_[6] = kTemporalUpdateLast; - temporal_pattern_[7] = kTemporalUpdateNoneNoRefAltref; + temporal_pattern_[0] = kTemporalUpdateLastAndGoldenRefAltRef; + temporal_pattern_[1] = kTemporalUpdateGoldenWithoutDependencyRefAltRef; + temporal_pattern_[2] = kTemporalUpdateLastRefAltRef; + temporal_pattern_[3] = kTemporalUpdateGoldenRefAltRef; + temporal_pattern_[4] = kTemporalUpdateLastRefAltRef; + temporal_pattern_[5] = kTemporalUpdateGoldenRefAltRef; + temporal_pattern_[6] = kTemporalUpdateLastRefAltRef; + temporal_pattern_[7] = kTemporalUpdateNone; break; case 3: temporal_ids_length_ = 4; diff --git a/src/modules/video_coding/codecs/vp8/temporal_layers_unittest.cc b/src/modules/video_coding/codecs/vp8/temporal_layers_unittest.cc index 4003d242a1..153a3a21f1 100644 --- a/src/modules/video_coding/codecs/vp8/temporal_layers_unittest.cc +++ b/src/modules/video_coding/codecs/vp8/temporal_layers_unittest.cc @@ -68,23 +68,23 @@ TEST(TemporalLayersTest, 2Layers) { CodecSpecificInfoVP8 vp8_info; tl.ConfigureBitrates(500, &cfg); - int expected_flags[16] = { kTemporalUpdateLast, - kTemporalUpdateGoldenWithoutDependency, - kTemporalUpdateLast, - kTemporalUpdateGolden, - kTemporalUpdateLast, - kTemporalUpdateGolden, - kTemporalUpdateLast, - kTemporalUpdateNoneNoRefAltRef, - kTemporalUpdateLast, - kTemporalUpdateGoldenWithoutDependency, - kTemporalUpdateLast, - kTemporalUpdateGolden, - kTemporalUpdateLast, - kTemporalUpdateGolden, - kTemporalUpdateLast, - kTemporalUpdateNoneNoRefAltRef - }; + int expected_flags[16] = { kTemporalUpdateLastAndGoldenRefAltRef, + kTemporalUpdateGoldenWithoutDependencyRefAltRef, + kTemporalUpdateLastRefAltRef, + kTemporalUpdateGoldenRefAltRef, + kTemporalUpdateLastRefAltRef, + kTemporalUpdateGoldenRefAltRef, + kTemporalUpdateLastRefAltRef, + kTemporalUpdateNone, + kTemporalUpdateLastAndGoldenRefAltRef, + kTemporalUpdateGoldenWithoutDependencyRefAltRef, + kTemporalUpdateLastRefAltRef, + kTemporalUpdateGoldenRefAltRef, + kTemporalUpdateLastRefAltRef, + kTemporalUpdateGoldenRefAltRef, + kTemporalUpdateLastRefAltRef, + kTemporalUpdateNone, + }; int expected_temporal_idx[16] = { 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1 };