From 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Tue, 18 Feb 2014 21:52:30 +1100 Subject: On2 VP7 decoder Signed-off-by: Peter Ross Reviewed-by: BBB previous patch reviewed by jason Signed-off-by: Michael Niedermayer --- libavcodec/vp8.c | 759 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 633 insertions(+), 126 deletions(-) (limited to 'libavcodec/vp8.c') diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index f13228670d..0c2f503ac6 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -1,10 +1,11 @@ /* - * VP8 compatible video decoder + * VP7/VP8 compatible video decoder * * Copyright (C) 2010 David Conrad * Copyright (C) 2010 Ronald S. Bultje * Copyright (C) 2010 Jason Garrett-Glaser * Copyright (C) 2012 Daniel Kang + * Copyright (C) 2014 Peter Ross * * This file is part of FFmpeg. * @@ -35,6 +36,14 @@ # include "arm/vp8.h" #endif +#if CONFIG_VP7_DECODER && CONFIG_VP8_DECODER +#define VPX(vp7, f) (vp7 ? vp7_ ## f : vp8_ ## f) +#elif CONFIG_VP7_DECODER +#define VPX(vp7, f) vp7_ ## f +#else // CONFIG_VP8_DECODER +#define VPX(vp7, f) vp8_ ## f +#endif + static void free_buffers(VP8Context *s) { int i; @@ -74,6 +83,7 @@ static void vp8_release_frame(VP8Context *s, VP8Frame *f) ff_thread_release_buffer(s->avctx, &f->tf); } +#if CONFIG_VP8_DECODER static int vp8_ref_frame(VP8Context *s, VP8Frame *dst, VP8Frame *src) { int ret; @@ -90,6 +100,7 @@ static int vp8_ref_frame(VP8Context *s, VP8Frame *dst, VP8Frame *src) return 0; } +#endif static void vp8_decode_flush_impl(AVCodecContext *avctx, int free_mem) @@ -151,7 +162,7 @@ static int update_dimensions(VP8Context *s, int width, int height) s->mb_width = (s->avctx->coded_width +15) / 16; s->mb_height = (s->avctx->coded_height+15) / 16; - s->mb_layout = (avctx->active_thread_type == FF_THREAD_SLICE) && (FFMIN(s->num_coeff_partitions, avctx->thread_count) > 1); + s->mb_layout = s->vp7 || (avctx->active_thread_type == FF_THREAD_SLICE) && (FFMIN(s->num_coeff_partitions, avctx->thread_count) > 1); if (!s->mb_layout) { // Frame threading and one thread s->macroblocks_base = av_mallocz((s->mb_width+s->mb_height*2+1)*sizeof(*s->macroblocks)); s->intra4x4_pred_mode_top = av_mallocz(s->mb_width*4); @@ -179,6 +190,8 @@ static int update_dimensions(VP8Context *s, int width, int height) return 0; } + +#if CONFIG_VP8_DECODER static void parse_segment_info(VP8Context *s) { VP56RangeCoder *c = &s->c; @@ -249,8 +262,31 @@ static int setup_partitions(VP8Context *s, const uint8_t *buf, int buf_size) return 0; } +#endif + +#if CONFIG_VP7_DECODER +static void vp7_get_quants(VP8Context *s) +{ + VP56RangeCoder *c = &s->c; + + int yac_qi = vp8_rac_get_uint(c, 7); + int ydc_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi; + int y2dc_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi; + int y2ac_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi; + int uvdc_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi; + int uvac_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi; + + s->qmat[0].luma_qmul[0] = vp7_ydc_qlookup[ydc_qi]; + s->qmat[0].luma_qmul[1] = vp7_yac_qlookup[yac_qi]; + s->qmat[0].luma_dc_qmul[0] = vp7_y2dc_qlookup[y2dc_qi]; + s->qmat[0].luma_dc_qmul[1] = vp7_y2ac_qlookup[y2ac_qi]; + s->qmat[0].chroma_qmul[0] = FFMIN(vp7_ydc_qlookup[uvdc_qi], 132); + s->qmat[0].chroma_qmul[1] = vp7_yac_qlookup[uvac_qi]; +} +#endif -static void get_quants(VP8Context *s) +#if CONFIG_VP8_DECODER +static void vp8_get_quants(VP8Context *s) { VP56RangeCoder *c = &s->c; int i, base_qi; @@ -311,7 +347,53 @@ static VP56Frame ref_to_update(VP8Context *s, int update, VP56Frame ref) } return VP56_FRAME_NONE; } +#endif + +static void vp78_reset_probability_tables(VP8Context *s) +{ + int i, j; + for (i = 0; i < 4; i++) + for (j = 0; j < 16; j++) + memcpy(s->prob->token[i][j], vp8_token_default_probs[i][vp8_coeff_band[j]], + sizeof(s->prob->token[i][j])); +} + +static void vp78_update_probability_tables(VP8Context *s) +{ + VP56RangeCoder *c = &s->c; + int i, j, k, l, m; + + for (i = 0; i < 4; i++) + for (j = 0; j < 8; j++) + for (k = 0; k < 3; k++) + for (l = 0; l < NUM_DCT_TOKENS-1; l++) + if (vp56_rac_get_prob_branchy(c, vp8_token_update_probs[i][j][k][l])) { + int prob = vp8_rac_get_uint(c, 8); + for (m = 0; vp8_coeff_band_indexes[j][m] >= 0; m++) + s->prob->token[i][vp8_coeff_band_indexes[j][m]][k][l] = prob; + } +} + +static void vp78_update_pred16x16_pred8x8_mvc_probabilities(VP8Context *s) +{ + VP56RangeCoder *c = &s->c; + int i, j; + + if (vp8_rac_get(c)) + for (i = 0; i < 4; i++) + s->prob->pred16x16[i] = vp8_rac_get_uint(c, 8); + if (vp8_rac_get(c)) + for (i = 0; i < 3; i++) + s->prob->pred8x8c[i] = vp8_rac_get_uint(c, 8); + + // 17.2 MV probability update + for (i = 0; i < 2; i++) + for (j = 0; j < (s->vp7 ? 17 : 19); j++) + if (vp56_rac_get_prob_branchy(c, vp8_mv_update_prob[i][j])) + s->prob->mvc[i][j] = vp8_rac_get_nn(c); +} +#if CONFIG_VP8_DECODER static void update_refs(VP8Context *s) { VP56RangeCoder *c = &s->c; @@ -322,11 +404,182 @@ static void update_refs(VP8Context *s) s->update_golden = ref_to_update(s, update_golden, VP56_FRAME_GOLDEN); s->update_altref = ref_to_update(s, update_altref, VP56_FRAME_GOLDEN2); } +#endif + +#if CONFIG_VP7_DECODER +static void fade(uint8_t *dst, int dst_linesize, const uint8_t *src, int src_linesize, int width, int height, int alpha, int beta) +{ + int i, j; + for (j = 0; j < height; j++) + for (i = 0; i < width; i++) { + uint8_t y = src[j*src_linesize + i]; + dst[j*dst_linesize + i] = av_clip_uint8(y + ((y * beta) >> 8) + alpha); + } +} + +static int vp7_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) +{ + VP56RangeCoder *c = &s->c; + int part1_size, hscale, vscale, i, j, ret; + int width = s->avctx->width; + int height = s->avctx->height; + + s->profile = (buf[0]>>1) & 7; + if (s->profile > 1) { + avpriv_request_sample(s->avctx, "Unknown profile %d", s->profile); + return AVERROR_INVALIDDATA; + } + + s->keyframe = !(buf[0] & 1); + s->invisible = 0; + part1_size = AV_RL24(buf) >> 4; + + buf += 4 - s->profile; + buf_size -= 4 - s->profile; + + memcpy(s->put_pixels_tab, s->vp8dsp.put_vp8_epel_pixels_tab, sizeof(s->put_pixels_tab)); + + ff_vp56_init_range_decoder(c, buf, part1_size); + buf += part1_size; + buf_size -= part1_size; + + /* A. Dimension information (keyframes only) */ + if (s->keyframe) { + width = vp8_rac_get_uint(c, 12); + height = vp8_rac_get_uint(c, 12); + hscale = vp8_rac_get_uint(c, 2); + vscale = vp8_rac_get_uint(c, 2); + if (hscale || vscale) + avpriv_request_sample(s->avctx, "Upscaling"); + + s->update_golden = s->update_altref = VP56_FRAME_CURRENT; + vp78_reset_probability_tables(s); + memcpy(s->prob->pred16x16, vp8_pred16x16_prob_inter, sizeof(s->prob->pred16x16)); + memcpy(s->prob->pred8x8c , vp8_pred8x8c_prob_inter , sizeof(s->prob->pred8x8c)); + for (i = 0; i < 2; i++) + memcpy(s->prob->mvc[i], vp7_mv_default_prob[i], sizeof(vp7_mv_default_prob[i])); + memset(&s->segmentation, 0, sizeof(s->segmentation)); + memset(&s->lf_delta, 0, sizeof(s->lf_delta)); + memcpy(s->prob[0].scan, zigzag_scan, sizeof(s->prob[0].scan)); + } + + if (s->keyframe || s->profile > 0) + memset(s->inter_dc_pred, 0 , sizeof(s->inter_dc_pred)); + + /* B. Decoding information for all four macroblock-level features */ + for (i = 0; i < 4; i++) { + s->feature_enabled[i] = vp8_rac_get(c); + if (s->feature_enabled[i]) { + s->feature_present_prob[i] = vp8_rac_get_uint(c, 8); + + for (j = 0; j < 3; j++) + s->feature_index_prob[i][j] = vp8_rac_get(c) ? vp8_rac_get_uint(c, 8) : 255; + + if (vp7_feature_value_size[i]) + for (j = 0; j < 4; j++) + s->feature_value[i][j] = vp8_rac_get(c) ? vp8_rac_get_uint(c, vp7_feature_value_size[s->profile][i]) : 0; + } + } + + s->segmentation.enabled = 0; + s->segmentation.update_map = 0; + s->lf_delta.enabled = 0; + + s->num_coeff_partitions = 1; + ff_vp56_init_range_decoder(&s->coeff_partition[0], buf, buf_size); + + if (!s->macroblocks_base || /* first frame */ + width != s->avctx->width || height != s->avctx->height || (width+15)/16 != s->mb_width || (height+15)/16 != s->mb_height) { + if ((ret = update_dimensions(s, width, height)) < 0) + return ret; + } + + /* C. Dequantization indices */ + vp7_get_quants(s); + + /* D. Golden frame update flag (a Flag) for interframes only */ + if (!s->keyframe) { + s->update_golden = vp8_rac_get(c) ? VP56_FRAME_CURRENT : VP56_FRAME_NONE; + s->sign_bias[VP56_FRAME_GOLDEN] = 0; + } + + s->update_last = 1; + s->update_probabilities = 1; + s->fade_present = 1; + + if (s->profile > 0) { + s->update_probabilities = vp8_rac_get(c); + if (!s->update_probabilities) + s->prob[1] = s->prob[0]; + + if (!s->keyframe) + s->fade_present = vp8_rac_get(c); + } + + /* E. Fading information for previous frame */ + if (s->fade_present && vp8_rac_get(c)) { + int alpha = (int8_t)vp8_rac_get_uint(c, 8); + int beta = (int8_t)vp8_rac_get_uint(c, 8); + if (!s->keyframe && (alpha || beta)) { + /* preserve the golden frame */ + if (s->framep[VP56_FRAME_GOLDEN] == s->framep[VP56_FRAME_PREVIOUS]) { + AVFrame *gold = s->framep[VP56_FRAME_GOLDEN]->tf.f; + AVFrame *prev; + int i, j; + + s->framep[VP56_FRAME_PREVIOUS] = vp8_find_free_buffer(s); + if ((ret = vp8_alloc_frame(s, s->framep[VP56_FRAME_PREVIOUS], 1)) < 0) + return ret; + prev = s->framep[VP56_FRAME_PREVIOUS]->tf.f; + + fade(prev->data[0], prev->linesize[0], gold->data[0], gold->linesize[0], s->mb_width * 16, s->mb_height * 16, alpha, beta); + for (j = 1; j < 3; j++) + for (i = 0; i < s->mb_height * 8; i++) + memcpy(prev->data[j] + i * prev->linesize[j], gold->data[j] + i * gold->linesize[j], s->mb_width * 8); + } else { + AVFrame *prev = s->framep[VP56_FRAME_PREVIOUS]->tf.f; + fade(prev->data[0], prev->linesize[0], prev->data[0], prev->linesize[0], s->mb_width * 16, s->mb_height * 16, alpha, beta); + } + + } + } + + /* F. Loop filter type */ + if (!s->profile) + s->filter.simple = vp8_rac_get(c); + + /* G. DCT coefficient ordering specification */ + if (vp8_rac_get(c)) + for (i = 1; i < 16; i++) + s->prob[0].scan[i] = zigzag_scan[vp8_rac_get_uint(c, 4)]; + + /* H. Loop filter levels */ + if (s->profile > 0) + s->filter.simple = vp8_rac_get(c); + s->filter.level = vp8_rac_get_uint(c, 6); + s->filter.sharpness = vp8_rac_get_uint(c, 3); + + /* I. DCT coefficient probability update; 13.3 Token Probability Updates */ + vp78_update_probability_tables(s); + + s->mbskip_enabled = 0; + + /* J. The remaining frame header data occurs ONLY FOR INTERFRAMES */ + if (!s->keyframe) { + s->prob->intra = vp8_rac_get_uint(c, 8); + s->prob->last = vp8_rac_get_uint(c, 8); + vp78_update_pred16x16_pred8x8_mvc_probabilities(s); + } + + return 0; +} +#endif -static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) +#if CONFIG_VP8_DECODER +static int vp8_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) { VP56RangeCoder *c = &s->c; - int header_size, hscale, vscale, i, j, k, l, m, ret; + int header_size, hscale, vscale, ret; int width = s->avctx->width; int height = s->avctx->height; @@ -366,10 +619,7 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) avpriv_request_sample(s->avctx, "Upscaling"); s->update_golden = s->update_altref = VP56_FRAME_CURRENT; - for (i = 0; i < 4; i++) - for (j = 0; j < 16; j++) - memcpy(s->prob->token[i][j], vp8_token_default_probs[i][vp8_coeff_band[j]], - sizeof(s->prob->token[i][j])); + vp78_reset_probability_tables(s); memcpy(s->prob->pred16x16, vp8_pred16x16_prob_inter, sizeof(s->prob->pred16x16)); memcpy(s->prob->pred8x8c , vp8_pred8x8c_prob_inter , sizeof(s->prob->pred8x8c)); memcpy(s->prob->mvc , vp8_mv_default_prob , sizeof(s->prob->mvc)); @@ -411,7 +661,7 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) return ret; } - get_quants(s); + vp8_get_quants(s); if (!s->keyframe) { update_refs(s); @@ -426,15 +676,7 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) s->update_last = s->keyframe || vp8_rac_get(c); - for (i = 0; i < 4; i++) - for (j = 0; j < 8; j++) - for (k = 0; k < 3; k++) - for (l = 0; l < NUM_DCT_TOKENS-1; l++) - if (vp56_rac_get_prob_branchy(c, vp8_token_update_probs[i][j][k][l])) { - int prob = vp8_rac_get_uint(c, 8); - for (m = 0; vp8_coeff_band_indexes[j][m] >= 0; m++) - s->prob->token[i][vp8_coeff_band_indexes[j][m]][k][l] = prob; - } + vp78_update_probability_tables(s); if ((s->mbskip_enabled = vp8_rac_get(c))) s->prob->mbskip = vp8_rac_get_uint(c, 8); @@ -443,23 +685,12 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) s->prob->intra = vp8_rac_get_uint(c, 8); s->prob->last = vp8_rac_get_uint(c, 8); s->prob->golden = vp8_rac_get_uint(c, 8); - - if (vp8_rac_get(c)) - for (i = 0; i < 4; i++) - s->prob->pred16x16[i] = vp8_rac_get_uint(c, 8); - if (vp8_rac_get(c)) - for (i = 0; i < 3; i++) - s->prob->pred8x8c[i] = vp8_rac_get_uint(c, 8); - - // 17.2 MV probability update - for (i = 0; i < 2; i++) - for (j = 0; j < 19; j++) - if (vp56_rac_get_prob_branchy(c, vp8_mv_update_prob[i][j])) - s->prob->mvc[i][j] = vp8_rac_get_nn(c); + vp78_update_pred16x16_pred8x8_mvc_probabilities(s); } return 0; } +#endif static av_always_inline void clamp_mv(VP8Context *s, VP56mv *dst, const VP56mv *src) { @@ -470,7 +701,7 @@ static av_always_inline void clamp_mv(VP8Context *s, VP56mv *dst, const VP56mv * /** * Motion vector coding, 17.1. */ -static int read_mv_component(VP56RangeCoder *c, const uint8_t *p) +static av_always_inline int read_mv_component(VP56RangeCoder *c, const uint8_t *p, int vp7) { int bit, x = 0; @@ -479,9 +710,9 @@ static int read_mv_component(VP56RangeCoder *c, const uint8_t *p) for (i = 0; i < 3; i++) x += vp56_rac_get_prob(c, p[9 + i]) << i; - for (i = 9; i > 3; i--) + for (i = (vp7 ? 7 : 9); i > 3; i--) x += vp56_rac_get_prob(c, p[9 + i]) << i; - if (!(x & 0xFFF0) || vp56_rac_get_prob(c, p[12])) + if (!(x & (vp7 ? 0xF0 : 0xFFF0)) || vp56_rac_get_prob(c, p[12])) x += 8; } else { // small_mvtree @@ -498,6 +729,16 @@ static int read_mv_component(VP56RangeCoder *c, const uint8_t *p) return (x && vp56_rac_get_prob(c, p[1])) ? -x : x; } +static int vp7_read_mv_component(VP56RangeCoder *c, const uint8_t *p) +{ + return read_mv_component(c, p, 1); +} + +static int vp8_read_mv_component(VP56RangeCoder *c, const uint8_t *p) +{ + return read_mv_component(c, p, 0); +} + static av_always_inline const uint8_t *get_submv_prob(uint32_t left, uint32_t top) { @@ -513,7 +754,7 @@ const uint8_t *get_submv_prob(uint32_t left, uint32_t top) * @returns the number of motion vectors parsed (2, 4 or 16) */ static av_always_inline -int decode_splitmvs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, int layout) +int decode_splitmvs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, int layout, int vp7) { int part_idx; int n, num; @@ -562,13 +803,13 @@ int decode_splitmvs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, int lay else above = AV_RN32A(&cur_mv[mbsplits_cur[k - 4]]); - submv_prob = get_submv_prob(left, above); + submv_prob = vp7 ? vp7_submv_prob : get_submv_prob(left, above); if (vp56_rac_get_prob_branchy(c, submv_prob[0])) { if (vp56_rac_get_prob_branchy(c, submv_prob[1])) { if (vp56_rac_get_prob_branchy(c, submv_prob[2])) { - mb->bmv[n].y = mb->mv.y + read_mv_component(c, s->prob->mvc[0]); - mb->bmv[n].x = mb->mv.x + read_mv_component(c, s->prob->mvc[1]); + mb->bmv[n].y = mb->mv.y + VPX(vp7, read_mv_component)(c, s->prob->mvc[0]); + mb->bmv[n].x = mb->mv.x + VPX(vp7, read_mv_component)(c, s->prob->mvc[1]); } else { AV_ZERO32(&mb->bmv[n]); } @@ -583,8 +824,120 @@ int decode_splitmvs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, int lay return num; } +/** + * the vp7 reference decoder uses a padding macroblock column (added to right + * edge of the frame) to guard against illegal macroblock offsets. The algorithm + * has bugs that permit offsets to straddle the padding column. This function + * replicates those bugs. + * @param[out] edge_x macroblock x address + * @param[out] edge_y macroblock y address + * @return macroblock offset legal (boolean) + */ +static int vp7_calculate_mb_offset(int mb_x, int mb_y, int mb_width, int xoffset, int yoffset, int boundary, int *edge_x, int *edge_y) +{ + int vwidth = mb_width + 1; + int new = (mb_y + yoffset) * vwidth + mb_x + xoffset; + if (new < boundary || new % vwidth == vwidth - 1) + return 0; + *edge_y = new / vwidth; + *edge_x = new % vwidth; + return 1; +} + +static const VP56mv * get_bmv_ptr(const VP8Macroblock *mb, int subblock) +{ + return &mb->bmv[mb->mode == VP8_MVMODE_SPLIT ? vp8_mbsplits[mb->partitioning][subblock] : 0]; +} + static av_always_inline -void decode_mvs(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, int layout) +void vp7_decode_mvs(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, int layout) +{ + VP8Macroblock *mb_edge[12]; + enum { CNT_ZERO, CNT_NEAREST, CNT_NEAR }; + enum { VP8_EDGE_TOP, VP8_EDGE_LEFT, VP8_EDGE_TOPLEFT }; + int idx = CNT_ZERO; + VP56mv near_mv[3]; + uint8_t cnt[3] = { 0 }; + VP56RangeCoder *c = &s->c; + int i; + + AV_ZERO32(&near_mv[0]); + AV_ZERO32(&near_mv[1]); + AV_ZERO32(&near_mv[2]); + + for (i = 0; i < VP7_MV_PRED_COUNT; i++) { + const VP7MVPred * pred = &vp7_mv_pred[i]; + int edge_x, edge_y; + + if (vp7_calculate_mb_offset(mb_x, mb_y, s->mb_width, pred->xoffset, pred->yoffset, !s->profile, &edge_x, &edge_y)) { + VP8Macroblock *edge = mb_edge[i] = (s->mb_layout == 1) ? + s->macroblocks_base + (s->mb_width+1)*(edge_y + 1) + 1 + edge_x : + s->macroblocks + (s->mb_height - edge_y - 1)*2 + edge_x; + uint32_t mv = AV_RN32A(get_bmv_ptr(edge, vp7_mv_pred[i].subblock)); + if (mv) { + if (AV_RN32A(&near_mv[CNT_NEAREST])) { + if (mv == AV_RN32A(&near_mv[CNT_NEAREST])) { + idx = CNT_NEAREST; + } else if (AV_RN32A(&near_mv[CNT_NEAR])) { + if (mv != AV_RN32A(&near_mv[CNT_NEAR])) + continue; + idx = CNT_NEAR; + } else { + AV_WN32A(&near_mv[CNT_NEAR], mv); + idx = CNT_NEAR; + } + } else { + AV_WN32A(&near_mv[CNT_NEAREST], mv); + idx = CNT_NEAREST; + } + } else { + idx = CNT_ZERO; + } + } else { + idx = CNT_ZERO; + } + cnt[idx] += vp7_mv_pred[i].score; + } + + mb->partitioning = VP8_SPLITMVMODE_NONE; + + if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_ZERO]][0])) { + mb->mode = VP8_MVMODE_MV; + + if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_NEAREST]][1])) { + + if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_NEAR]][2])) { + + if (cnt[CNT_NEAREST] > cnt[CNT_NEAR]) + AV_WN32A(&mb->mv, cnt[CNT_ZERO] > cnt[CNT_NEAREST] ? 0 : AV_RN32A(&near_mv[CNT_NEAREST])); + else + AV_WN32A(&mb->mv, cnt[CNT_ZERO] > cnt[CNT_NEAR] ? 0 : AV_RN32A(&near_mv[CNT_NEAR])); + + if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_NEAR]][3])) { + mb->mode = VP8_MVMODE_SPLIT; + mb->mv = mb->bmv[decode_splitmvs(s, c, mb, layout, 1) - 1]; + } else { + mb->mv.y += vp7_read_mv_component(c, s->prob->mvc[0]); + mb->mv.x += vp7_read_mv_component(c, s->prob->mvc[1]); + mb->bmv[0] = mb->mv; + } + } else { + mb->mv = near_mv[CNT_NEAR]; + mb->bmv[0] = mb->mv; + } + } else { + mb->mv = near_mv[CNT_NEAREST]; + mb->bmv[0] = mb->mv; + } + } else { + mb->mode = VP8_MVMODE_ZERO; + AV_ZERO32(&mb->mv); + mb->bmv[0] = mb->mv; + } +} + +static av_always_inline +void vp8_decode_mvs(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, int layout) { VP8Macroblock *mb_edge[3] = { 0 /* top */, mb - 1 /* left */, @@ -661,10 +1014,10 @@ void decode_mvs(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, int layout if (vp56_rac_get_prob_branchy(c, vp8_mode_contexts[cnt[CNT_SPLITMV]][3])) { mb->mode = VP8_MVMODE_SPLIT; - mb->mv = mb->bmv[decode_splitmvs(s, c, mb, layout) - 1]; + mb->mv = mb->bmv[decode_splitmvs(s, c, mb, layout, 0) - 1]; } else { - mb->mv.y += read_mv_component(c, s->prob->mvc[0]); - mb->mv.x += read_mv_component(c, s->prob->mvc[1]); + mb->mv.y += vp8_read_mv_component(c, s->prob->mvc[0]); + mb->mv.x += vp8_read_mv_component(c, s->prob->mvc[1]); mb->bmv[0] = mb->mv; } } else { @@ -716,17 +1069,32 @@ void decode_intra4x4_modes(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, } } +static const char * vp7_feature_name[] = { "q-index", "lf-delta", "partial-golden-update", "blit-pitch" }; + static av_always_inline void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, - uint8_t *segment, uint8_t *ref, int layout) + uint8_t *segment, uint8_t *ref, int layout, int vp7) { VP56RangeCoder *c = &s->c; - if (s->segmentation.update_map) { - int bit = vp56_rac_get_prob(c, s->prob->segmentid[0]); - *segment = vp56_rac_get_prob(c, s->prob->segmentid[1+bit]) + 2*bit; - } else if (s->segmentation.enabled) - *segment = ref ? *ref : *segment; + if (vp7) { + int i; + *segment = 0; + for (i = 0; i < 4; i++) { + if (s->feature_enabled[i]) { + if (vp56_rac_get_prob(c, s->feature_present_prob[i])) { + int index = vp8_rac_get_tree(c, vp7_feature_index_tree, s->feature_index_prob[i]); + av_log(s->avctx, AV_LOG_WARNING, "Feature %s present in macroblock (value 0x%x)\n", vp7_feature_name[i], s->feature_value[i][index]); + } + } + } + } else { + if (s->segmentation.update_map) { + int bit = vp56_rac_get_prob(c, s->prob->segmentid[0]); + *segment = vp56_rac_get_prob(c, s->prob->segmentid[1+bit]) + 2*bit; + } else if (s->segmentation.enabled) + *segment = ref ? *ref : *segment; + } mb->segment = *segment; mb->skip = s->mbskip_enabled ? vp56_rac_get_prob(c, s->prob->mbskip) : 0; @@ -737,7 +1105,7 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, if (mb->mode == MODE_I4x4) { decode_intra4x4_modes(s, c, mb, mb_x, 1, layout); } else { - const uint32_t modes = vp8_pred4x4_mode[mb->mode] * 0x01010101u; + const uint32_t modes = VPX(vp7, pred4x4_mode)[mb->mode] * 0x01010101u; if (s->mb_layout) AV_WN32A(mb->intra4x4_pred_mode_top, modes); else @@ -750,14 +1118,17 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, } else if (vp56_rac_get_prob_branchy(c, s->prob->intra)) { // inter MB, 16.2 if (vp56_rac_get_prob_branchy(c, s->prob->last)) - mb->ref_frame = vp56_rac_get_prob(c, s->prob->golden) ? + mb->ref_frame = (!vp7 && vp56_rac_get_prob(c, s->prob->golden)) ? VP56_FRAME_GOLDEN2 /* altref */ : VP56_FRAME_GOLDEN; else mb->ref_frame = VP56_FRAME_PREVIOUS; s->ref_count[mb->ref_frame-1]++; // motion vectors, 16.3 - decode_mvs(s, mb, mb_x, mb_y, layout); + if (vp7) + vp7_decode_mvs(s, mb, mb_x, mb_y, layout); + else + vp8_decode_mvs(s, mb, mb_x, mb_y, layout); } else { // intra MB, 16.1 mb->mode = vp8_rac_get_tree(c, vp8_pred16x16_tree_inter, s->prob->pred16x16); @@ -772,7 +1143,28 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, } } -#ifndef decode_block_coeffs_internal +static av_always_inline int inter_predict_dc(int16_t block[16], int16_t pred[2]) +{ + int16_t dc = block[0]; + int ret = 0; + + if (pred[1] > 3) { + dc += pred[0]; + ret = 1; + } + + if (!pred[0] || !dc || FFSIGN(pred[0]) != FFSIGN(dc)) { + block[0] = pred[0] = dc; + pred[1] = 0; + } else { + if (pred[0] == dc) + pred[1]++; + block[0] = pred[0] = dc; + } + + return ret; +} + /** * @param r arithmetic bitstream reader context * @param block destination for block coefficients @@ -782,14 +1174,17 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, * @return 0 if no coeffs were decoded * otherwise, the index of the last coeff decoded plus one */ -static int decode_block_coeffs_internal(VP56RangeCoder *r, int16_t block[16], +static av_always_inline +int decode_block_coeffs_internal(VP56RangeCoder *r, int16_t block[16], uint8_t probs[16][3][NUM_DCT_TOKENS-1], - int i, uint8_t *token_prob, int16_t qmul[2]) + int i, uint8_t *token_prob, int16_t qmul[2], + const uint8_t scan[16], int vp7) { VP56RangeCoder c = *r; goto skip_eob; do { int coeff; +restart: if (!vp56_rac_get_prob_branchy(&c, token_prob[0])) // DCT_EOB break; @@ -798,6 +1193,8 @@ skip_eob: if (++i == 16) break; // invalid input; blocks should end with EOB token_prob = probs[i][0]; + if (vp7) + goto restart; goto skip_eob; } @@ -830,12 +1227,28 @@ skip_eob: } token_prob = probs[i+1][2]; } - block[zigzag_scan[i]] = (vp8_rac_get(&c) ? -coeff : coeff) * qmul[!!i]; + block[scan[i]] = (vp8_rac_get(&c) ? -coeff : coeff) * qmul[!!i]; } while (++i < 16); *r = c; return i; } + +static int vp7_decode_block_coeffs_internal(VP56RangeCoder *r, int16_t block[16], + uint8_t probs[16][3][NUM_DCT_TOKENS-1], + int i, uint8_t *token_prob, int16_t qmul[2], + const uint8_t scan[16]) +{ + return decode_block_coeffs_internal(r, block, probs, i, token_prob, qmul, scan, 1); +} + +#ifndef vp8_decode_block_coeffs_internal +static int vp8_decode_block_coeffs_internal(VP56RangeCoder *r, int16_t block[16], + uint8_t probs[16][3][NUM_DCT_TOKENS-1], + int i, uint8_t *token_prob, int16_t qmul[2]) +{ + return decode_block_coeffs_internal(r, block, probs, i, token_prob, qmul, zigzag_scan, 0); +} #endif /** @@ -846,36 +1259,43 @@ skip_eob: * @param zero_nhood the initial prediction context for number of surrounding * all-zero blocks (only left/top, so 0-2) * @param qmul array holding the dc/ac dequant factor at position 0/1 + * @param scan scan pattern (VP7 only) * @return 0 if no coeffs were decoded * otherwise, the index of the last coeff decoded plus one */ static av_always_inline int decode_block_coeffs(VP56RangeCoder *c, int16_t block[16], uint8_t probs[16][3][NUM_DCT_TOKENS-1], - int i, int zero_nhood, int16_t qmul[2]) + int i, int zero_nhood, int16_t qmul[2], + const uint8_t scan[16], int vp7) { uint8_t *token_prob = probs[i][zero_nhood]; if (!vp56_rac_get_prob_branchy(c, token_prob[0])) // DCT_EOB return 0; - return decode_block_coeffs_internal(c, block, probs, i, token_prob, qmul); + return vp7 ? vp7_decode_block_coeffs_internal(c, block, probs, i, token_prob, qmul, scan) + : vp8_decode_block_coeffs_internal(c, block, probs, i, token_prob, qmul); } static av_always_inline void decode_mb_coeffs(VP8Context *s, VP8ThreadData *td, VP56RangeCoder *c, VP8Macroblock *mb, - uint8_t t_nnz[9], uint8_t l_nnz[9]) + uint8_t t_nnz[9], uint8_t l_nnz[9], int vp7) { int i, x, y, luma_start = 0, luma_ctx = 3; int nnz_pred, nnz, nnz_total = 0; int segment = mb->segment; int block_dc = 0; - if (mb->mode != MODE_I4x4 && mb->mode != VP8_MVMODE_SPLIT) { + if (mb->mode != MODE_I4x4 && (vp7 || mb->mode != VP8_MVMODE_SPLIT)) { nnz_pred = t_nnz[8] + l_nnz[8]; // decode DC values and do hadamard nnz = decode_block_coeffs(c, td->block_dc, s->prob->token[1], 0, nnz_pred, - s->qmat[segment].luma_dc_qmul); + s->qmat[segment].luma_dc_qmul, zigzag_scan, vp7); l_nnz[8] = t_nnz[8] = !!nnz; + + if (vp7 && mb->mode > MODE_I4x4) + nnz |= inter_predict_dc(td->block_dc, s->inter_dc_pred[mb->ref_frame - 1]); + if (nnz) { nnz_total += nnz; block_dc = 1; @@ -893,7 +1313,7 @@ void decode_mb_coeffs(VP8Context *s, VP8ThreadData *td, VP56RangeCoder *c, VP8Ma for (x = 0; x < 4; x++) { nnz_pred = l_nnz[y] + t_nnz[x]; nnz = decode_block_coeffs(c, td->block[y][x], s->prob->token[luma_ctx], luma_start, - nnz_pred, s->qmat[segment].luma_qmul); + nnz_pred, s->qmat[segment].luma_qmul, s->prob[0].scan, vp7); // nnz+block_dc may be one more than the actual last index, but we don't care td->non_zero_count_cache[y][x] = nnz + block_dc; t_nnz[x] = l_nnz[y] = !!nnz; @@ -908,7 +1328,7 @@ void decode_mb_coeffs(VP8Context *s, VP8ThreadData *td, VP56RangeCoder *c, VP8Ma for (x = 0; x < 2; x++) { nnz_pred = l_nnz[i+2*y] + t_nnz[i+2*x]; nnz = decode_block_coeffs(c, td->block[i][(y<<1)+x], s->prob->token[2], 0, - nnz_pred, s->qmat[segment].chroma_qmul); + nnz_pred, s->qmat[segment].chroma_qmul, s->prob[0].scan, vp7); td->non_zero_count_cache[i][(y<<1)+x] = nnz; t_nnz[i+2*x] = l_nnz[i+2*y] = !!nnz; nnz_total += nnz; @@ -974,43 +1394,43 @@ int check_dc_pred8x8_mode(int mode, int mb_x, int mb_y) } static av_always_inline -int check_tm_pred8x8_mode(int mode, int mb_x, int mb_y) +int check_tm_pred8x8_mode(int mode, int mb_x, int mb_y, int vp7) { if (!mb_x) { - return mb_y ? VERT_PRED8x8 : DC_129_PRED8x8; + return mb_y ? VERT_PRED8x8 : (vp7 ? DC_128_PRED8x8 : DC_129_PRED8x8); } else { return mb_y ? mode : HOR_PRED8x8; } } static av_always_inline -int check_intra_pred8x8_mode_emuedge(int mode, int mb_x, int mb_y) +int check_intra_pred8x8_mode_emuedge(int mode, int mb_x, int mb_y, int vp7) { switch (mode) { case DC_PRED8x8: return check_dc_pred8x8_mode(mode, mb_x, mb_y); case VERT_PRED8x8: - return !mb_y ? DC_127_PRED8x8 : mode; + return !mb_y ? (vp7 ? DC_128_PRED8x8 : DC_127_PRED8x8) : mode; case HOR_PRED8x8: - return !mb_x ? DC_129_PRED8x8 : mode; + return !mb_x ? (vp7 ? DC_128_PRED8x8 : DC_129_PRED8x8) : mode; case PLANE_PRED8x8 /*TM*/: - return check_tm_pred8x8_mode(mode, mb_x, mb_y); + return check_tm_pred8x8_mode(mode, mb_x, mb_y, vp7); } return mode; } static av_always_inline -int check_tm_pred4x4_mode(int mode, int mb_x, int mb_y) +int check_tm_pred4x4_mode(int mode, int mb_x, int mb_y, int vp7) { if (!mb_x) { - return mb_y ? VERT_VP8_PRED : DC_129_PRED; + return mb_y ? VERT_VP8_PRED : (vp7 ? DC_128_PRED : DC_129_PRED); } else { return mb_y ? mode : HOR_VP8_PRED; } } static av_always_inline -int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf) +int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf, int vp7) { switch (mode) { case VERT_PRED: @@ -1021,7 +1441,7 @@ int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf /* fall-through */ case DIAG_DOWN_LEFT_PRED: case VERT_LEFT_PRED: - return !mb_y ? DC_127_PRED : mode; + return !mb_y ? (vp7 ? DC_128_PRED : DC_127_PRED) : mode; case HOR_PRED: if (!mb_y) { *copy_buf = 1; @@ -1029,9 +1449,9 @@ int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf } /* fall-through */ case HOR_UP_PRED: - return !mb_x ? DC_129_PRED : mode; + return !mb_x ? (vp7 ? DC_128_PRED : DC_129_PRED) : mode; case TM_VP8_PRED: - return check_tm_pred4x4_mode(mode, mb_x, mb_y); + return check_tm_pred4x4_mode(mode, mb_x, mb_y, vp7); case DC_PRED: // 4x4 DC doesn't use the same "H.264-style" exceptions as 16x16/8x8 DC case DIAG_DOWN_RIGHT_PRED: case VERT_RIGHT_PRED: @@ -1045,7 +1465,7 @@ int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf static av_always_inline void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], - VP8Macroblock *mb, int mb_x, int mb_y) + VP8Macroblock *mb, int mb_x, int mb_y, int vp7) { int x, y, mode, nnz; uint32_t tr; @@ -1058,12 +1478,14 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], s->filter.simple, 1); if (mb->mode < MODE_I4x4) { - mode = check_intra_pred8x8_mode_emuedge(mb->mode, mb_x, mb_y); + mode = check_intra_pred8x8_mode_emuedge(mb->mode, mb_x, mb_y, vp7); s->hpc.pred16x16[mode](dst[0], s->linesize); } else { uint8_t *ptr = dst[0]; uint8_t *intra4x4 = mb->intra4x4_pred_mode_mb; - uint8_t tr_top[4] = { 127, 127, 127, 127 }; + const uint8_t lo = vp7 ? 128 : 127; + const uint8_t hi = vp7 ? 128 : 129; + uint8_t tr_top[4] = { lo, lo, lo, lo }; // all blocks on the right edge of the macroblock use bottom edge // the top macroblock for their topright edge @@ -1092,17 +1514,17 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], } else if (x == 3) topright = tr_right; - mode = check_intra_pred4x4_mode_emuedge(intra4x4[x], mb_x + x, mb_y + y, ©); + mode = check_intra_pred4x4_mode_emuedge(intra4x4[x], mb_x + x, mb_y + y, ©, vp7); if (copy) { dst = copy_dst + 12; linesize = 8; if (!(mb_y + y)) { - copy_dst[3] = 127U; - AV_WN32A(copy_dst+4, 127U * 0x01010101U); + copy_dst[3] = lo; + AV_WN32A(copy_dst+4, lo * 0x01010101U); } else { AV_COPY32(copy_dst+4, ptr+4*x-s->linesize); if (!(mb_x + x)) { - copy_dst[3] = 129U; + copy_dst[3] = hi; } else { copy_dst[3] = ptr[4*x-s->linesize-1]; } @@ -1111,7 +1533,7 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], copy_dst[11] = copy_dst[19] = copy_dst[27] = - copy_dst[35] = 129U; + copy_dst[35] = hi; } else { copy_dst[11] = ptr[4*x -1]; copy_dst[19] = ptr[4*x+s->linesize -1]; @@ -1142,7 +1564,7 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], } } - mode = check_intra_pred8x8_mode_emuedge(mb->chroma_pred_mode, mb_x, mb_y); + mode = check_intra_pred8x8_mode_emuedge(mb->chroma_pred_mode, mb_x, mb_y, vp7); s->hpc.pred8x8[mode](dst[1], s->uvlinesize); s->hpc.pred8x8[mode](dst[2], s->uvlinesize); @@ -1296,7 +1718,7 @@ void vp8_mc_part(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], s->put_pixels_tab[block_w == 8]); /* U/V */ - if (s->profile == 3) { + if (s->profile == 3) { /* this block only applies VP8; it is safe to check only the profile, as VP7 profile <= 1 */ uvmv.x &= ~7; uvmv.y &= ~7; } @@ -1468,7 +1890,7 @@ chroma_idct_end: ; } } -static av_always_inline void filter_level_for_mb(VP8Context *s, VP8Macroblock *mb, VP8FilterStrength *f ) +static av_always_inline void filter_level_for_mb(VP8Context *s, VP8Macroblock *mb, VP8FilterStrength *f, int vp7) { int interior_limit, filter_level; @@ -1495,12 +1917,12 @@ static av_always_inline void filter_level_for_mb(VP8Context *s, VP8Macroblock *m f->filter_level = filter_level; f->inner_limit = interior_limit; - f->inner_filter = !mb->skip || mb->mode == MODE_I4x4 || mb->mode == VP8_MVMODE_SPLIT; + f->inner_filter = vp7 || !mb->skip || mb->mode == MODE_I4x4 || mb->mode == VP8_MVMODE_SPLIT; } -static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8FilterStrength *f, int mb_x, int mb_y) +static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8FilterStrength *f, int mb_x, int mb_y, int vp7) { - int mbedge_lim, bedge_lim, hev_thresh; + int mbedge_lim, bedge_lim_y, bedge_lim_uv, hev_thresh; int filter_level = f->filter_level; int inner_limit = f->inner_limit; int inner_filter = f->inner_filter; @@ -1520,8 +1942,15 @@ static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8Filter if (!filter_level) return; - bedge_lim = 2*filter_level + inner_limit; - mbedge_lim = bedge_lim + 4; + if (vp7) { + bedge_lim_y = filter_level; + bedge_lim_uv = 2*filter_level; + mbedge_lim = filter_level + 2; + } else { + bedge_lim_y = + bedge_lim_uv = 2*filter_level + inner_limit; + mbedge_lim = bedge_lim_y + 4; + } hev_thresh = hev_thresh_lut[s->keyframe][filter_level]; @@ -1532,18 +1961,21 @@ static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8Filter mbedge_lim, inner_limit, hev_thresh); } - if (inner_filter) { - s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 4, linesize, bedge_lim, - inner_limit, hev_thresh); - s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 8, linesize, bedge_lim, - inner_limit, hev_thresh); - s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+12, linesize, bedge_lim, - inner_limit, hev_thresh); - s->vp8dsp.vp8_h_loop_filter8uv_inner(dst[1] + 4, dst[2] + 4, - uvlinesize, bedge_lim, - inner_limit, hev_thresh); +#define H_LOOP_FILTER_16Y_INNER(cond) \ + if (cond && inner_filter) {\ + s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 4, linesize, bedge_lim_y,\ + inner_limit, hev_thresh);\ + s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 8, linesize, bedge_lim_y,\ + inner_limit, hev_thresh);\ + s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+12, linesize, bedge_lim_y,\ + inner_limit, hev_thresh);\ + s->vp8dsp.vp8_h_loop_filter8uv_inner(dst[1] + 4, dst[2] + 4,\ + uvlinesize, bedge_lim_uv,\ + inner_limit, hev_thresh);\ } + H_LOOP_FILTER_16Y_INNER(!vp7) + if (mb_y) { s->vp8dsp.vp8_v_loop_filter16y(dst[0], linesize, mbedge_lim, inner_limit, hev_thresh); @@ -1553,19 +1985,21 @@ static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8Filter if (inner_filter) { s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+ 4*linesize, - linesize, bedge_lim, + linesize, bedge_lim_y, inner_limit, hev_thresh); s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+ 8*linesize, - linesize, bedge_lim, + linesize, bedge_lim_y, inner_limit, hev_thresh); s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+12*linesize, - linesize, bedge_lim, + linesize, bedge_lim_y, inner_limit, hev_thresh); s->vp8dsp.vp8_v_loop_filter8uv_inner(dst[1] + 4 * uvlinesize, dst[2] + 4 * uvlinesize, - uvlinesize, bedge_lim, + uvlinesize, bedge_lim_uv, inner_limit, hev_thresh); } + + H_LOOP_FILTER_16Y_INNER(vp7) } static av_always_inline void filter_mb_simple(VP8Context *s, uint8_t *dst, VP8FilterStrength *f, int mb_x, int mb_y) @@ -1600,8 +2034,9 @@ static av_always_inline void filter_mb_simple(VP8Context *s, uint8_t *dst, VP8Fi } #define MARGIN (16 << 2) -static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe, - VP8Frame *prev_frame) +static av_always_inline +void decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe, + VP8Frame *prev_frame, int vp7) { VP8Context *s = avctx->priv_data; int mb_x, mb_y; @@ -1621,7 +2056,7 @@ static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe, AV_WN32A((mb-s->mb_width-1)->intra4x4_pred_mode_top, DC_PRED*0x01010101); decode_mb_mode(s, mb, mb_x, mb_y, curframe->seg_map->data + mb_xy, prev_frame && prev_frame->seg_map ? - prev_frame->seg_map->data + mb_xy : NULL, 1); + prev_frame->seg_map->data + mb_xy : NULL, 1, vp7); s->mv_min.x -= 64; s->mv_max.x -= 64; } @@ -1630,6 +2065,22 @@ static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe, } } +#if CONFIG_VP7_DECODER +static void vp7_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe, + VP8Frame *prev_frame) +{ + decode_mv_mb_modes(avctx, curframe, prev_frame, 1); +} +#endif + +#if CONFIG_VP8_DECODER +static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe, + VP8Frame *prev_frame) +{ + decode_mv_mb_modes(avctx, curframe, prev_frame, 0); +} +#endif + #if HAVE_THREADS #define check_thread_pos(td, otd, mb_x_check, mb_y_check)\ do {\ @@ -1667,8 +2118,8 @@ static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe, #define update_pos(td, mb_y, mb_x) #endif -static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, - int jobnr, int threadnr) +static av_always_inline void decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, + int jobnr, int threadnr, int vp7) { VP8Context *s = avctx->priv_data; VP8ThreadData *prev_td, *next_td, *td = &s->thread_data[threadnr]; @@ -1700,7 +2151,8 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, AV_WN32A(s->intra4x4_pred_mode_left, DC_PRED*0x01010101); } - memset(td->left_nnz, 0, sizeof(td->left_nnz)); + if (!vp7 || mb_y == 0) + memset(td->left_nnz, 0, sizeof(td->left_nnz)); s->mv_min.x = -MARGIN; s->mv_max.x = ((s->mb_width - 1) << 6) + MARGIN; @@ -1709,9 +2161,9 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, // Wait for previous thread to read mb_x+2, and reach mb_y-1. if (prev_td != td) { if (threadnr != 0) { - check_thread_pos(td, prev_td, mb_x+1, mb_y-1); + check_thread_pos(td, prev_td, mb_x+(vp7?2:1), mb_y-(vp7?2:1)); } else { - check_thread_pos(td, prev_td, (s->mb_width+3) + (mb_x+1), mb_y-1); + check_thread_pos(td, prev_td, (s->mb_width+3) + (mb_x+(vp7?2:1)), mb_y-(vp7?2:1)); } } @@ -1721,15 +2173,15 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, if (!s->mb_layout) decode_mb_mode(s, mb, mb_x, mb_y, curframe->seg_map->data + mb_xy, prev_frame && prev_frame->seg_map ? - prev_frame->seg_map->data + mb_xy : NULL, 0); + prev_frame->seg_map->data + mb_xy : NULL, 0, vp7); prefetch_motion(s, mb, mb_x, mb_y, mb_xy, VP56_FRAME_PREVIOUS); if (!mb->skip) - decode_mb_coeffs(s, td, c, mb, s->top_nnz[mb_x], td->left_nnz); + decode_mb_coeffs(s, td, c, mb, s->top_nnz[mb_x], td->left_nnz, vp7); if (mb->mode <= MODE_I4x4) - intra_predict(s, td, dst, mb, mb_x, mb_y); + intra_predict(s, td, dst, mb, mb_x, mb_y, vp7); else inter_predict(s, td, dst, mb, mb_x, mb_y); @@ -1749,7 +2201,7 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, } if (s->deblock_filter) - filter_level_for_mb(s, mb, &td->filter_strength[mb_x]); + filter_level_for_mb(s, mb, &td->filter_strength[mb_x], vp7); if (s->deblock_filter && num_jobs != 1 && threadnr == num_jobs-1) { if (s->filter.simple) @@ -1774,8 +2226,24 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, } } -static void vp8_filter_mb_row(AVCodecContext *avctx, void *tdata, - int jobnr, int threadnr) +#if CONFIG_VP7_DECODER +static void vp7_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, + int jobnr, int threadnr) +{ + decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr, 1); +} +#endif + +#if CONFIG_VP8_DECODER +static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, + int jobnr, int threadnr) +{ + decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr, 0); +} +#endif + +static av_always_inline void filter_mb_row(AVCodecContext *avctx, void *tdata, + int jobnr, int threadnr, int vp7) { VP8Context *s = avctx->priv_data; VP8ThreadData *td = &s->thread_data[threadnr]; @@ -1819,7 +2287,7 @@ static void vp8_filter_mb_row(AVCodecContext *avctx, void *tdata, if (s->filter.simple) filter_mb_simple(s, dst[0], f, mb_x, mb_y); else - filter_mb(s, dst, f, mb_x, mb_y); + filter_mb(s, dst, f, mb_x, mb_y, vp7); dst[0] += 16; dst[1] += 8; dst[2] += 8; @@ -1828,6 +2296,22 @@ static void vp8_filter_mb_row(AVCodecContext *avctx, void *tdata, } } +#if CONFIG_VP7_DECODER +static void vp7_filter_mb_row(AVCodecContext *avctx, void *tdata, + int jobnr, int threadnr) +{ + filter_mb_row(avctx, tdata, jobnr, threadnr, 1); +} +#endif + +#if CONFIG_VP8_DECODER +static void vp8_filter_mb_row(AVCodecContext *avctx, void *tdata, + int jobnr, int threadnr) +{ + filter_mb_row(avctx, tdata, jobnr, threadnr, 0); +} +#endif + static int vp8_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata, int jobnr, int threadnr) { @@ -1840,9 +2324,9 @@ static int vp8_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata, for (mb_y = jobnr; mb_y < s->mb_height; mb_y += num_jobs) { if (mb_y >= s->mb_height) break; td->thread_mb_pos = mb_y<<16; - vp8_decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr); + s->decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr); if (s->deblock_filter) - vp8_filter_mb_row(avctx, tdata, jobnr, threadnr); + s->filter_mb_row(avctx, tdata, jobnr, threadnr); update_pos(td, mb_y, INT_MAX & 0xFFFF); s->mv_min.y -= 64; @@ -1863,7 +2347,7 @@ int ff_vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, enum AVDiscard skip_thresh; VP8Frame *av_uninit(curframe), *prev_frame; - if ((ret = decode_frame_header(s, avpkt->data, avpkt->size)) < 0) + if ((ret = VPX(s->vp7, decode_frame_header)(s, avpkt->data, avpkt->size)) < 0) goto err; prev_frame = s->framep[VP56_FRAME_CURRENT]; @@ -1947,7 +2431,7 @@ int ff_vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (prev_frame && s->segmentation.enabled && !s->segmentation.update_map) ff_thread_await_progress(&prev_frame->tf, 1, 0); - vp8_decode_mv_mb_modes(avctx, curframe, prev_frame); + VPX(s->vp7, decode_mv_mb_modes)(avctx, curframe, prev_frame); } if (avctx->active_thread_type == FF_THREAD_FRAME) @@ -2015,12 +2499,16 @@ av_cold int ff_vp8_decode_init(AVCodecContext *avctx) int ret; s->avctx = avctx; + s->vp7 = avctx->codec->id == AV_CODEC_ID_VP7; avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->internal->allocate_progress = 1; ff_videodsp_init(&s->vdsp, 8); - ff_h264_pred_init(&s->hpc, AV_CODEC_ID_VP8, 8, 1); - ff_vp8dsp_init(&s->vp8dsp, 0); + ff_h264_pred_init(&s->hpc, s->vp7 ? AV_CODEC_ID_VP7 : AV_CODEC_ID_VP8, 8, 1); + ff_vp8dsp_init(&s->vp8dsp, s->vp7); + + s->decode_mb_row_no_filter = VPX(s->vp7, decode_mb_row_no_filter); + s->filter_mb_row = VPX(s->vp7, filter_mb_row); if ((ret = vp8_init_frames(s)) < 0) { ff_vp8_decode_free(avctx); @@ -2030,6 +2518,7 @@ av_cold int ff_vp8_decode_init(AVCodecContext *avctx) return 0; } +#if CONFIG_VP8_DECODER static av_cold int vp8_decode_init_thread_copy(AVCodecContext *avctx) { VP8Context *s = avctx->priv_data; @@ -2080,7 +2569,24 @@ static int vp8_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo return 0; } +#endif +#if CONFIG_VP7_DECODER +AVCodec ff_vp7_decoder = { + .name = "vp7", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP7"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_VP7, + .priv_data_size = sizeof(VP8Context), + .init = ff_vp8_decode_init, + .close = ff_vp8_decode_free, + .decode = ff_vp8_decode_frame, + .capabilities = CODEC_CAP_DR1, + .flush = vp8_decode_flush, +}; +#endif + +#if CONFIG_VP8_DECODER AVCodec ff_vp8_decoder = { .name = "vp8", .long_name = NULL_IF_CONFIG_SMALL("On2 VP8"), @@ -2095,4 +2601,5 @@ AVCodec ff_vp8_decoder = { .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp8_decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context), }; +#endif -- cgit v1.2.3