X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmimic.c;h=264c74afb479df8da4e15ab5db1417d82b439146;hb=530cd2893e020206262a146d567c707ef93baf31;hp=e43f156af921662f52540ab9f7c57d16e2b558c1;hpb=a0cabd0a27587525e90a44660c795d40d2f44fe2;p=ffmpeg diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index e43f156af92..264c74afb47 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -28,6 +28,7 @@ #include "get_bits.h" #include "bytestream.h" #include "dsputil.h" +#include "hpeldsp.h" #include "thread.h" #define MIMIC_HEADER_SIZE 20 @@ -44,7 +45,7 @@ typedef struct { int cur_index; int prev_index; - AVFrame buf_ptrs [16]; + ThreadFrame frames [16]; AVPicture flipped_ptrs[16]; DECLARE_ALIGNED(16, int16_t, dct_block)[64]; @@ -52,6 +53,7 @@ typedef struct { GetBitContext gb; ScanTable scantable; DSPContext dsp; + HpelDSPContext hdsp; VLC vlc; /* Kept in the context so multithreading can have a constant to read from */ @@ -109,27 +111,59 @@ static const uint8_t col_zag[64] = { 53, 60, 61, 54, 47, 55, 62, 63, }; +static av_cold int mimic_decode_end(AVCodecContext *avctx) +{ + MimicContext *ctx = avctx->priv_data; + int i; + + av_free(ctx->swap_buf); + + for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) { + if (ctx->frames[i].f) + ff_thread_release_buffer(avctx, &ctx->frames[i]); + av_frame_free(&ctx->frames[i].f); + } + + if (!avctx->internal->is_copy) + ff_free_vlc(&ctx->vlc); + + return 0; +} + static av_cold int mimic_decode_init(AVCodecContext *avctx) { MimicContext *ctx = avctx->priv_data; + int ret, i; + + avctx->internal->allocate_progress = 1; ctx->prev_index = 0; ctx->cur_index = 15; - if (init_vlc(&ctx->vlc, 11, FF_ARRAY_ELEMS(huffbits), - huffbits, 1, 1, huffcodes, 4, 4, 0)) { + if ((ret = init_vlc(&ctx->vlc, 11, FF_ARRAY_ELEMS(huffbits), + huffbits, 1, 1, huffcodes, 4, 4, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "error initializing vlc table\n"); - return -1; + return ret; } ff_dsputil_init(&ctx->dsp, avctx); + ff_hpeldsp_init(&ctx->hdsp, avctx->flags); ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, col_zag); + for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) { + ctx->frames[i].f = av_frame_alloc(); + if (!ctx->frames[i].f) { + mimic_decode_end(avctx); + return AVERROR(ENOMEM); + } + } + return 0; } static int mimic_decode_update_thread_context(AVCodecContext *avctx, const AVCodecContext *avctx_from) { MimicContext *dst = avctx->priv_data, *src = avctx_from->priv_data; + int i, ret; if (avctx == avctx_from) return 0; @@ -137,10 +171,16 @@ static int mimic_decode_update_thread_context(AVCodecContext *avctx, const AVCod dst->cur_index = src->next_cur_index; dst->prev_index = src->next_prev_index; - memcpy(dst->buf_ptrs, src->buf_ptrs, sizeof(src->buf_ptrs)); memcpy(dst->flipped_ptrs, src->flipped_ptrs, sizeof(src->flipped_ptrs)); - memset(&dst->buf_ptrs[dst->cur_index], 0, sizeof(AVFrame)); + for (i = 0; i < FF_ARRAY_ELEMS(dst->frames); i++) { + ff_thread_release_buffer(avctx, &dst->frames[i]); + if (src->frames[i].f->data[0]) { + ret = ff_thread_ref_frame(&dst->frames[i], &src->frames[i]); + if (ret < 0) + return ret; + } + } return 0; } @@ -198,16 +238,16 @@ static int vlc_decode_block(MimicContext *ctx, int num_coeffs, int qscale) vlc = get_vlc2(&ctx->gb, ctx->vlc.table, ctx->vlc.bits, 3); if (!vlc) /* end-of-block code */ - return 1; - if (vlc == -1) return 0; + if (vlc == -1) + return AVERROR_INVALIDDATA; /* pos_add and num_bits are coded in the vlc code */ pos += vlc & 15; // pos_add num_bits = vlc >> 4; // num_bits if (pos >= 64) - return 0; + return AVERROR_INVALIDDATA; value = get_bits(&ctx->gb, num_bits); @@ -223,13 +263,13 @@ static int vlc_decode_block(MimicContext *ctx, int num_coeffs, int qscale) block[ctx->scantable.permutated[pos]] = coeff; } - return 1; + return 0; } static int decode(MimicContext *ctx, int quality, int num_coeffs, int is_iframe) { - int y, x, plane, cur_row = 0; + int ret, y, x, plane, cur_row = 0; for (plane = 0; plane < 3; plane++) { const int is_chroma = !!plane; @@ -250,8 +290,12 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs, * frames preceding the previous. (get_bits1 == 1) * Chroma planes don't use backreferences. */ if (is_chroma || is_iframe || !get_bits1(&ctx->gb)) { - if (!vlc_decode_block(ctx, num_coeffs, qscale)) - return 0; + if ((ret = vlc_decode_block(ctx, num_coeffs, + qscale)) < 0) { + av_log(ctx->avctx, AV_LOG_ERROR, "Error decoding " + "block.\n"); + return ret; + } ctx->dsp.idct_put(dst, stride, ctx->dct_block); } else { unsigned int backref = get_bits(&ctx->gb, 4); @@ -259,20 +303,20 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs, uint8_t *p = ctx->flipped_ptrs[index].data[0]; if (index != ctx->cur_index && p) { - ff_thread_await_progress(&ctx->buf_ptrs[index], + ff_thread_await_progress(&ctx->frames[index], cur_row, 0); p += src - ctx->flipped_ptrs[ctx->prev_index].data[plane]; - ctx->dsp.put_pixels_tab[1][0](dst, p, stride, 8); + ctx->hdsp.put_pixels_tab[1][0](dst, p, stride, 8); } else { av_log(ctx->avctx, AV_LOG_ERROR, "No such backreference! Buggy sample.\n"); } } } else { - ff_thread_await_progress(&ctx->buf_ptrs[ctx->prev_index], + ff_thread_await_progress(&ctx->frames[ctx->prev_index], cur_row, 0); - ctx->dsp.put_pixels_tab[1][0](dst, src, stride, 8); + ctx->hdsp.put_pixels_tab[1][0](dst, src, stride, 8); } src += 8; dst += 8; @@ -280,19 +324,19 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs, src += (stride - ctx->num_hblocks[plane]) << 3; dst += (stride - ctx->num_hblocks[plane]) << 3; - ff_thread_report_progress(&ctx->buf_ptrs[ctx->cur_index], + ff_thread_report_progress(&ctx->frames[ctx->cur_index], cur_row++, 0); } } - return 1; + return 0; } /** * Flip the buffer upside-down and put it in the YVU order to match the * way Mimic encodes frames. */ -static void prepare_avpic(MimicContext *ctx, AVPicture *dst, AVPicture *src) +static void prepare_avpic(MimicContext *ctx, AVPicture *dst, AVFrame *src) { int i; dst->data[0] = src->data[0] + ( ctx->avctx->height - 1) * src->linesize[0]; @@ -317,7 +361,7 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, if (buf_size <= MIMIC_HEADER_SIZE) { av_log(avctx, AV_LOG_ERROR, "insufficient data\n"); - return -1; + return AVERROR_INVALIDDATA; } bytestream2_init(&gb, buf, MIMIC_HEADER_SIZE); @@ -336,7 +380,7 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, if (!(width == 160 && height == 120) && !(width == 320 && height == 240)) { av_log(avctx, AV_LOG_ERROR, "invalid width/height!\n"); - return -1; + return AVERROR_INVALIDDATA; } ctx->avctx = avctx; @@ -348,28 +392,29 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, ctx->num_hblocks[i] = width >> (3 + !!i); } } else if (width != ctx->avctx->width || height != ctx->avctx->height) { - av_log(avctx, AV_LOG_ERROR, "resolution changing is not supported\n"); - return -1; + avpriv_request_sample(avctx, "Resolution changing"); + return AVERROR_PATCHWELCOME; } - if (is_pframe && !ctx->buf_ptrs[ctx->prev_index].data[0]) { + if (is_pframe && !ctx->frames[ctx->prev_index].f->data[0]) { av_log(avctx, AV_LOG_ERROR, "decoding must start with keyframe\n"); - return -1; + return AVERROR_INVALIDDATA; } - ctx->buf_ptrs[ctx->cur_index].reference = 1; - ctx->buf_ptrs[ctx->cur_index].pict_type = is_pframe ? AV_PICTURE_TYPE_P : - AV_PICTURE_TYPE_I; - if (ff_thread_get_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index])) { + ff_thread_release_buffer(avctx, &ctx->frames[ctx->cur_index]); + ctx->frames[ctx->cur_index].f->pict_type = is_pframe ? AV_PICTURE_TYPE_P : + AV_PICTURE_TYPE_I; + if ((res = ff_thread_get_buffer(avctx, &ctx->frames[ctx->cur_index], + AV_GET_BUFFER_FLAG_REF)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return res; } ctx->next_prev_index = ctx->cur_index; ctx->next_cur_index = (ctx->cur_index - 1) & 15; prepare_avpic(ctx, &ctx->flipped_ptrs[ctx->cur_index], - (AVPicture*) &ctx->buf_ptrs[ctx->cur_index]); + ctx->frames[ctx->cur_index].f); ff_thread_finish_setup(avctx); @@ -383,47 +428,46 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, init_get_bits(&ctx->gb, ctx->swap_buf, swap_buf_size << 3); res = decode(ctx, quality, num_coeffs, !is_pframe); - ff_thread_report_progress(&ctx->buf_ptrs[ctx->cur_index], INT_MAX, 0); - if (!res) { + ff_thread_report_progress(&ctx->frames[ctx->cur_index], INT_MAX, 0); + if (res < 0) { if (!(avctx->active_thread_type & FF_THREAD_FRAME)) { - ff_thread_release_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index]); - return -1; + ff_thread_release_buffer(avctx, &ctx->frames[ctx->cur_index]); + return res; } } - *(AVFrame*)data = ctx->buf_ptrs[ctx->cur_index]; + if ((res = av_frame_ref(data, ctx->frames[ctx->cur_index].f)) < 0) + return res; *got_frame = 1; ctx->prev_index = ctx->next_prev_index; ctx->cur_index = ctx->next_cur_index; /* Only release frames that aren't used for backreferences anymore */ - if (ctx->buf_ptrs[ctx->cur_index].data[0]) - ff_thread_release_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index]); + ff_thread_release_buffer(avctx, &ctx->frames[ctx->cur_index]); return buf_size; } -static av_cold int mimic_decode_end(AVCodecContext *avctx) +static av_cold int mimic_init_thread_copy(AVCodecContext *avctx) { MimicContext *ctx = avctx->priv_data; int i; - av_free(ctx->swap_buf); - - if (avctx->internal->is_copy) - return 0; - - for (i = 0; i < 16; i++) - if (ctx->buf_ptrs[i].data[0]) - ff_thread_release_buffer(avctx, &ctx->buf_ptrs[i]); - ff_free_vlc(&ctx->vlc); + for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) { + ctx->frames[i].f = av_frame_alloc(); + if (!ctx->frames[i].f) { + mimic_decode_end(avctx); + return AVERROR(ENOMEM); + } + } return 0; } AVCodec ff_mimic_decoder = { .name = "mimic", + .long_name = NULL_IF_CONFIG_SMALL("Mimic"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MIMIC, .priv_data_size = sizeof(MimicContext), @@ -431,6 +475,6 @@ AVCodec ff_mimic_decoder = { .close = mimic_decode_end, .decode = mimic_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("Mimic"), - .update_thread_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_thread_context) + .update_thread_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_thread_context), + .init_thread_copy = ONLY_IF_THREADS_ENABLED(mimic_init_thread_copy), };