From 8c5d24266ef0e89a1cea5077d71da2949bcc543e Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Wed, 21 Dec 2011 08:56:04 +0000 Subject: [PATCH] Fix VP8 layer 2 sync dependencies. BUG= TEST= Review URL: http://webrtc-codereview.appspot.com/333010 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1259 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_coding/codecs/vp8/main/source/temporal_layers.cc | 5 +++-- .../codecs/vp8/main/source/temporal_layers_unittest.cc | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/video_coding/codecs/vp8/main/source/temporal_layers.cc b/src/modules/video_coding/codecs/vp8/main/source/temporal_layers.cc index 0b52a81cb..28c270d55 100644 --- a/src/modules/video_coding/codecs/vp8/main/source/temporal_layers.cc +++ b/src/modules/video_coding/codecs/vp8/main/source/temporal_layers.cc @@ -161,7 +161,7 @@ int TemporalLayers::EncodeFlags() { break; case kTemporalUpdateGoldenWithoutDependency: flags |= VP8_EFLAG_NO_REF_GF; - // Deliberetely no break here. + // Deliberately no break here. case kTemporalUpdateGolden: flags |= VP8_EFLAG_NO_REF_ARF; flags |= VP8_EFLAG_NO_UPD_ARF; @@ -169,7 +169,8 @@ int TemporalLayers::EncodeFlags() { break; case kTemporalUpdateAltrefWithoutDependency: flags |= VP8_EFLAG_NO_REF_ARF; - // Deliberetely no break here. + flags |= VP8_EFLAG_NO_REF_GF; + // Deliberately no break here. case kTemporalUpdateAltref: flags |= VP8_EFLAG_NO_UPD_GF; flags |= VP8_EFLAG_NO_UPD_LAST; diff --git a/src/modules/video_coding/codecs/vp8/main/source/temporal_layers_unittest.cc b/src/modules/video_coding/codecs/vp8/main/source/temporal_layers_unittest.cc index 51f33c33e..69f35a5f6 100644 --- a/src/modules/video_coding/codecs/vp8/main/source/temporal_layers_unittest.cc +++ b/src/modules/video_coding/codecs/vp8/main/source/temporal_layers_unittest.cc @@ -31,6 +31,7 @@ enum { VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST, kTemporalUpdateAltrefWithoutDependency = VP8_EFLAG_NO_REF_ARF | + VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_LAST, kTemporalUpdateAltref = VP8_EFLAG_NO_UPD_GF |