har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/hqx: add support for frame threads

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-04-08 12:11:39 +02:00
parent 24d9b0c29c
commit 20f7872d99
1 changed files with 8 additions and 2 deletions

10
libavcodec/hqx.c

@ -27,6 +27,7 @@
#include "canopus.h" #include "canopus.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "thread.h"
#include "hqx.h" #include "hqx.h"
#include "hqxdsp.h" #include "hqxdsp.h"
@ -405,6 +406,7 @@ static int hqx_decode_frame(AVCodecContext *avctx, void *data,
int *got_picture_ptr, AVPacket *avpkt) int *got_picture_ptr, AVPacket *avpkt)
{ {
HQXContext *ctx = avctx->priv_data; HQXContext *ctx = avctx->priv_data;
ThreadFrame frame = { .f = data };
uint8_t *src = avpkt->data; uint8_t *src = avpkt->data;
uint32_t info_tag; uint32_t info_tag;
int data_start; int data_start;
@ -491,7 +493,7 @@ static int hqx_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
ret = ff_get_buffer(avctx, ctx->pic, 0); ret = ff_thread_get_buffer(avctx, &frame, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -510,6 +512,9 @@ static av_cold int hqx_decode_close(AVCodecContext *avctx)
int i; int i;
HQXContext *ctx = avctx->priv_data; HQXContext *ctx = avctx->priv_data;
if (avctx->internal->is_copy)
return 0;
ff_free_vlc(&ctx->cbp_vlc); ff_free_vlc(&ctx->cbp_vlc);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
ff_free_vlc(&ctx->dc_vlc[i]); ff_free_vlc(&ctx->dc_vlc[i]);
@ -536,7 +541,8 @@ AVCodec ff_hqx_decoder = {
.init = hqx_decode_init, .init = hqx_decode_init,
.decode = hqx_decode_frame, .decode = hqx_decode_frame,
.close = hqx_decode_close, .close = hqx_decode_close,
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS |
AV_CODEC_CAP_FRAME_THREADS,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP, FF_CODEC_CAP_INIT_CLEANUP,
}; };