diff options
| -rwxr-xr-x | build/make/configure.sh | 6 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | vp8/decoder/decodemv.c | 652 | ||||
| -rw-r--r-- | vp8/decoder/decodframe.c | 22 | ||||
| -rw-r--r-- | vp8/decoder/demode.c | 149 | ||||
| -rw-r--r-- | vp8/decoder/demode.h | 33 | ||||
| -rw-r--r-- | vp8/decoder/onyxd_int.h | 6 | ||||
| -rw-r--r-- | vp8/encoder/firstpass.c | 1 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 4 | ||||
| -rw-r--r-- | vp8/vp8dx.mk | 2 |
10 files changed, 416 insertions, 463 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 73cb60085..e9f8a2b9c 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -495,7 +495,7 @@ setup_gnu_toolchain() { process_common_toolchain() { if [ -z "$toolchain" ]; then - gcctarget="$(gcc -dumpmachine 2> /dev/null)" + gcctarget="$(gcc -dumpmachine 2> /dev/null)" # detect tgt_isa case "$gcctarget" in @@ -902,8 +902,8 @@ EOF # glibc needs these if enabled linux; then - add_cflags -D_LARGEFILE_SOURCE - add_cflags -D_FILE_OFFSET_BITS=64 + add_cflags -D_LARGEFILE_SOURCE + add_cflags -D_FILE_OFFSET_BITS=64 fi } @@ -412,7 +412,7 @@ process_detect() { # Can only build shared libs on a subset of platforms. Doing this check # here rather than at option parse time because the target auto-detect # magic happens after the command line has been parsed. - enabled linux || die "--enable-shared only supported on ELF for now" + enabled linux || die "--enable-shared only supported on ELF for now" fi if [ -z "$CC" ]; then echo "Bypassing toolchain for environment detection." @@ -514,7 +514,7 @@ process_toolchain() { enabled gcc || soft_disable ccache if enabled mips; then enable dequant_tokens - enable dc_recon + enable dc_recon fi # Enable the postbuild target if building for visual studio. diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c index da68ee688..e9281f7ae 100644..100755 --- a/vp8/decoder/decodemv.c +++ b/vp8/decoder/decodemv.c @@ -14,10 +14,126 @@ #include "entropymode.h" #include "onyxd_int.h" #include "findnearmv.h" -#include "demode.h" + #if CONFIG_DEBUG #include <assert.h> #endif +static int vp8_read_bmode(vp8_reader *bc, const vp8_prob *p) +{ + const int i = vp8_treed_read(bc, vp8_bmode_tree, p); + + return i; +} + + +static int vp8_read_ymode(vp8_reader *bc, const vp8_prob *p) +{ + const int i = vp8_treed_read(bc, vp8_ymode_tree, p); + + return i; +} + +static int vp8_kfread_ymode(vp8_reader *bc, const vp8_prob *p) +{ + const int i = vp8_treed_read(bc, vp8_kf_ymode_tree, p); + + return i; +} + + + +static int vp8_read_uv_mode(vp8_reader *bc, const vp8_prob *p) +{ + const int i = vp8_treed_read(bc, vp8_uv_mode_tree, p); + + return i; +} + +static void vp8_read_mb_features(vp8_reader *r, MB_MODE_INFO *mi, MACROBLOCKD *x) +{ + // Is segmentation enabled + if (x->segmentation_enabled && x->update_mb_segmentation_map) + { + // If so then read the segment id. + if (vp8_read(r, x->mb_segment_tree_probs[0])) + mi->segment_id = (unsigned char)(2 + vp8_read(r, x->mb_segment_tree_probs[2])); + else + mi->segment_id = (unsigned char)(vp8_read(r, x->mb_segment_tree_probs[1])); + } +} + +static void vp8_kfread_modes(VP8D_COMP *pbi, MODE_INFO *m, int mb_row, int mb_col) +{ + vp8_reader *const bc = & pbi->bc; + const int mis = pbi->common.mode_info_stride; + + { + MB_PREDICTION_MODE y_mode; + + // Read the Macroblock segmentation map if it is being updated explicitly this frame (reset to 0 above by default) + // By default on a key frame reset all MBs to segment 0 + m->mbmi.segment_id = 0; + + if (pbi->mb.update_mb_segmentation_map) + vp8_read_mb_features(bc, &m->mbmi, &pbi->mb); + + // Read the macroblock coeff skip flag if this feature is in use, else default to 0 + if (pbi->common.mb_no_coeff_skip) + m->mbmi.mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false); + else + m->mbmi.mb_skip_coeff = 0; + + y_mode = (MB_PREDICTION_MODE) vp8_kfread_ymode(bc, pbi->common.kf_ymode_prob); + + m->mbmi.ref_frame = INTRA_FRAME; + + if ((m->mbmi.mode = y_mode) == B_PRED) + { + int i = 0; + + do + { + const B_PREDICTION_MODE A = vp8_above_bmi(m, i, mis)->mode; + const B_PREDICTION_MODE L = vp8_left_bmi(m, i)->mode; + + m->bmi[i].mode = (B_PREDICTION_MODE) vp8_read_bmode(bc, pbi->common.kf_bmode_prob [A] [L]); + } + while (++i < 16); + } + else + { + int BMode; + int i = 0; + + switch (y_mode) + { + case DC_PRED: + BMode = B_DC_PRED; + break; + case V_PRED: + BMode = B_VE_PRED; + break; + case H_PRED: + BMode = B_HE_PRED; + break; + case TM_PRED: + BMode = B_TM_PRED; + break; + default: + BMode = B_DC_PRED; + break; + } + + do + { + m->bmi[i].mode = (B_PREDICTION_MODE)BMode; + } + while (++i < 16); + } + + m->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, pbi->common.kf_uv_mode_prob); + } +} static int read_mvcomponent(vp8_reader *r, const MV_CONTEXT *mvc) { @@ -99,6 +215,8 @@ static MB_PREDICTION_MODE sub_mv_ref(vp8_reader *bc, const vp8_prob *p) return (MB_PREDICTION_MODE)i; } + +#ifdef VPX_MODE_COUNT unsigned int vp8_mv_cont_count[5][4] = { { 0, 0, 0, 0 }, @@ -107,310 +225,327 @@ unsigned int vp8_mv_cont_count[5][4] = { 0, 0, 0, 0 }, { 0, 0, 0, 0 } }; +#endif -void vp8_decode_mode_mvs(VP8D_COMP *pbi) -{ - const MV Zero = { 0, 0}; +unsigned char vp8_mbsplit_offset[4][16] = { + { 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 0, 2, 8, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15} +}; - VP8_COMMON *const pc = & pbi->common; - vp8_reader *const bc = & pbi->bc; +unsigned char vp8_mbsplit_fill_count[4] = {8, 8, 4, 1}; +unsigned char vp8_mbsplit_fill_offset[4][16] = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, + { 0, 1, 4, 5, 8, 9, 12, 13, 2, 3, 6, 7, 10, 11, 14, 15}, + { 0, 1, 4, 5, 2, 3, 6, 7, 8, 9, 12, 13, 10, 11, 14, 15}, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15} +}; - MODE_INFO *mi = pc->mi, *ms; - const int mis = pc->mode_info_stride; - MV_CONTEXT *const mvc = pc->fc.mvc; - int mb_row = -1; - vp8_prob prob_intra; - vp8_prob prob_last; - vp8_prob prob_gf; - vp8_prob prob_skip_false = 0; +void vp8_mb_mode_mv_init(VP8D_COMP *pbi) +{ + vp8_reader *const bc = & pbi->bc; + MV_CONTEXT *const mvc = pbi->common.fc.mvc; - if (pc->mb_no_coeff_skip) - prob_skip_false = (vp8_prob)vp8_read_literal(bc, 8); + pbi->prob_skip_false = 0; + if (pbi->common.mb_no_coeff_skip) + pbi->prob_skip_false = (vp8_prob)vp8_read_literal(bc, 8); - prob_intra = (vp8_prob)vp8_read_literal(bc, 8); - prob_last = (vp8_prob)vp8_read_literal(bc, 8); - prob_gf = (vp8_prob)vp8_read_literal(bc, 8); + if(pbi->common.frame_type != KEY_FRAME) + { + pbi->prob_intra = (vp8_prob)vp8_read_literal(bc, 8); + pbi->prob_last = (vp8_prob)vp8_read_literal(bc, 8); + pbi->prob_gf = (vp8_prob)vp8_read_literal(bc, 8); - ms = pc->mi - 1; + if (vp8_read_bit(bc)) + { + int i = 0; - if (vp8_read_bit(bc)) - { - int i = 0; + do + { + pbi->common.fc.ymode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8); + } + while (++i < 4); + } - do + if (vp8_read_bit(bc)) { - pc->fc.ymode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8); + int i = 0; + + do + { + pbi->common.fc.uv_mode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8); + } + while (++i < 3); } - while (++i < 4); + + read_mvcontexts(bc, mvc); } +} - if (vp8_read_bit(bc)) +void vp8_read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, + int mb_row, int mb_col) +{ + const MV Zero = { 0, 0}; + vp8_reader *const bc = & pbi->bc; + MV_CONTEXT *const mvc = pbi->common.fc.mvc; + const int mis = pbi->common.mode_info_stride; + + MV *const mv = & mbmi->mv.as_mv; + int mb_to_left_edge; + int mb_to_right_edge; + int mb_to_top_edge; + int mb_to_bottom_edge; + + mb_to_top_edge = pbi->mb.mb_to_top_edge; + mb_to_bottom_edge = pbi->mb.mb_to_bottom_edge; + mb_to_top_edge -= LEFT_TOP_MARGIN; + mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN; + + mbmi->need_to_clamp_mvs = 0; + // Distance of Mb to the various image edges. + // These specified to 8th pel as they are always compared to MV values that are in 1/8th pel units + pbi->mb.mb_to_left_edge = + mb_to_left_edge = -((mb_col * 16) << 3); + mb_to_left_edge -= LEFT_TOP_MARGIN; + + pbi->mb.mb_to_right_edge = + mb_to_right_edge = ((pbi->common.mb_cols - 1 - mb_col) * 16) << 3; + mb_to_right_edge += RIGHT_BOTTOM_MARGIN; + + // If required read in new segmentation data for this MB + if (pbi->mb.update_mb_segmentation_map) + vp8_read_mb_features(bc, mbmi, &pbi->mb); + + // Read the macroblock coeff skip flag if this feature is in use, else default to 0 + if (pbi->common.mb_no_coeff_skip) + mbmi->mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false); + else + mbmi->mb_skip_coeff = 0; + + if ((mbmi->ref_frame = (MV_REFERENCE_FRAME) vp8_read(bc, pbi->prob_intra))) /* inter MB */ { - int i = 0; + int rct[4]; + vp8_prob mv_ref_p [VP8_MVREFS-1]; + MV nearest, nearby, best_mv; - do + if (vp8_read(bc, pbi->prob_last)) { - pc->fc.uv_mode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8); + mbmi->ref_frame = (MV_REFERENCE_FRAME)((int)mbmi->ref_frame + (int)(1 + vp8_read(bc, pbi->prob_gf))); } - while (++i < 3); - } - read_mvcontexts(bc, mvc); + vp8_find_near_mvs(&pbi->mb, mi, &nearest, &nearby, &best_mv, rct, mbmi->ref_frame, pbi->common.ref_frame_sign_bias); - while (++mb_row < pc->mb_rows) - { - int mb_col = -1; + vp8_mv_ref_probs(mv_ref_p, rct); - while (++mb_col < pc->mb_cols) + mbmi->uv_mode = DC_PRED; + switch (mbmi->mode = read_mv_ref(bc, mv_ref_p)) { - MB_MODE_INFO *const mbmi = & mi->mbmi; - MV *const mv = & mbmi->mv.as_mv; - VP8_COMMON *const pc = &pbi->common; - MACROBLOCKD *xd = &pbi->mb; - - mbmi->need_to_clamp_mvs = 0; - // Distance of Mb to the various image edges. - // These specified to 8th pel as they are always compared to MV values that are in 1/8th pel units - xd->mb_to_left_edge = -((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_bottom_edge = ((pc->mb_rows - 1 - mb_row) * 16) << 3; - - // If required read in new segmentation data for this MB - if (pbi->mb.update_mb_segmentation_map) - vp8_read_mb_features(bc, mbmi, &pbi->mb); + case SPLITMV: + { + const int s = mbmi->partitioning = + vp8_treed_read(bc, vp8_mbsplit_tree, vp8_mbsplit_probs); + const int num_p = vp8_mbsplit_count [s]; + int j = 0; - // Read the macroblock coeff skip flag if this feature is in use, else default to 0 - if (pc->mb_no_coeff_skip) - mbmi->mb_skip_coeff = vp8_read(bc, prob_skip_false); - else - mbmi->mb_skip_coeff = 0; + do /* for each subset j */ + { + B_MODE_INFO bmi; + MV *const mv = & bmi.mv.as_mv; - mbmi->uv_mode = DC_PRED; + int k; /* first block in subset j */ + int mv_contz; + k = vp8_mbsplit_offset[s][j]; - if ((mbmi->ref_frame = (MV_REFERENCE_FRAME) vp8_read(bc, prob_intra))) /* inter MB */ - { - int rct[4]; - vp8_prob mv_ref_p [VP8_MVREFS-1]; - MV nearest, nearby, best_mv; + mv_contz = vp8_mv_cont(&(vp8_left_bmi(mi, k)->mv.as_mv), &(vp8_above_bmi(mi, k, mis)->mv.as_mv)); - if (vp8_read(bc, prob_last)) + switch (bmi.mode = (B_PREDICTION_MODE) sub_mv_ref(bc, vp8_sub_mv_ref_prob2 [mv_contz])) //pc->fc.sub_mv_ref_prob)) { - mbmi->ref_frame = (MV_REFERENCE_FRAME)((int)mbmi->ref_frame + (int)(1 + vp8_read(bc, prob_gf))); + case NEW4X4: + read_mv(bc, mv, (const MV_CONTEXT *) mvc); + mv->row += best_mv.row; + mv->col += best_mv.col; + #ifdef VPX_MODE_COUNT + vp8_mv_cont_count[mv_contz][3]++; + #endif + break; + case LEFT4X4: + *mv = vp8_left_bmi(mi, k)->mv.as_mv; + #ifdef VPX_MODE_COUNT + vp8_mv_cont_count[mv_contz][0]++; + #endif + break; + case ABOVE4X4: + *mv = vp8_above_bmi(mi, k, mis)->mv.as_mv; + #ifdef VPX_MODE_COUNT + vp8_mv_cont_count[mv_contz][1]++; + #endif + break; + case ZERO4X4: + *mv = Zero; + #ifdef VPX_MODE_COUNT + vp8_mv_cont_count[mv_contz][2]++; + #endif + break; + default: + break; } - vp8_find_near_mvs(xd, mi, &nearest, &nearby, &best_mv, rct, mbmi->ref_frame, pbi->common.ref_frame_sign_bias); + mbmi->need_to_clamp_mvs = (mv->col < mb_to_left_edge) ? 1 : 0; + mbmi->need_to_clamp_mvs |= (mv->col > mb_to_right_edge) ? 1 : 0; + mbmi->need_to_clamp_mvs |= (mv->row < mb_to_top_edge) ? 1 : 0; + mbmi->need_to_clamp_mvs |= (mv->row > mb_to_bottom_edge) ? 1 : 0; - vp8_mv_ref_probs(mv_ref_p, rct); - - switch (mbmi->mode = read_mv_ref(bc, mv_ref_p)) - { - case SPLITMV: { - const int s = mbmi->partitioning = vp8_treed_read( - bc, vp8_mbsplit_tree, vp8_mbsplit_probs - ); - const int num_p = vp8_mbsplit_count [s]; - const int *const L = vp8_mbsplits [s]; - int j = 0; - - do /* for each subset j */ - { - B_MODE_INFO bmi; - MV *const mv = & bmi.mv.as_mv; - - int k = -1; /* first block in subset j */ - int mv_contz; - - while (j != L[++k]) - { -#if CONFIG_DEBUG - if (k >= 16) - { - assert(0); - } -#endif - } - - mv_contz = vp8_mv_cont(&(vp8_left_bmi(mi, k)->mv.as_mv), &(vp8_above_bmi(mi, k, mis)->mv.as_mv)); - - switch (bmi.mode = (B_PREDICTION_MODE) sub_mv_ref(bc, vp8_sub_mv_ref_prob2 [mv_contz])) //pc->fc.sub_mv_ref_prob)) - { - case NEW4X4: - read_mv(bc, mv, (const MV_CONTEXT *) mvc); - mv->row += best_mv.row; - mv->col += best_mv.col; -#ifdef VPX_MODE_COUNT - vp8_mv_cont_count[mv_contz][3]++; -#endif - break; - case LEFT4X4: - *mv = vp8_left_bmi(mi, k)->mv.as_mv; -#ifdef VPX_MODE_COUNT - vp8_mv_cont_count[mv_contz][0]++; -#endif - break; - case ABOVE4X4: - *mv = vp8_above_bmi(mi, k, mis)->mv.as_mv; -#ifdef VPX_MODE_COUNT - vp8_mv_cont_count[mv_contz][1]++; -#endif - break; - case ZERO4X4: - *mv = Zero; -#ifdef VPX_MODE_COUNT - vp8_mv_cont_count[mv_contz][2]++; -#endif - break; - default: - break; - } - - if (mv->col < xd->mb_to_left_edge - - LEFT_TOP_MARGIN - || mv->col > xd->mb_to_right_edge - + RIGHT_BOTTOM_MARGIN - || mv->row < xd->mb_to_top_edge - - LEFT_TOP_MARGIN - || mv->row > xd->mb_to_bottom_edge - + RIGHT_BOTTOM_MARGIN - ) - mbmi->need_to_clamp_mvs = 1; - - /* Fill (uniform) modes, mvs of jth subset. - Must do it here because ensuing subsets can - refer back to us via "left" or "above". */ - do - if (j == L[k]) - mi->bmi[k] = bmi; - - while (++k < 16); - } - while (++j < num_p); - } - - *mv = mi->bmi[15].mv.as_mv; + /* Fill (uniform) modes, mvs of jth subset. + Must do it here because ensuing subsets can + refer back to us via "left" or "above". */ + unsigned char *fill_offset; + unsigned int fill_count = vp8_mbsplit_fill_count[s]; - break; /* done with SPLITMV */ + fill_offset = &vp8_mbsplit_fill_offset[s][(unsigned char)j * vp8_mbsplit_fill_count[s]]; - case NEARMV: - *mv = nearby; + do { + mi->bmi[ *fill_offset] = bmi; + fill_offset++; - // Clip "next_nearest" so that it does not extend to far out of image - if (mv->col < (xd->mb_to_left_edge - LEFT_TOP_MARGIN)) - mv->col = xd->mb_to_left_edge - LEFT_TOP_MARGIN; - else if (mv->col > xd->mb_to_right_edge + RIGHT_BOTTOM_MARGIN) - mv->col = xd->mb_to_right_edge + RIGHT_BOTTOM_MARGIN; + }while (--fill_count); + } - if (mv->row < (xd->mb_to_top_edge - LEFT_TOP_MARGIN)) - mv->row = xd->mb_to_top_edge - LEFT_TOP_MARGIN; - else if (mv->row > xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN) - mv->row = xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN; + } + while (++j < num_p); + } - goto propagate_mv; + *mv = mi->bmi[15].mv.as_mv; + + break; /* done with SPLITMV */ + + case NEARMV: + *mv = nearby; + // Clip "next_nearest" so that it does not extend to far out of image + mv->col = (mv->col < mb_to_left_edge) ? mb_to_left_edge : mv->col; + mv->col = (mv->col > mb_to_right_edge) ? mb_to_right_edge : mv->col; + mv->row = (mv->row < mb_to_top_edge) ? mb_to_top_edge : mv->row; + mv->row = (mv->row > mb_to_bottom_edge) ? mb_to_bottom_edge : mv->row; + goto propagate_mv; + + case NEARESTMV: + *mv = nearest; + // Clip "next_nearest" so that it does not extend to far out of image + mv->col = (mv->col < mb_to_left_edge) ? mb_to_left_edge : mv->col; + mv->col = (mv->col > mb_to_right_edge) ? mb_to_right_edge : mv->col; + mv->row = (mv->row < mb_to_top_edge) ? mb_to_top_edge : mv->row; + mv->row = (mv->row > mb_to_bottom_edge) ? mb_to_bottom_edge : mv->row; + goto propagate_mv; + + case ZEROMV: + *mv = Zero; + goto propagate_mv; + + case NEWMV: + read_mv(bc, mv, (const MV_CONTEXT *) mvc); + mv->row += best_mv.row; + mv->col += best_mv.col; + + /* Don't need to check this on NEARMV and NEARESTMV modes + * since those modes clamp the MV. The NEWMV mode does not, + * so signal to the prediction stage whether special + * handling may be required. + */ + mbmi->need_to_clamp_mvs = (mv->col < mb_to_left_edge) ? 1 : 0; + mbmi->need_to_clamp_mvs |= (mv->col > mb_to_right_edge) ? 1 : 0; + mbmi->need_to_clamp_mvs |= (mv->row < mb_to_top_edge) ? 1 : 0; + mbmi->need_to_clamp_mvs |= (mv->row > mb_to_bottom_edge) ? 1 : 0; + + propagate_mv: /* same MV throughout */ + { + //int i=0; + //do + //{ + // mi->bmi[i].mv.as_mv = *mv; + //} + //while( ++i < 16); + + mi->bmi[0].mv.as_mv = *mv; + mi->bmi[1].mv.as_mv = *mv; + mi->bmi[2].mv.as_mv = *mv; + mi->bmi[3].mv.as_mv = *mv; + mi->bmi[4].mv.as_mv = *mv; + mi->bmi[5].mv.as_mv = *mv; + mi->bmi[6].mv.as_mv = *mv; + mi->bmi[7].mv.as_mv = *mv; + mi->bmi[8].mv.as_mv = *mv; + mi->bmi[9].mv.as_mv = *mv; + mi->bmi[10].mv.as_mv = *mv; + mi->bmi[11].mv.as_mv = *mv; + mi->bmi[12].mv.as_mv = *mv; + mi->bmi[13].mv.as_mv = *mv; + mi->bmi[14].mv.as_mv = *mv; + mi->bmi[15].mv.as_mv = *mv; + } + break; + default:; + #if CONFIG_DEBUG + assert(0); + #endif + } + } + else + { + /* MB is intra coded */ + int j = 0; + do + { + mi->bmi[j].mv.as_mv = Zero; + } + while (++j < 16); - case NEARESTMV: - *mv = nearest; + if ((mbmi->mode = (MB_PREDICTION_MODE) vp8_read_ymode(bc, pbi->common.fc.ymode_prob)) == B_PRED) + { + j = 0; + do + { + mi->bmi[j].mode = (B_PREDICTION_MODE)vp8_read_bmode(bc, pbi->common.fc.bmode_prob); + } + while (++j < 16); + } - // Clip "next_nearest" so that it does not extend to far out of image - if (mv->col < (xd->mb_to_left_edge - LEFT_TOP_MARGIN)) - mv->col = xd->mb_to_left_edge - LEFT_TOP_MARGIN; - else if (mv->col > xd->mb_to_right_edge + RIGHT_BOTTOM_MARGIN) - mv->col = xd->mb_to_right_edge + RIGHT_BOTTOM_MARGIN; + mbmi->uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, pbi->common.fc.uv_mode_prob); + } - if (mv->row < (xd->mb_to_top_edge - LEFT_TOP_MARGIN)) - mv->row = xd->mb_to_top_edge - LEFT_TOP_MARGIN; - else if (mv->row > xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN) - mv->row = xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN; +} - goto propagate_mv; +void vp8_decode_mode_mvs(VP8D_COMP *pbi) +{ + MODE_INFO *mi = pbi->common.mi; + int mb_row = -1; - case ZEROMV: - *mv = Zero; - goto propagate_mv; + vp8_mb_mode_mv_init(pbi); - case NEWMV: - read_mv(bc, mv, (const MV_CONTEXT *) mvc); - mv->row += best_mv.row; - mv->col += best_mv.col; + while (++mb_row < pbi->common.mb_rows) + { + int mb_col = -1; + int mb_to_top_edge; + int mb_to_bottom_edge; - /* Don't need to check this on NEARMV and NEARESTMV modes - * since those modes clamp the MV. The NEWMV mode does not, - * so signal to the prediction stage whether special - * handling may be required. - */ - if (mv->col < xd->mb_to_left_edge - LEFT_TOP_MARGIN - || mv->col > xd->mb_to_right_edge + RIGHT_BOTTOM_MARGIN - || mv->row < xd->mb_to_top_edge - LEFT_TOP_MARGIN - || mv->row > xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN - ) - mbmi->need_to_clamp_mvs = 1; - - propagate_mv: /* same MV throughout */ - { - //int i=0; - //do - //{ - // mi->bmi[i].mv.as_mv = *mv; - //} - //while( ++i < 16); - - mi->bmi[0].mv.as_mv = *mv; - mi->bmi[1].mv.as_mv = *mv; - mi->bmi[2].mv.as_mv = *mv; - mi->bmi[3].mv.as_mv = *mv; - mi->bmi[4].mv.as_mv = *mv; - mi->bmi[5].mv.as_mv = *mv; - mi->bmi[6].mv.as_mv = *mv; - mi->bmi[7].mv.as_mv = *mv; - mi->bmi[8].mv.as_mv = *mv; - mi->bmi[9].mv.as_mv = *mv; - mi->bmi[10].mv.as_mv = *mv; - mi->bmi[11].mv.as_mv = *mv; - mi->bmi[12].mv.as_mv = *mv; - mi->bmi[13].mv.as_mv = *mv; - mi->bmi[14].mv.as_mv = *mv; - mi->bmi[15].mv.as_mv = *mv; - } + pbi->mb.mb_to_top_edge = + mb_to_top_edge = -((mb_row * 16)) << 3; + mb_to_top_edge -= LEFT_TOP_MARGIN; - break; + pbi->mb.mb_to_bottom_edge = + mb_to_bottom_edge = ((pbi->common.mb_rows - 1 - mb_row) * 16) << 3; + mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN; - default:; -#if CONFIG_DEBUG - assert(0); -#endif - } - } + while (++mb_col < pbi->common.mb_cols) + { +// vp8_read_mb_modes_mv(pbi, xd->mode_info_context, &xd->mode_info_context->mbmi, mb_row, mb_col); + if(pbi->common.frame_type == KEY_FRAME) + vp8_kfread_modes(pbi, mi, mb_row, mb_col); else - { - /* MB is intra coded */ - - int j = 0; - - do - { - mi->bmi[j].mv.as_mv = Zero; - } - while (++j < 16); - - *mv = Zero; - - if ((mbmi->mode = (MB_PREDICTION_MODE) vp8_read_ymode(bc, pc->fc.ymode_prob)) == B_PRED) - { - int j = 0; - - do - { - mi->bmi[j].mode = (B_PREDICTION_MODE)vp8_read_bmode(bc, pc->fc.bmode_prob); - } - while (++j < 16); - } - - mbmi->uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, pc->fc.uv_mode_prob); - } + vp8_read_mb_modes_mv(pbi, mi, &mi->mbmi, mb_row, mb_col); mi++; // next macroblock } @@ -418,3 +553,4 @@ void vp8_decode_mode_mvs(VP8D_COMP *pbi) mi++; // skip left predictor each row } } + diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index f2d8c766e..4f5b7c7a2 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -23,7 +23,7 @@ #include "quant_common.h" #include "setupintrarecon.h" -#include "demode.h" + #include "decodemv.h" #include "extend.h" #include "vpx_mem/vpx_mem.h" @@ -151,15 +151,11 @@ static void clamp_mv_to_umv_border(MV *mv, const MACROBLOCKD *xd) /* A version of the above function for chroma block MVs.*/ static void clamp_uvmv_to_umv_border(MV *mv, const MACROBLOCKD *xd) { - if (2*mv->col < (xd->mb_to_left_edge - (19 << 3))) - mv->col = (xd->mb_to_left_edge - (16 << 3)) >> 1; - else if (2*mv->col > xd->mb_to_right_edge + (18 << 3)) - mv->col = (xd->mb_to_right_edge + (16 << 3)) >> 1; - - if (2*mv->row < (xd->mb_to_top_edge - (19 << 3))) - mv->row = (xd->mb_to_top_edge - (16 << 3)) >> 1; - else if (2*mv->row > xd->mb_to_bottom_edge + (18 << 3)) - mv->row = (xd->mb_to_bottom_edge + (16 << 3)) >> 1; + mv->col = (2*mv->col < (xd->mb_to_left_edge - (19 << 3))) ? (xd->mb_to_left_edge - (16 << 3)) >> 1 : mv->col; + mv->col = (2*mv->col > xd->mb_to_right_edge + (18 << 3)) ? (xd->mb_to_right_edge + (16 << 3)) >> 1 : mv->col; + + mv->row = (2*mv->row < (xd->mb_to_top_edge - (19 << 3))) ? (xd->mb_to_top_edge - (16 << 3)) >> 1 : mv->row; + mv->row = (2*mv->row > xd->mb_to_bottom_edge + (18 << 3)) ? (xd->mb_to_bottom_edge + (16 << 3)) >> 1 : mv->row; } static void clamp_mvs(MACROBLOCKD *xd) @@ -838,10 +834,8 @@ int vp8_decode_frame(VP8D_COMP *pbi) // Read the mb_no_coeff_skip flag pc->mb_no_coeff_skip = (int)vp8_read_bit(bc); - if (pc->frame_type == KEY_FRAME) - vp8_kfread_modes(pbi); - else - vp8_decode_mode_mvs(pbi); + + vp8_decode_mode_mvs(pbi); vpx_memset(pc->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES) * pc->mb_cols); diff --git a/vp8/decoder/demode.c b/vp8/decoder/demode.c deleted file mode 100644 index 557508dd8..000000000 --- a/vp8/decoder/demode.c +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - - -#include "onyxd_int.h" -#include "entropymode.h" -#include "findnearmv.h" - - -int vp8_read_bmode(vp8_reader *bc, const vp8_prob *p) -{ - const int i = vp8_treed_read(bc, vp8_bmode_tree, p); - - return i; -} - - -int vp8_read_ymode(vp8_reader *bc, const vp8_prob *p) -{ - const int i = vp8_treed_read(bc, vp8_ymode_tree, p); - - return i; -} - -int vp8_kfread_ymode(vp8_reader *bc, const vp8_prob *p) -{ - const int i = vp8_treed_read(bc, vp8_kf_ymode_tree, p); - - return i; -} - - - -int vp8_read_uv_mode(vp8_reader *bc, const vp8_prob *p) -{ - const int i = vp8_treed_read(bc, vp8_uv_mode_tree, p); - - return i; -} - -void vp8_read_mb_features(vp8_reader *r, MB_MODE_INFO *mi, MACROBLOCKD *x) -{ - // Is segmentation enabled - if (x->segmentation_enabled && x->update_mb_segmentation_map) - { - // If so then read the segment id. - if (vp8_read(r, x->mb_segment_tree_probs[0])) - mi->segment_id = (unsigned char)(2 + vp8_read(r, x->mb_segment_tree_probs[2])); - else - mi->segment_id = (unsigned char)(vp8_read(r, x->mb_segment_tree_probs[1])); - } -} - -void vp8_kfread_modes(VP8D_COMP *pbi) -{ - VP8_COMMON *const cp = & pbi->common; - vp8_reader *const bc = & pbi->bc; - - MODE_INFO *m = cp->mi; - const int ms = cp->mode_info_stride; - - int mb_row = -1; - vp8_prob prob_skip_false = 0; - - if (cp->mb_no_coeff_skip) - prob_skip_false = (vp8_prob)(vp8_read_literal(bc, 8)); - - while (++mb_row < cp->mb_rows) - { - int mb_col = -1; - - while (++mb_col < cp->mb_cols) - { - MB_PREDICTION_MODE y_mode; - - // Read the Macroblock segmentation map if it is being updated explicitly this frame (reset to 0 above by default) - // By default on a key frame reset all MBs to segment 0 - m->mbmi.segment_id = 0; - - if (pbi->mb.update_mb_segmentation_map) - vp8_read_mb_features(bc, &m->mbmi, &pbi->mb); - - // Read the macroblock coeff skip flag if this feature is in use, else default to 0 - if (cp->mb_no_coeff_skip) - m->mbmi.mb_skip_coeff = vp8_read(bc, prob_skip_false); - else - m->mbmi.mb_skip_coeff = 0; - - y_mode = (MB_PREDICTION_MODE) vp8_kfread_ymode(bc, cp->kf_ymode_prob); - - m->mbmi.ref_frame = INTRA_FRAME; - - if ((m->mbmi.mode = y_mode) == B_PRED) - { - int i = 0; - - do - { - const B_PREDICTION_MODE A = vp8_above_bmi(m, i, ms)->mode; - const B_PREDICTION_MODE L = vp8_left_bmi(m, i)->mode; - - m->bmi[i].mode = (B_PREDICTION_MODE) vp8_read_bmode(bc, cp->kf_bmode_prob [A] [L]); - } - while (++i < 16); - } - else - { - int BMode; - int i = 0; - - switch (y_mode) - { - case DC_PRED: - BMode = B_DC_PRED; - break; - case V_PRED: - BMode = B_VE_PRED; - break; - case H_PRED: - BMode = B_HE_PRED; - break; - case TM_PRED: - BMode = B_TM_PRED; - break; - default: - BMode = B_DC_PRED; - break; - } - - do - { - m->bmi[i].mode = (B_PREDICTION_MODE)BMode; - } - while (++i < 16); - } - - (m++)->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, cp->kf_uv_mode_prob); - } - - m++; // skip the border - } -} diff --git a/vp8/decoder/demode.h b/vp8/decoder/demode.h deleted file mode 100644 index a58cff95b..000000000 --- a/vp8/decoder/demode.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - - -#include "onyxd_int.h" - -/* Read (intra) modes for all blocks in a keyframe */ - -void vp8_kfread_modes(VP8D_COMP *pbi); - -/* Intra mode for a Y subblock */ - -int vp8_read_bmode(vp8_reader *, const vp8_prob *); - -/* MB intra Y mode trees differ for key and inter frames. */ - -int vp8_read_ymode(vp8_reader *, const vp8_prob *); -int vp8_kfread_ymode(vp8_reader *, const vp8_prob *); - -/* MB intra UV mode trees are the same for key and inter frames. */ - -int vp8_read_uv_mode(vp8_reader *, const vp8_prob *); - -/* Read any macroblock-level features that may be present. */ - -void vp8_read_mb_features(vp8_reader *, MB_MODE_INFO *, MACROBLOCKD *); diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h index 9be4d47b2..ad21ae3f5 100644 --- a/vp8/decoder/onyxd_int.h +++ b/vp8/decoder/onyxd_int.h @@ -125,6 +125,12 @@ typedef struct VP8Decompressor struct vp8_dboolhuff_rtcd_vtable dboolhuff; #endif + + vp8_prob prob_intra; + vp8_prob prob_last; + vp8_prob prob_gf; + vp8_prob prob_skip_false; + } VP8D_COMP; int vp8_decode_frame(VP8D_COMP *cpi); diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index 2dea8b70f..a65bce6e1 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -1403,6 +1403,7 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame) // Should we use the alternate refernce frame if (cpi->oxcf.play_alternate && + cpi->oxcf.lag_in_frames && (i >= MIN_GF_INTERVAL) && (i <= (cpi->frames_to_key - MIN_GF_INTERVAL)) && // dont use ARF very near next kf (((next_frame.pcnt_inter > 0.75) && diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 5c78b9c8a..56bac0aaa 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1344,8 +1344,8 @@ void vp8_new_frame_rate(VP8_COMP *cpi, double framerate) cpi->max_gf_interval = 12; - // Special conditions when altr ref frame enabled - if (cpi->oxcf.play_alternate) + // Special conditions when altr ref frame enabled in lagged compress mode + if (cpi->oxcf.play_alternate && cpi->oxcf.lag_in_frames) { if (cpi->max_gf_interval > cpi->oxcf.lag_in_frames - 1) cpi->max_gf_interval = cpi->oxcf.lag_in_frames - 1; diff --git a/vp8/vp8dx.mk b/vp8/vp8dx.mk index 1d2558f23..941961708 100644 --- a/vp8/vp8dx.mk +++ b/vp8/vp8dx.mk @@ -54,14 +54,12 @@ CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)decoder VP8_DX_SRCS-yes += decoder/dboolhuff.c VP8_DX_SRCS-yes += decoder/decodemv.c VP8_DX_SRCS-yes += decoder/decodframe.c -VP8_DX_SRCS-yes += decoder/demode.c VP8_DX_SRCS-yes += decoder/dequantize.c VP8_DX_SRCS-yes += decoder/detokenize.c VP8_DX_SRCS-yes += decoder/generic/dsystemdependent.c VP8_DX_SRCS-yes += decoder/dboolhuff.h VP8_DX_SRCS-yes += decoder/decodemv.h VP8_DX_SRCS-yes += decoder/decoderthreading.h -VP8_DX_SRCS-yes += decoder/demode.h VP8_DX_SRCS-yes += decoder/dequantize.h VP8_DX_SRCS-yes += decoder/detokenize.h VP8_DX_SRCS-yes += decoder/onyxd_int.h |