X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fsvq3.c;h=56b5fb40b9a0700554e0e8570996162ab4355608;hb=5c4b98de4d101ea715ef86847306a510afd0db0c;hp=265ca6d94e18a25b3ea3920580b9a57cf20ceaab;hpb=d24e9a99a40166bf881ccd2e3ae5688af4726658;p=ffmpeg diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 265ca6d94e1..56b5fb40b9a 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -40,6 +40,8 @@ * http://samples.libav.org/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov */ +#include + #include "libavutil/attributes.h" #include "internal.h" #include "avcodec.h" @@ -52,6 +54,7 @@ #include "golomb.h" #include "hpeldsp.h" #include "rectangle.h" +#include "tpeldsp.h" #if CONFIG_ZLIB #include @@ -65,9 +68,10 @@ * svq3 decoder. */ -typedef struct { +typedef struct SVQ3Context { H264Context h; HpelDSPContext hdsp; + TpelDSPContext tdsp; H264Picture *cur_pic; H264Picture *next_pic; H264Picture *last_pic; @@ -319,9 +323,9 @@ static inline void svq3_mc_dir_part(SVQ3Context *s, src = h->edge_emu_buffer; } if (thirdpel) - (avg ? h->dsp.avg_tpel_pixels_tab - : h->dsp.put_tpel_pixels_tab)[dxy](dest, src, h->linesize, - width, height); + (avg ? s->tdsp.avg_tpel_pixels_tab + : s->tdsp.put_tpel_pixels_tab)[dxy](dest, src, h->linesize, + width, height); else (avg ? s->hdsp.avg_pixels_tab : s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src, h->linesize, @@ -347,10 +351,10 @@ static inline void svq3_mc_dir_part(SVQ3Context *s, src = h->edge_emu_buffer; } if (thirdpel) - (avg ? h->dsp.avg_tpel_pixels_tab - : h->dsp.put_tpel_pixels_tab)[dxy](dest, src, - h->uvlinesize, - width, height); + (avg ? s->tdsp.avg_tpel_pixels_tab + : s->tdsp.put_tpel_pixels_tab)[dxy](dest, src, + h->uvlinesize, + width, height); else (avg ? s->hdsp.avg_pixels_tab : s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src, @@ -365,6 +369,7 @@ static inline int svq3_mc_dir(SVQ3Context *s, int size, int mode, { int i, j, k, mx, my, dx, dy, x, y; H264Context *h = &s->h; + H264SliceContext *sl = &h->slice_ctx[0]; const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1); const int part_height = 16 >> ((unsigned)(size + 1) / 3); const int extra_width = (mode == PREDICT_MODE) ? -16 * 6 : 0; @@ -373,16 +378,16 @@ static inline int svq3_mc_dir(SVQ3Context *s, int size, int mode, for (i = 0; i < 16; i += part_height) for (j = 0; j < 16; j += part_width) { - const int b_xy = (4 * h->mb_x + (j >> 2)) + - (4 * h->mb_y + (i >> 2)) * h->b_stride; + const int b_xy = (4 * sl->mb_x + (j >> 2)) + + (4 * sl->mb_y + (i >> 2)) * h->b_stride; int dxy; - x = 16 * h->mb_x + j; - y = 16 * h->mb_y + i; + x = 16 * sl->mb_x + j; + y = 16 * sl->mb_y + i; k = (j >> 2 & 1) + (i >> 1 & 2) + (j >> 1 & 4) + (i & 8); if (mode != PREDICT_MODE) { - pred_motion(h, k, part_width >> 2, dir, 1, &mx, &my); + pred_motion(h, sl, k, part_width >> 2, dir, 1, &mx, &my); } else { mx = s->next_pic->motion_val[0][b_xy][0] << 1; my = s->next_pic->motion_val[0][b_xy][1] << 1; @@ -454,15 +459,15 @@ static inline int svq3_mc_dir(SVQ3Context *s, int size, int mode, int32_t mv = pack16to32(mx, my); if (part_height == 8 && i < 8) { - AV_WN32A(h->mv_cache[dir][scan8[k] + 1 * 8], mv); + AV_WN32A(sl->mv_cache[dir][scan8[k] + 1 * 8], mv); if (part_width == 8 && j < 8) - AV_WN32A(h->mv_cache[dir][scan8[k] + 1 + 1 * 8], mv); + AV_WN32A(sl->mv_cache[dir][scan8[k] + 1 + 1 * 8], mv); } if (part_width == 8 && j < 8) - AV_WN32A(h->mv_cache[dir][scan8[k] + 1], mv); + AV_WN32A(sl->mv_cache[dir][scan8[k] + 1], mv); if (part_width == 4 || part_height == 4) - AV_WN32A(h->mv_cache[dir][scan8[k]], mv); + AV_WN32A(sl->mv_cache[dir][scan8[k]], mv); } /* write back motion vectors */ @@ -477,25 +482,26 @@ static inline int svq3_mc_dir(SVQ3Context *s, int size, int mode, static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) { H264Context *h = &s->h; + H264SliceContext *sl = &h->slice_ctx[0]; int i, j, k, m, dir, mode; int cbp = 0; uint32_t vlc; int8_t *top, *left; - const int mb_xy = h->mb_xy; - const int b_xy = 4 * h->mb_x + 4 * h->mb_y * h->b_stride; + const int mb_xy = sl->mb_xy; + const int b_xy = 4 * sl->mb_x + 4 * sl->mb_y * h->b_stride; - h->top_samples_available = (h->mb_y == 0) ? 0x33FF : 0xFFFF; - h->left_samples_available = (h->mb_x == 0) ? 0x5F5F : 0xFFFF; - h->topright_samples_available = 0xFFFF; + sl->top_samples_available = (sl->mb_y == 0) ? 0x33FF : 0xFFFF; + sl->left_samples_available = (sl->mb_x == 0) ? 0x5F5F : 0xFFFF; + sl->topright_samples_available = 0xFFFF; if (mb_type == 0) { /* SKIP */ if (h->pict_type == AV_PICTURE_TYPE_P || s->next_pic->mb_type[mb_xy] == -1) { - svq3_mc_dir_part(s, 16 * h->mb_x, 16 * h->mb_y, 16, 16, + svq3_mc_dir_part(s, 16 * sl->mb_x, 16 * sl->mb_y, 16, 16, 0, 0, 0, 0, 0, 0); if (h->pict_type == AV_PICTURE_TYPE_B) - svq3_mc_dir_part(s, 16 * h->mb_x, 16 * h->mb_y, 16, 16, + svq3_mc_dir_part(s, 16 * sl->mb_x, 16 * sl->mb_y, 16, 16, 0, 0, 0, 0, 1, 1); mb_type = MB_TYPE_SKIP; @@ -527,38 +533,38 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) */ for (m = 0; m < 2; m++) { - if (h->mb_x > 0 && h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6] != -1) { + if (sl->mb_x > 0 && sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6] != -1) { for (i = 0; i < 4; i++) - AV_COPY32(h->mv_cache[m][scan8[0] - 1 + i * 8], + AV_COPY32(sl->mv_cache[m][scan8[0] - 1 + i * 8], h->cur_pic.motion_val[m][b_xy - 1 + i * h->b_stride]); } else { for (i = 0; i < 4; i++) - AV_ZERO32(h->mv_cache[m][scan8[0] - 1 + i * 8]); + AV_ZERO32(sl->mv_cache[m][scan8[0] - 1 + i * 8]); } - if (h->mb_y > 0) { - memcpy(h->mv_cache[m][scan8[0] - 1 * 8], + if (sl->mb_y > 0) { + memcpy(sl->mv_cache[m][scan8[0] - 1 * 8], h->cur_pic.motion_val[m][b_xy - h->b_stride], 4 * 2 * sizeof(int16_t)); - memset(&h->ref_cache[m][scan8[0] - 1 * 8], - (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4); + memset(&sl->ref_cache[m][scan8[0] - 1 * 8], + (sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4); - if (h->mb_x < h->mb_width - 1) { - AV_COPY32(h->mv_cache[m][scan8[0] + 4 - 1 * 8], + if (sl->mb_x < h->mb_width - 1) { + AV_COPY32(sl->mv_cache[m][scan8[0] + 4 - 1 * 8], h->cur_pic.motion_val[m][b_xy - h->b_stride + 4]); - h->ref_cache[m][scan8[0] + 4 - 1 * 8] = - (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride + 1] + 6] == -1 || - h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1; + sl->ref_cache[m][scan8[0] + 4 - 1 * 8] = + (sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride + 1] + 6] == -1 || + sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1; } else - h->ref_cache[m][scan8[0] + 4 - 1 * 8] = PART_NOT_AVAILABLE; - if (h->mb_x > 0) { - AV_COPY32(h->mv_cache[m][scan8[0] - 1 - 1 * 8], + sl->ref_cache[m][scan8[0] + 4 - 1 * 8] = PART_NOT_AVAILABLE; + if (sl->mb_x > 0) { + AV_COPY32(sl->mv_cache[m][scan8[0] - 1 - 1 * 8], h->cur_pic.motion_val[m][b_xy - h->b_stride - 1]); - h->ref_cache[m][scan8[0] - 1 - 1 * 8] = - (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride - 1] + 3] == -1) ? PART_NOT_AVAILABLE : 1; + sl->ref_cache[m][scan8[0] - 1 - 1 * 8] = + (sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride - 1] + 3] == -1) ? PART_NOT_AVAILABLE : 1; } else - h->ref_cache[m][scan8[0] - 1 - 1 * 8] = PART_NOT_AVAILABLE; + sl->ref_cache[m][scan8[0] - 1 - 1 * 8] = PART_NOT_AVAILABLE; } else - memset(&h->ref_cache[m][scan8[0] - 1 * 8 - 1], + memset(&sl->ref_cache[m][scan8[0] - 1 * 8 - 1], PART_NOT_AVAILABLE, 8); if (h->pict_type != AV_PICTURE_TYPE_B) @@ -590,23 +596,23 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) mb_type = MB_TYPE_16x16; } else if (mb_type == 8 || mb_type == 33) { /* INTRA4x4 */ - memset(h->intra4x4_pred_mode_cache, -1, 8 * 5 * sizeof(int8_t)); + memset(sl->intra4x4_pred_mode_cache, -1, 8 * 5 * sizeof(int8_t)); if (mb_type == 8) { - if (h->mb_x > 0) { + if (sl->mb_x > 0) { for (i = 0; i < 4; i++) - h->intra4x4_pred_mode_cache[scan8[0] - 1 + i * 8] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6 - i]; - if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) - h->left_samples_available = 0x5F5F; + sl->intra4x4_pred_mode_cache[scan8[0] - 1 + i * 8] = sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6 - i]; + if (sl->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) + sl->left_samples_available = 0x5F5F; } - if (h->mb_y > 0) { - h->intra4x4_pred_mode_cache[4 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 0]; - h->intra4x4_pred_mode_cache[5 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 1]; - h->intra4x4_pred_mode_cache[6 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 2]; - h->intra4x4_pred_mode_cache[7 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 3]; - - if (h->intra4x4_pred_mode_cache[4 + 8 * 0] == -1) - h->top_samples_available = 0x33FF; + if (sl->mb_y > 0) { + sl->intra4x4_pred_mode_cache[4 + 8 * 0] = sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 0]; + sl->intra4x4_pred_mode_cache[5 + 8 * 0] = sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 1]; + sl->intra4x4_pred_mode_cache[6 + 8 * 0] = sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 2]; + sl->intra4x4_pred_mode_cache[7 + 8 * 0] = sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 3]; + + if (sl->intra4x4_pred_mode_cache[4 + 8 * 0] == -1) + sl->top_samples_available = 0x33FF; } /* decode prediction codes for luma blocks */ @@ -614,12 +620,13 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) vlc = svq3_get_ue_golomb(&h->gb); if (vlc >= 25) { - av_log(h->avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc); + av_log(h->avctx, AV_LOG_ERROR, + "luma prediction:%"PRIu32"\n", vlc); return -1; } - left = &h->intra4x4_pred_mode_cache[scan8[i] - 1]; - top = &h->intra4x4_pred_mode_cache[scan8[i] - 8]; + left = &sl->intra4x4_pred_mode_cache[scan8[i] - 1]; + top = &sl->intra4x4_pred_mode_cache[scan8[i] - 8]; left[1] = svq3_pred_1[top[0] + 1][left[0] + 1][svq3_pred_0[vlc][0]]; left[2] = svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]]; @@ -631,22 +638,22 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) } } else { /* mb_type == 33, DC_128_PRED block type */ for (i = 0; i < 4; i++) - memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8 * i], DC_PRED, 4); + memset(&sl->intra4x4_pred_mode_cache[scan8[0] + 8 * i], DC_PRED, 4); } - write_back_intra_pred_mode(h); + write_back_intra_pred_mode(h, sl); if (mb_type == 8) { - ff_h264_check_intra4x4_pred_mode(h); + ff_h264_check_intra4x4_pred_mode(h, sl); - h->top_samples_available = (h->mb_y == 0) ? 0x33FF : 0xFFFF; - h->left_samples_available = (h->mb_x == 0) ? 0x5F5F : 0xFFFF; + sl->top_samples_available = (sl->mb_y == 0) ? 0x33FF : 0xFFFF; + sl->left_samples_available = (sl->mb_x == 0) ? 0x5F5F : 0xFFFF; } else { for (i = 0; i < 4; i++) - memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8 * i], DC_128_PRED, 4); + memset(&sl->intra4x4_pred_mode_cache[scan8[0] + 8 * i], DC_128_PRED, 4); - h->top_samples_available = 0x33FF; - h->left_samples_available = 0x5F5F; + sl->top_samples_available = 0x33FF; + sl->left_samples_available = 0x5F5F; } mb_type = MB_TYPE_INTRA4x4; @@ -654,9 +661,9 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) dir = i_mb_type_info[mb_type - 8].pred_mode; dir = (dir >> 1) ^ 3 * (dir & 1) ^ 1; - if ((h->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, dir, 0)) < 0) { + if ((sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, sl, dir, 0)) < 0) { av_log(h->avctx, AV_LOG_ERROR, "ff_h264_check_intra_pred_mode < 0\n"); - return h->intra16x16_pred_mode; + return sl->intra16x16_pred_mode; } cbp = i_mb_type_info[mb_type - 8].cbp; @@ -674,16 +681,16 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) } } if (!IS_INTRA4x4(mb_type)) { - memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy], DC_PRED, 8); + memset(sl->intra4x4_pred_mode + h->mb2br_xy[mb_xy], DC_PRED, 8); } if (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B) { - memset(h->non_zero_count_cache + 8, 0, 14 * 8 * sizeof(uint8_t)); + memset(sl->non_zero_count_cache + 8, 0, 14 * 8 * sizeof(uint8_t)); } if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B)) { if ((vlc = svq3_get_ue_golomb(&h->gb)) >= 48) { - av_log(h->avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc); + av_log(h->avctx, AV_LOG_ERROR, "cbp_vlc=%"PRIu32"\n", vlc); return -1; } @@ -692,17 +699,17 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) } if (IS_INTRA16x16(mb_type) || (h->pict_type != AV_PICTURE_TYPE_I && s->adaptive_quant && cbp)) { - h->qscale += svq3_get_se_golomb(&h->gb); + sl->qscale += svq3_get_se_golomb(&h->gb); - if (h->qscale > 31u) { - av_log(h->avctx, AV_LOG_ERROR, "qscale:%d\n", h->qscale); + if (sl->qscale > 31u) { + av_log(h->avctx, AV_LOG_ERROR, "qscale:%d\n", sl->qscale); return -1; } } if (IS_INTRA16x16(mb_type)) { - AV_ZERO128(h->mb_luma_dc[0] + 0); - AV_ZERO128(h->mb_luma_dc[0] + 8); - if (svq3_decode_block(&h->gb, h->mb_luma_dc[0], 0, 1)) { + AV_ZERO128(sl->mb_luma_dc[0] + 0); + AV_ZERO128(sl->mb_luma_dc[0] + 8); + if (svq3_decode_block(&h->gb, sl->mb_luma_dc[0], 0, 1)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n"); return -1; @@ -711,7 +718,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) if (cbp) { const int index = IS_INTRA16x16(mb_type) ? 1 : 0; - const int type = ((h->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1); + const int type = ((sl->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1); for (i = 0; i < 4; i++) if ((cbp & (1 << i))) { @@ -719,9 +726,9 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) k = index ? (1 * (j & 1) + 2 * (i & 1) + 2 * (j & 2) + 4 * (i & 2)) : (4 * i + j); - h->non_zero_count_cache[scan8[k]] = 1; + sl->non_zero_count_cache[scan8[k]] = 1; - if (svq3_decode_block(&h->gb, &h->mb[16 * k], index, type)) { + if (svq3_decode_block(&h->gb, &sl->mb[16 * k], index, type)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding block\n"); return -1; @@ -731,7 +738,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) if ((cbp & 0x30)) { for (i = 1; i < 3; ++i) - if (svq3_decode_block(&h->gb, &h->mb[16 * 16 * i], 0, 3)) { + if (svq3_decode_block(&h->gb, &sl->mb[16 * 16 * i], 0, 3)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n"); return -1; @@ -741,9 +748,9 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) for (i = 1; i < 3; i++) { for (j = 0; j < 4; j++) { k = 16 * i + j; - h->non_zero_count_cache[scan8[k]] = 1; + sl->non_zero_count_cache[scan8[k]] = 1; - if (svq3_decode_block(&h->gb, &h->mb[16 * k], 1, 1)) { + if (svq3_decode_block(&h->gb, &sl->mb[16 * k], 1, 1)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n"); return -1; @@ -754,11 +761,11 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) } } - h->cbp = cbp; + sl->cbp = cbp; h->cur_pic.mb_type[mb_xy] = mb_type; if (IS_INTRA(mb_type)) - h->chroma_pred_mode = ff_h264_check_intra_pred_mode(h, DC_PRED8x8, 1); + sl->chroma_pred_mode = ff_h264_check_intra_pred_mode(h, sl, DC_PRED8x8, 1); return 0; } @@ -767,7 +774,8 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) { SVQ3Context *s = avctx->priv_data; H264Context *h = &s->h; - const int mb_xy = h->mb_xy; + H264SliceContext *sl = &h->slice_ctx[0]; + const int mb_xy = sl->mb_xy; int i, header; unsigned slice_id; @@ -805,23 +813,23 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) } if ((slice_id = svq3_get_ue_golomb(&h->gb)) >= 3) { - av_log(h->avctx, AV_LOG_ERROR, "illegal slice type %d \n", slice_id); + av_log(h->avctx, AV_LOG_ERROR, "illegal slice type %u \n", slice_id); return -1; } - h->slice_type = golomb_to_pict_type[slice_id]; + sl->slice_type = golomb_to_pict_type[slice_id]; if ((header & 0x9F) == 2) { i = (h->mb_num < 64) ? 6 : (1 + av_log2(h->mb_num - 1)); - h->mb_skip_run = get_bits(&h->gb, i) - - (h->mb_y * h->mb_width + h->mb_x); + sl->mb_skip_run = get_bits(&h->gb, i) - + (sl->mb_y * h->mb_width + sl->mb_x); } else { skip_bits1(&h->gb); - h->mb_skip_run = 0; + sl->mb_skip_run = 0; } - h->slice_num = get_bits(&h->gb, 8); - h->qscale = get_bits(&h->gb, 5); + sl->slice_num = get_bits(&h->gb, 8); + sl->qscale = get_bits(&h->gb, 5); s->adaptive_quant = get_bits1(&h->gb); /* unknown fields */ @@ -837,18 +845,18 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) skip_bits(&h->gb, 8); /* reset intra predictors and invalidate motion vector references */ - if (h->mb_x > 0) { - memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - 1] + 3, + if (sl->mb_x > 0) { + memset(sl->intra4x4_pred_mode + h->mb2br_xy[mb_xy - 1] + 3, -1, 4 * sizeof(int8_t)); - memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - h->mb_x], - -1, 8 * sizeof(int8_t) * h->mb_x); + memset(sl->intra4x4_pred_mode + h->mb2br_xy[mb_xy - sl->mb_x], + -1, 8 * sizeof(int8_t) * sl->mb_x); } - if (h->mb_y > 0) { - memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - h->mb_stride], - -1, 8 * sizeof(int8_t) * (h->mb_width - h->mb_x)); + if (sl->mb_y > 0) { + memset(sl->intra4x4_pred_mode + h->mb2br_xy[mb_xy - h->mb_stride], + -1, 8 * sizeof(int8_t) * (h->mb_width - sl->mb_x)); - if (h->mb_x > 0) - h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride - 1] + 3] = -1; + if (sl->mb_x > 0) + sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride - 1] + 3] = -1; } return 0; @@ -858,6 +866,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) { SVQ3Context *s = avctx->priv_data; H264Context *h = &s->h; + H264SliceContext *sl; int m; unsigned char *extradata; unsigned char *extradata_end; @@ -878,12 +887,17 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) return -1; ff_hpeldsp_init(&s->hdsp, avctx->flags); + ff_tpeldsp_init(&s->tdsp); + + sl = h->slice_ctx; + h->flags = avctx->flags; - h->is_complex = 1; + sl->is_complex = 1; h->picture_structure = PICT_FRAME; - avctx->pix_fmt = avctx->codec->pix_fmts[0]; + avctx->pix_fmt = AV_PIX_FMT_YUVJ420P; + avctx->color_range = AVCOL_RANGE_JPEG; - h->chroma_qp[0] = h->chroma_qp[1] = 4; + h->slice_ctx[0].chroma_qp[0] = h->slice_ctx[0].chroma_qp[1] = 4; h->chroma_x_shift = h->chroma_y_shift = 1; s->halfpel_flag = 1; @@ -987,7 +1001,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) return -1; buf = av_malloc(buf_len); - av_log(avctx, AV_LOG_DEBUG, "watermark size: %dx%d\n", + av_log(avctx, AV_LOG_DEBUG, "watermark size: %ux%u\n", watermark_width, watermark_height); av_log(avctx, AV_LOG_DEBUG, "u1: %x u2: %x u3: %x compressed data size: %d offset: %d\n", @@ -1002,7 +1016,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) s->watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0); s->watermark_key = s->watermark_key << 16 | s->watermark_key; av_log(avctx, AV_LOG_DEBUG, - "watermark key %#x\n", s->watermark_key); + "watermark key %#"PRIx32"\n", s->watermark_key); av_free(buf); #else av_log(avctx, AV_LOG_ERROR, @@ -1100,6 +1114,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, const uint8_t *buf = avpkt->data; SVQ3Context *s = avctx->priv_data; H264Context *h = &s->h; + H264SliceContext *sl = &h->slice_ctx[0]; int buf_size = avpkt->size; int ret, m, i; @@ -1117,12 +1132,12 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, init_get_bits(&h->gb, buf, 8 * buf_size); - h->mb_x = h->mb_y = h->mb_xy = 0; + sl->mb_x = sl->mb_y = sl->mb_xy = 0; if (svq3_decode_slice_header(avctx)) return -1; - h->pict_type = h->slice_type; + h->pict_type = sl->slice_type; if (h->pict_type != AV_PICTURE_TYPE_B) FFSWAP(H264Picture*, s->next_pic, s->last_pic); @@ -1186,7 +1201,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n", av_get_picture_type_char(h->pict_type), s->halfpel_flag, s->thirdpel_flag, - s->adaptive_quant, h->qscale, h->slice_num); + s->adaptive_quant, h->slice_ctx[0].qscale, sl->slice_num); if (avctx->skip_frame >= AVDISCARD_NONREF && h->pict_type == AV_PICTURE_TYPE_B || avctx->skip_frame >= AVDISCARD_NONKEY && h->pict_type != AV_PICTURE_TYPE_I || @@ -1201,7 +1216,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, } if (h->pict_type == AV_PICTURE_TYPE_B) { - h->frame_num_offset = h->slice_num - h->prev_frame_num; + h->frame_num_offset = sl->slice_num - h->prev_frame_num; if (h->frame_num_offset < 0) h->frame_num_offset += 256; @@ -1212,7 +1227,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, } } else { h->prev_frame_num = h->frame_num; - h->frame_num = h->slice_num; + h->frame_num = sl->slice_num; h->prev_frame_num_offset = h->frame_num - h->prev_frame_num; if (h->prev_frame_num_offset < 0) @@ -1224,16 +1239,16 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, for (i = 0; i < 4; i++) { int j; for (j = -1; j < 4; j++) - h->ref_cache[m][scan8[0] + 8 * i + j] = 1; + sl->ref_cache[m][scan8[0] + 8 * i + j] = 1; if (i < 3) - h->ref_cache[m][scan8[0] + 8 * i + j] = PART_NOT_AVAILABLE; + sl->ref_cache[m][scan8[0] + 8 * i + j] = PART_NOT_AVAILABLE; } } - for (h->mb_y = 0; h->mb_y < h->mb_height; h->mb_y++) { - for (h->mb_x = 0; h->mb_x < h->mb_width; h->mb_x++) { + for (sl->mb_y = 0; sl->mb_y < h->mb_height; sl->mb_y++) { + for (sl->mb_x = 0; sl->mb_x < h->mb_width; sl->mb_x++) { unsigned mb_type; - h->mb_xy = h->mb_x + h->mb_y * h->mb_stride; + sl->mb_xy = sl->mb_x + sl->mb_y * h->mb_stride; if ((get_bits_count(&h->gb) + 7) >= h->gb.size_in_bits && ((get_bits_count(&h->gb) & 7) == 0 || @@ -1255,21 +1270,21 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, mb_type += 4; if (mb_type > 33 || svq3_decode_mb(s, mb_type)) { av_log(h->avctx, AV_LOG_ERROR, - "error while decoding MB %d %d\n", h->mb_x, h->mb_y); + "error while decoding MB %d %d\n", sl->mb_x, sl->mb_y); return -1; } if (mb_type != 0) - ff_h264_hl_decode_mb(h); + ff_h264_hl_decode_mb(h, &h->slice_ctx[0]); if (h->pict_type != AV_PICTURE_TYPE_B && !h->low_delay) - h->cur_pic.mb_type[h->mb_x + h->mb_y * h->mb_stride] = + h->cur_pic.mb_type[sl->mb_x + sl->mb_y * h->mb_stride] = (h->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1; } ff_draw_horiz_band(avctx, &s->cur_pic->f, s->last_pic->f.data[0] ? &s->last_pic->f : NULL, - 16 * h->mb_y, 16, h->picture_structure, 0, + 16 * sl->mb_y, 16, h->picture_structure, 0, h->low_delay); }