Commit e893af12 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review
Browse files

Merge "Bug fix: error-concealment enabled changed postproc output"

parents 1a0f5248 0c2919c3
...@@ -280,7 +280,7 @@ void vp8_multiframe_quality_enhance ...@@ -280,7 +280,7 @@ void vp8_multiframe_quality_enhance
FRAME_TYPE frame_type = cm->frame_type; FRAME_TYPE frame_type = cm->frame_type;
/* Point at base of Mb MODE_INFO list has motion vectors etc */ /* Point at base of Mb MODE_INFO list has motion vectors etc */
const MODE_INFO *mode_info_context = cm->mi; const MODE_INFO *mode_info_context = cm->show_frame_mi;
int mb_row; int mb_row;
int mb_col; int mb_col;
int totmap, map[4]; int totmap, map[4];
......
...@@ -127,7 +127,8 @@ typedef struct VP8Common ...@@ -127,7 +127,8 @@ typedef struct VP8Common
MODE_INFO *prev_mip; /* MODE_INFO array 'mip' from last decoded frame */ MODE_INFO *prev_mip; /* MODE_INFO array 'mip' from last decoded frame */
MODE_INFO *prev_mi; /* 'mi' from last frame (points into prev_mip) */ MODE_INFO *prev_mi; /* 'mi' from last frame (points into prev_mip) */
#endif #endif
MODE_INFO *show_frame_mi; /* MODE_INFO for the last decoded frame
to show */
LOOPFILTERTYPE filter_type; LOOPFILTERTYPE filter_type;
loop_filter_info_n lf_info; loop_filter_info_n lf_info;
......
...@@ -334,7 +334,7 @@ void vp8_deblock(VP8_COMMON *cm, ...@@ -334,7 +334,7 @@ void vp8_deblock(VP8_COMMON *cm,
double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
int ppl = (int)(level + .5); int ppl = (int)(level + .5);
const MODE_INFO *mode_info_context = cm->mi; const MODE_INFO *mode_info_context = cm->show_frame_mi;
int mbr, mbc; int mbr, mbc;
/* The pixel thresholds are adjusted according to if or not the macroblock /* The pixel thresholds are adjusted according to if or not the macroblock
......
...@@ -386,7 +386,13 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size, ...@@ -386,7 +386,13 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size,
vp8_clear_system_state(); vp8_clear_system_state();
#if CONFIG_ERROR_CONCEALMENT if (cm->show_frame)
{
cm->current_video_frame++;
cm->show_frame_mi = cm->mi;
}
#if CONFIG_ERROR_CONCEALMENT
/* swap the mode infos to storage for future error concealment */ /* swap the mode infos to storage for future error concealment */
if (pbi->ec_enabled && pbi->common.prev_mi) if (pbi->ec_enabled && pbi->common.prev_mi)
{ {
...@@ -408,9 +414,6 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size, ...@@ -408,9 +414,6 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size,
} }
#endif #endif
if (cm->show_frame)
cm->current_video_frame++;
pbi->ready_for_new_data = 0; pbi->ready_for_new_data = 0;
pbi->last_time_stamp = time_stamp; pbi->last_time_stamp = time_stamp;
......
...@@ -5362,6 +5362,7 @@ int vp8_get_preview_raw_frame(VP8_COMP *cpi, YV12_BUFFER_CONFIG *dest, vp8_ppfla ...@@ -5362,6 +5362,7 @@ int vp8_get_preview_raw_frame(VP8_COMP *cpi, YV12_BUFFER_CONFIG *dest, vp8_ppfla
#endif #endif
#if CONFIG_POSTPROC #if CONFIG_POSTPROC
cpi->common.show_frame_mi = cpi->common.mi;
ret = vp8_post_proc_frame(&cpi->common, dest, flags); ret = vp8_post_proc_frame(&cpi->common, dest, flags);
#else #else
......
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