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

diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index 346543ab35f2619e62eea994377cfe055ba36b07..37bf515eae70d96ac7c8889306564115b7df0e6f 100644 (file)
--- 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 309689d1b512cfd13e9f4f69e568bbe51d0d5b94..b3b0790ff1d94ef9b7dbaea524622eba7b941092 100644 (file)
--- 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 )