shithub: libvpx

Download patch

ref: a127c940c00a752c764889b9dcd9d83862a8d4f1
parent: 1a9fd54ecdbc5e9709960ca7cb6e9cbb9d6b6d72
author: Jim Bankoski <jimbankoski@google.com>
date: Thu Jan 26 05:04:34 EST 2012 

vpnext use segref segmentation filter

Goes through set of ref frames used by each macroblock and
sets seg_lvl_ref_frame flags accordingly..

http://www.corp.google.com/~jimbankoski/no_crawl/segref.html

Change-Id: Iab7f1effd75a839b34eb310d7168692c8f105411


--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -1992,7 +1992,31 @@
 
 }
 #endif
+static segment_reference_frames(VP8_COMP *cpi)
+{
+    VP8_COMMON *oci = &cpi->common;
+    MODE_INFO *mi = oci->mi;
+    int ref[MAX_MB_SEGMENTS]={0};
+    int i,j;
+    int mb_index=0;
+    MACROBLOCKD *const xd = & cpi->mb.e_mbd;
 
+    for (i = 0; i < oci->mb_rows; i++)
+    {
+        for (j = 0; j < oci->mb_cols; j++, mb_index++)
+        {
+            ref[mi[mb_index].mbmi.segment_id]|=(1<<mi[mb_index].mbmi.ref_frame);
+        }
+        mb_index++;
+    }
+    for (i = 0; i < MAX_MB_SEGMENTS; i++)
+    {
+        enable_segfeature(xd,i,SEG_LVL_REF_FRAME);
+        set_segdata( xd,i, SEG_LVL_REF_FRAME, ref[i]);
+    }
+
+
+}
 void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
 {
     int i, j;
@@ -2065,6 +2089,8 @@
             vp8_write_bit(bc, (xd->temporal_update) ? 1:0);
 
         vp8_write_bit(bc, (xd->update_mb_segmentation_data) ? 1 : 0);
+
+        segment_reference_frames(cpi);
 
         if (xd->update_mb_segmentation_data)
         {
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -541,6 +541,20 @@
     // All other frames if segmentation has been enabled
     else if ( xd->segmentation_enabled )
     {
+        int i;
+
+        // clears prior frame seg lev refs
+        for (i = 0; i < MAX_MB_SEGMENTS; i++)
+        {
+            // only do it if the force drop the background stuff is off
+            if(!segfeature_active(xd, i, SEG_LVL_MODE))
+            {
+                disable_segfeature(xd,i,SEG_LVL_REF_FRAME);
+                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 )
         {