Commit 1c24eb2b authored by Yaowu Xu's avatar Yaowu Xu

fixed a number of problems caused by auto merges

The auto merge process pull and merge commits from public git or master
branch. These automerges while worked well most time, but has created
a few problems. This commit fixed several issues existed long before
the latest 8x8 transform commit.

Change-Id: I895ca99713231b1aec521d57db5d9839f74aacfa
parent 08f64718
...@@ -528,7 +528,6 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign ...@@ -528,7 +528,6 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign
vp8_recon_write_yuv_frame("recon.yuv", cm->frame_to_show); vp8_recon_write_yuv_frame("recon.yuv", cm->frame_to_show);
#endif #endif
vp8_clear_system_state(); vp8_clear_system_state();
#if CONFIG_ERROR_CONCEALMENT #if CONFIG_ERROR_CONCEALMENT
......
...@@ -97,8 +97,9 @@ typedef struct VP8Decompressor ...@@ -97,8 +97,9 @@ typedef struct VP8Decompressor
const unsigned char *partitions[MAX_PARTITIONS]; const unsigned char *partitions[MAX_PARTITIONS];
unsigned int partition_sizes[MAX_PARTITIONS]; unsigned int partition_sizes[MAX_PARTITIONS];
unsigned int num_partitions; unsigned int num_partitions;
#if CONFIG_SEGMENTATION
unsigned char *segmentation_map; unsigned char *segmentation_map;
#endif
#if CONFIG_MULTITHREAD #if CONFIG_MULTITHREAD
/* variable for threading */ /* variable for threading */
......
...@@ -870,8 +870,10 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) ...@@ -870,8 +870,10 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
VP8_COMMON *const pc = & cpi->common; VP8_COMMON *const pc = & cpi->common;
vp8_writer *const w = & cpi->bc; vp8_writer *const w = & cpi->bc;
const MV_CONTEXT *mvc = pc->fc.mvc; const MV_CONTEXT *mvc = pc->fc.mvc;
MACROBLOCKD *xd = &cpi->mb.e_mbd;
#if CONFIG_SEGMENTATION #if CONFIG_SEGMENTATION
MACROBLOCKD *xd = &cpi->mb.e_mbd;
int left_id, above_id;
int i;
int sum; int sum;
int index = 0; int index = 0;
#endif #endif
...@@ -952,8 +954,10 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) ...@@ -952,8 +954,10 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
xd->mb_to_right_edge = ((pc->mb_cols - 1 - mb_col) * 16) << 3; xd->mb_to_right_edge = ((pc->mb_cols - 1 - mb_col) * 16) << 3;
xd->mb_to_top_edge = -((mb_row * 16)) << 3; xd->mb_to_top_edge = -((mb_row * 16)) << 3;
xd->mb_to_bottom_edge = ((pc->mb_rows - 1 - mb_row) * 16) << 3; xd->mb_to_bottom_edge = ((pc->mb_rows - 1 - mb_row) * 16) << 3;
#if CONFIG_SEGMENTATION
xd->up_available = (mb_row != 0); xd->up_available = (mb_row != 0);
xd->left_available = (mb_col != 0); xd->left_available = (mb_col != 0);
#endif
#ifdef ENTROPY_STATS #ifdef ENTROPY_STATS
active_section = 9; active_section = 9;
#endif #endif
...@@ -1824,9 +1828,9 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) ...@@ -1824,9 +1828,9 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
} }
else else
vp8_start_encode(bc, cx_data); vp8_start_encode(bc, cx_data);
#if CONFIG_SEGMENTATION
xd->update_mb_segmentation_map = 1; xd->update_mb_segmentation_map = 1;
#endif
// Signal whether or not Segmentation is enabled // Signal whether or not Segmentation is enabled
vp8_write_bit(bc, (xd->segmentation_enabled) ? 1 : 0); vp8_write_bit(bc, (xd->segmentation_enabled) ? 1 : 0);
......
...@@ -742,13 +742,12 @@ void encode_mb_row(VP8_COMP *cpi, ...@@ -742,13 +742,12 @@ void encode_mb_row(VP8_COMP *cpi,
// Increment the activity mask pointers. // Increment the activity mask pointers.
x->mb_activity_ptr++; x->mb_activity_ptr++;
/* Test code #if CONFIG_SEGMENTATION
if ((xd->mode_info_context->mbmi.mode == ZEROMV) && (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME)) if ((xd->mode_info_context->mbmi.mode == ZEROMV) && (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME))
xd->mode_info_context->mbmi.segment_id = 0; xd->mode_info_context->mbmi.segment_id = 0;
else else
xd->mode_info_context->mbmi.segment_id = 1; xd->mode_info_context->mbmi.segment_id = 1;
*/ #endif
/* save the block info */ /* save the block info */
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
xd->mode_info_context->bmi[i] = xd->block[i].bmi; xd->mode_info_context->bmi[i] = xd->block[i].bmi;
...@@ -988,6 +987,7 @@ void vp8_encode_frame(VP8_COMP *cpi) ...@@ -988,6 +987,7 @@ void vp8_encode_frame(VP8_COMP *cpi)
vp8cx_frame_init_quantizer(cpi); vp8cx_frame_init_quantizer(cpi);
vp8_initialize_rd_consts(cpi, cm->base_qindex + cm->y1dc_delta_q);
vp8cx_initialize_me_consts(cpi, cm->base_qindex); vp8cx_initialize_me_consts(cpi, cm->base_qindex);
if(cpi->oxcf.tuning == VP8_TUNE_SSIM) if(cpi->oxcf.tuning == VP8_TUNE_SSIM)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment