Commit a75529e8 authored by Alexander Strange's avatar Alexander Strange Committed by Ronald S. Bultje
Browse files

mimic: implement multithreading.

parent 31f00274
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "get_bits.h" #include "get_bits.h"
#include "bytestream.h" #include "bytestream.h"
#include "dsputil.h" #include "dsputil.h"
#include "thread.h"
#define MIMIC_HEADER_SIZE 20 #define MIMIC_HEADER_SIZE 20
...@@ -51,6 +52,10 @@ typedef struct { ...@@ -51,6 +52,10 @@ typedef struct {
ScanTable scantable; ScanTable scantable;
DSPContext dsp; DSPContext dsp;
VLC vlc; VLC vlc;
/* Kept in the context so multithreading can have a constant to read from */
int next_cur_index;
int next_prev_index;
} MimicContext; } MimicContext;
static const uint32_t huffcodes[] = { static const uint32_t huffcodes[] = {
...@@ -121,6 +126,23 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx) ...@@ -121,6 +126,23 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx)
return 0; 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;
if (avctx == avctx_from) return 0;
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));
return 0;
}
static const int8_t vlcdec_lookup[9][64] = { static const int8_t vlcdec_lookup[9][64] = {
{ 0, }, { 0, },
{ -1, 1, }, { -1, 1, },
...@@ -205,7 +227,7 @@ static int vlc_decode_block(MimicContext *ctx, int num_coeffs, int qscale) ...@@ -205,7 +227,7 @@ static int vlc_decode_block(MimicContext *ctx, int num_coeffs, int qscale)
static int decode(MimicContext *ctx, int quality, int num_coeffs, static int decode(MimicContext *ctx, int quality, int num_coeffs,
int is_iframe) int is_iframe)
{ {
int y, x, plane; int y, x, plane, cur_row = 0;
for(plane = 0; plane < 3; plane++) { for(plane = 0; plane < 3; plane++) {
const int is_chroma = !!plane; const int is_chroma = !!plane;
...@@ -236,6 +258,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs, ...@@ -236,6 +258,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs,
int index = (ctx->cur_index+backref)&15; int index = (ctx->cur_index+backref)&15;
uint8_t *p = ctx->flipped_ptrs[index].data[0]; uint8_t *p = ctx->flipped_ptrs[index].data[0];
ff_thread_await_progress(&ctx->buf_ptrs[index], cur_row, 0);
if(p) { if(p) {
p += src - p += src -
ctx->flipped_ptrs[ctx->prev_index].data[plane]; ctx->flipped_ptrs[ctx->prev_index].data[plane];
...@@ -246,6 +269,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs, ...@@ -246,6 +269,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs,
} }
} }
} else { } else {
ff_thread_await_progress(&ctx->buf_ptrs[ctx->prev_index], cur_row, 0);
ctx->dsp.put_pixels_tab[1][0](dst, src, stride, 8); ctx->dsp.put_pixels_tab[1][0](dst, src, stride, 8);
} }
src += 8; src += 8;
...@@ -253,6 +277,8 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs, ...@@ -253,6 +277,8 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs,
} }
src += (stride - ctx->num_hblocks[plane])<<3; src += (stride - ctx->num_hblocks[plane])<<3;
dst += (stride - ctx->num_hblocks[plane])<<3; dst += (stride - ctx->num_hblocks[plane])<<3;
ff_thread_report_progress(&ctx->buf_ptrs[ctx->cur_index], cur_row++, 0);
} }
} }
...@@ -326,14 +352,20 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, ...@@ -326,14 +352,20 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data,
} }
ctx->buf_ptrs[ctx->cur_index].reference = 1; ctx->buf_ptrs[ctx->cur_index].reference = 1;
if(avctx->get_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index])) { ctx->buf_ptrs[ctx->cur_index].pict_type = is_pframe ? FF_P_TYPE:FF_I_TYPE;
if(ff_thread_get_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index])) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
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], prepare_avpic(ctx, &ctx->flipped_ptrs[ctx->cur_index],
(AVPicture*) &ctx->buf_ptrs[ctx->cur_index]); (AVPicture*) &ctx->buf_ptrs[ctx->cur_index]);
ff_thread_finish_setup(avctx);
av_fast_malloc(&ctx->swap_buf, &ctx->swap_buf_size, av_fast_malloc(&ctx->swap_buf, &ctx->swap_buf_size,
swap_buf_size + FF_INPUT_BUFFER_PADDING_SIZE); swap_buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
if(!ctx->swap_buf) if(!ctx->swap_buf)
...@@ -345,21 +377,23 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, ...@@ -345,21 +377,23 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data,
init_get_bits(&ctx->gb, ctx->swap_buf, swap_buf_size << 3); init_get_bits(&ctx->gb, ctx->swap_buf, swap_buf_size << 3);
if(!decode(ctx, quality, num_coeffs, !is_pframe)) { if(!decode(ctx, quality, num_coeffs, !is_pframe)) {
avctx->release_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index]); if (avctx->active_thread_type&FF_THREAD_FRAME)
return -1; ff_thread_report_progress(&ctx->buf_ptrs[ctx->cur_index], INT_MAX, 0);
else {
ff_thread_release_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index]);
return -1;
}
} }
ctx->buf_ptrs[ctx->cur_index].pict_type = is_pframe ? FF_P_TYPE:FF_I_TYPE;
*(AVFrame*)data = ctx->buf_ptrs[ctx->cur_index]; *(AVFrame*)data = ctx->buf_ptrs[ctx->cur_index];
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
ctx->prev_index = ctx->cur_index; ctx->prev_index = ctx->next_prev_index;
ctx->cur_index--; ctx->cur_index = ctx->next_cur_index;
ctx->cur_index &= 15;
/* Only release frames that aren't used for backreferences anymore */ /* Only release frames that aren't used for backreferences anymore */
if(ctx->buf_ptrs[ctx->cur_index].data[0]) if(ctx->buf_ptrs[ctx->cur_index].data[0])
avctx->release_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index]); ff_thread_release_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index]);
return buf_size; return buf_size;
} }
...@@ -370,9 +404,12 @@ static av_cold int mimic_decode_end(AVCodecContext *avctx) ...@@ -370,9 +404,12 @@ static av_cold int mimic_decode_end(AVCodecContext *avctx)
int i; int i;
av_free(ctx->swap_buf); av_free(ctx->swap_buf);
if(avctx->is_copy) return 0;
for(i = 0; i < 16; i++) for(i = 0; i < 16; i++)
if(ctx->buf_ptrs[i].data[0]) if(ctx->buf_ptrs[i].data[0])
avctx->release_buffer(avctx, &ctx->buf_ptrs[i]); ff_thread_release_buffer(avctx, &ctx->buf_ptrs[i]);
free_vlc(&ctx->vlc); free_vlc(&ctx->vlc);
return 0; return 0;
...@@ -387,6 +424,7 @@ AVCodec ff_mimic_decoder = { ...@@ -387,6 +424,7 @@ AVCodec ff_mimic_decoder = {
NULL, NULL,
mimic_decode_end, mimic_decode_end,
mimic_decode_frame, mimic_decode_frame,
CODEC_CAP_DR1, CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("Mimic"), .long_name = NULL_IF_CONFIG_SMALL("Mimic"),
.update_thread_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_thread_context)
}; };
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment