From fd402e1374531ebdb4ddc59a16dd76c7ee07215e Mon Sep 17 00:00:00 2001
From: Marco Paniconi <marpan@google.com>
Date: Wed, 19 Feb 2014 17:13:38 -0800
Subject: [PATCH] Condition alt-ref entropy context setting on svc.
Avoid special context setting for alt-ref in svc mode.
Change-Id: I5337d0739abe16aab7854bcaa3c8537191c4b60c
---
vp9/encoder/vp9_onyx_if.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index cdb03c00c4..ddde48aa63 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -2808,7 +2808,7 @@ static void encode_without_recode_loop(VP9_COMP *cpi,
if (cm->frame_type == KEY_FRAME) {
vp9_setup_key_frame(cpi);
} else {
- if (!cm->intra_only && !cm->error_resilient_mode) {
+ if (!cm->intra_only && !cm->error_resilient_mode && !cpi->use_svc) {
cpi->common.frame_context_idx = cpi->refresh_alt_ref_frame;
}
vp9_setup_inter_frame(cpi);
@@ -2864,7 +2864,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi,
if (cm->frame_type == KEY_FRAME) {
vp9_setup_key_frame(cpi);
} else {
- if (!cm->intra_only && !cm->error_resilient_mode) {
+ if (!cm->intra_only && !cm->error_resilient_mode && !cpi->use_svc) {
cpi->common.frame_context_idx = cpi->refresh_alt_ref_frame;
}
vp9_setup_inter_frame(cpi);
--
GitLab