From 92ffb17cc1478d19e8d7ed5f676b962d8f59e4fa Mon Sep 17 00:00:00 2001
From: Paul Wilkins <paulwilkins@google.com>
Date: Tue, 31 Jan 2012 13:09:49 +0000
Subject: [PATCH] Comment out segref segmentation filter changes.
Commented out changes from earlier checking:
"Change Iab7f1eff: vpnext use segref segmentation filter"
Which in its current state breaks the decoder.
Change-Id: I9185098aeda8ce65310f338c4c9375f4a39005d3
---
vp8/encoder/bitstream.c | 2 +-
vp8/encoder/onyx_if.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index 346543ab35..37bf515eae 100644
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -2141,7 +2141,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
vp8_write_bit(bc, (xd->update_mb_segmentation_data) ? 1 : 0);
- segment_reference_frames(cpi);
+ //segment_reference_frames(cpi);
if (xd->update_mb_segmentation_data)
{
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 309689d1b5..b3b0790ff1 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -541,6 +541,7 @@ static void init_seg_features(VP8_COMP *cpi)
// All other frames if segmentation has been enabled
else if ( xd->segmentation_enabled )
{
+/*
int i;
// clears prior frame seg lev refs
@@ -553,7 +554,7 @@ static void init_seg_features(VP8_COMP *cpi)
set_segdata( xd,i, SEG_LVL_REF_FRAME, 0xffffff);
}
}
-
+*/
// First normal frame in a valid gf or alt ref group
if ( cpi->common.frames_since_golden == 0 )
--
GitLab