From bba710fcbd1d815f65e8effb135cd5afe6330824 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Thu, 17 Nov 2011 18:31:00 -0800 Subject: added transform type to MB_MODE_INFO this commit is to add an variable in the macroblock level mode info structure to track the transform size used in each MB, so the information can be used later in the loop filter to change how loop filter works on MBs with different transform sizes. Change-Id: Id0eeaba6cc854c6d1be00ed8d237b3d9e250e447 --- vp8/encoder/onyx_if.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'vp8/encoder/onyx_if.c') diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 799a656eb..c9d91aeaf 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -476,18 +476,8 @@ static void init_seg_features(VP8_COMP *cpi) // Where relevant assume segment data is delta data xd->mb_segement_abs_delta = SEGMENT_DELTADATA; -#if CONFIG_T8X8 - // 8x8TX test code. - // This assignment does not necessarily make sense but is - // just to test the mechanism for now. - enable_segfeature(xd, 0, SEG_LVL_TRANSFORM); - set_segdata( xd, 0, SEG_LVL_TRANSFORM, TX_4X4 ); - enable_segfeature(xd, 1, SEG_LVL_TRANSFORM); - set_segdata( xd, 1, SEG_LVL_TRANSFORM, TX_8X8 ); -#endif } } - // All other frames if segmentation has been enabled else if ( xd->segmentation_enabled ) { @@ -586,6 +576,25 @@ static void init_seg_features(VP8_COMP *cpi) // No updeates.. leave things as they are. xd->update_mb_segmentation_map = 0; xd->update_mb_segmentation_data = 0; + +#if CONFIG_T8X8 + { + vp8_disable_segmentation((VP8_PTR)cpi); + clearall_segfeatures(xd); + vp8_enable_segmentation((VP8_PTR)cpi); + // 8x8TX test code. + // This assignment does not necessarily make sense but is + // just to test the mechanism for now. + enable_segfeature(xd, 0, SEG_LVL_TRANSFORM); + set_segdata( xd, 0, SEG_LVL_TRANSFORM, TX_4X4 ); + enable_segfeature(xd, 1, SEG_LVL_TRANSFORM); + set_segdata( xd, 1, SEG_LVL_TRANSFORM, TX_8X8 ); + /* force every mb to use 8x8 transform for testing*/ + vpx_memset(cpi->segmentation_map, 1, + cpi->common.mb_rows * cpi->common.mb_cols); + + } +#endif } } } -- cgit v1.2.3