generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vp8: Compute skinmap only once before encoding.

Browse Source 
Get ready for other uses (i.e. cyclic refresh).
Then use it when needed.

Change-Id: Id0519a9921045e5fb7f3badb54e9f04e903f28f9
This commit is contained in:
Jerome Jiang 2017-06-21 15:02:31 -07:00
parent a36017e007
commit b28fc490aa
3 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
vp8/encoder/onyx_if.c
View File

@ -620,6 +620,37 @@ static void cyclic_background_refresh(VP8_COMP *cpi, int Q, int lf_adjustment) {
set_segment_data(cpi, &feature_data[0][0], SEGMENT_DELTADATA);
}
static void compute_skin_map(VP8_COMP *cpi) {
int mb_row, mb_col, num_bl;
VP8_COMMON *cm = &cpi->common;
const uint8_t *src_y = cpi->Source->y_buffer;
const uint8_t *src_u = cpi->Source->u_buffer;
const uint8_t *src_v = cpi->Source->v_buffer;
const int src_ystride = cpi->Source->y_stride;
const int src_uvstride = cpi->Source->uv_stride;
const SKIN_DETECTION_BLOCK_SIZE bsize =
(cm->Width * cm->Height <= 352 * 288) ? SKIN_8X8 : SKIN_16X16;
int offset = 0;
for (mb_row = 0; mb_row < cm->mb_rows; mb_row++) {
num_bl = 0;
for (mb_col = 0; mb_col < cm->mb_cols; mb_col++) {
const int bl_index = mb_row * cm->mb_cols + mb_col;
cpi->skin_map[offset] =
vp8_compute_skin_block(src_y, src_u, src_v, src_ystride, src_uvstride,
bsize, cpi->consec_zero_last[bl_index], 0);
num_bl++;
offset++;
src_y += 16;
src_u += 8;
src_v += 8;
}
src_y += (src_ystride << 4) - (num_bl << 4);
src_u += (src_uvstride << 3) - (num_bl << 3);
src_v += (src_uvstride << 3) - (num_bl << 3);
}
}
static void set_default_lf_deltas(VP8_COMP *cpi) {
cpi->mb.e_mbd.mode_ref_lf_delta_enabled = 1;
cpi->mb.e_mbd.mode_ref_lf_delta_update = 1;
@ -1861,6 +1892,9 @@ struct VP8_COMP *vp8_create_compressor(VP8_CONFIG *oxcf) {
cpi->cyclic_refresh_map = (signed char *)NULL;
}
CHECK_MEM_ERROR(cpi->skin_map, vpx_calloc(cm->mb_rows * cm->mb_cols,
sizeof(cpi->skin_map[0])));
CHECK_MEM_ERROR(cpi->consec_zero_last,
vpx_calloc(cm->mb_rows * cm->mb_cols, 1));
CHECK_MEM_ERROR(cpi->consec_zero_last_mvbias,
@ -2291,6 +2325,7 @@ void vp8_remove_compressor(VP8_COMP **ptr) {
dealloc_compressor_data(cpi);
vpx_free(cpi->mb.ss);
vpx_free(cpi->tok);
vpx_free(cpi->skin_map);
vpx_free(cpi->cyclic_refresh_map);
vpx_free(cpi->consec_zero_last);
vpx_free(cpi->consec_zero_last_mvbias);
@ -3770,6 +3805,8 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, size_t *size,
}
#endif
compute_skin_map(cpi);
/* Setup background Q adjustment for error resilient mode.
* For multi-layer encodes only enable this for the base layer.
*/

2
vp8/encoder/onyx_int.h
View File

@ -471,6 +471,8 @@ typedef struct VP8_COMP {
int zeromv_count;
int lf_zeromv_pct;
unsigned char *skin_map;
unsigned char *segmentation_map;
signed char segment_feature_data[MB_LVL_MAX][MAX_MB_SEGMENTS];
int segment_encode_breakout[MAX_MB_SEGMENTS];

4
vp8/encoder/pickinter.c
View File

@ -691,9 +691,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
x->is_skin = 0;
if (!cpi->oxcf.screen_content_mode) {
int block_index = mb_row * cpi->common.mb_cols + mb_col;
x->is_skin = vp8_compute_skin_block(
x->src.y_buffer, x->src.u_buffer, x->src.v_buffer, x->src.y_stride,
x->src.uv_stride, SKIN_16X16, cpi->consec_zero_last[block_index], 0);
x->is_skin = cpi->skin_map[block_index];
}
#if CONFIG_TEMPORAL_DENOISING
if (cpi->oxcf.noise_sensitivity) {