virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avcodec/mss4: Make VLCs static

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-04 00:04:08 +01:00
parent 313e572440
commit f31bf4a1f9
1 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
libavcodec/mss4.c
View File

@ -25,6 +25,8 @@
* aka Microsoft Expression Encoder Screen) decoder * aka Microsoft Expression Encoder Screen) decoder
*/ */
#include "libavutil/thread.h"
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "get_bits.h" #include "get_bits.h"
@ -78,8 +80,6 @@ static const uint8_t mss4_vec_entry_vlc_syms[2][9] = {
typedef struct MSS4Context { typedef struct MSS4Context {
AVFrame *pic; AVFrame *pic;
VLC dc_vlc[2], ac_vlc[2];
VLC vec_entry_vlc[2];
int block[64]; int block[64];
uint8_t imgbuf[3][16 * 16]; uint8_t imgbuf[3][16 * 16];
@ -93,9 +93,13 @@ typedef struct MSS4Context {
int prev_vec[3][4]; int prev_vec[3][4];
} MSS4Context; } MSS4Context;
static av_cold int mss4_init_vlc(VLC *vlc, const uint8_t *lens, static VLC dc_vlc[2], ac_vlc[2];
const uint8_t *syms) static VLC vec_entry_vlc[2];
static av_cold void mss4_init_vlc(VLC *vlc, unsigned *offset,
const uint8_t *lens, const uint8_t *syms)
{ {
static VLC_TYPE vlc_buf[2146][2];
uint8_t bits[MAX_ENTRIES]; uint8_t bits[MAX_ENTRIES];
int i, j; int i, j;
int idx = 0; int idx = 0;
@ -107,41 +111,25 @@ static av_cold int mss4_init_vlc(VLC *vlc, const uint8_t *lens,
} }
} }
return ff_init_vlc_from_lengths(vlc, FFMIN(bits[idx - 1], 9), idx, vlc->table = &vlc_buf[*offset];
bits, 1, syms, 1, 1, 0, 0, NULL); vlc->table_allocated = FF_ARRAY_ELEMS(vlc_buf) - *offset;
ff_init_vlc_from_lengths(vlc, FFMIN(bits[idx - 1], 9), idx,
bits, 1, syms, 1, 1,
0, INIT_VLC_STATIC_OVERLONG, NULL);
*offset += vlc->table_size;
} }
static av_cold int mss4_init_vlcs(MSS4Context *ctx) static av_cold void mss4_init_vlcs(void)
{ {
int ret, i; for (unsigned i = 0, offset = 0; i < 2; i++) {
mss4_init_vlc(&dc_vlc[i], &offset, mss4_dc_vlc_lens[i], NULL);
for (i = 0; i < 2; i++) { mss4_init_vlc(&ac_vlc[i], &offset,
ret = mss4_init_vlc(&ctx->dc_vlc[i], mss4_dc_vlc_lens[i], NULL); i ? avpriv_mjpeg_bits_ac_chrominance + 1
if (ret) : avpriv_mjpeg_bits_ac_luminance + 1,
return ret; i ? avpriv_mjpeg_val_ac_chrominance
ret = mss4_init_vlc(&ctx->ac_vlc[i], : avpriv_mjpeg_val_ac_luminance);
i ? avpriv_mjpeg_bits_ac_chrominance + 1 mss4_init_vlc(&vec_entry_vlc[i], &offset, mss4_vec_entry_vlc_lens[i],
: avpriv_mjpeg_bits_ac_luminance + 1, mss4_vec_entry_vlc_syms[i]);
i ? avpriv_mjpeg_val_ac_chrominance
: avpriv_mjpeg_val_ac_luminance);
if (ret)
return ret;
ret = mss4_init_vlc(&ctx->vec_entry_vlc[i], mss4_vec_entry_vlc_lens[i],
mss4_vec_entry_vlc_syms[i]);
if (ret)
return ret;
}
return 0;
}
static av_cold void mss4_free_vlcs(MSS4Context *ctx)
{
int i;
for (i = 0; i < 2; i++) {
ff_free_vlc(&ctx->dc_vlc[i]);
ff_free_vlc(&ctx->ac_vlc[i]);
ff_free_vlc(&ctx->vec_entry_vlc[i]);
} }
} }
@ -239,7 +227,7 @@ static int mss4_decode_dct_block(MSS4Context *c, GetBitContext *gb,
int xpos = mb_x * 2 + i; int xpos = mb_x * 2 + i;
c->dc_cache[j][TOP_LEFT] = c->dc_cache[j][TOP]; c->dc_cache[j][TOP_LEFT] = c->dc_cache[j][TOP];
c->dc_cache[j][TOP] = c->prev_dc[0][mb_x * 2 + i]; c->dc_cache[j][TOP] = c->prev_dc[0][mb_x * 2 + i];
ret = mss4_decode_dct(gb, c->dc_vlc, c->ac_vlc, c->block, ret = mss4_decode_dct(gb, &dc_vlc[0], &ac_vlc[0], c->block,
c->dc_cache[j], c->dc_cache[j],
xpos, mb_y * 2 + j, c->quant_mat[0]); xpos, mb_y * 2 + j, c->quant_mat[0]);
if (ret) if (ret)
@ -255,7 +243,7 @@ static int mss4_decode_dct_block(MSS4Context *c, GetBitContext *gb,
for (i = 1; i < 3; i++) { for (i = 1; i < 3; i++) {
c->dc_cache[i + 1][TOP_LEFT] = c->dc_cache[i + 1][TOP]; c->dc_cache[i + 1][TOP_LEFT] = c->dc_cache[i + 1][TOP];
c->dc_cache[i + 1][TOP] = c->prev_dc[i][mb_x]; c->dc_cache[i + 1][TOP] = c->prev_dc[i][mb_x];
ret = mss4_decode_dct(gb, c->dc_vlc + 1, c->ac_vlc + 1, ret = mss4_decode_dct(gb, &dc_vlc[1], &ac_vlc[1],
c->block, c->dc_cache[i + 1], mb_x, mb_y, c->block, c->dc_cache[i + 1], mb_x, mb_y,
c->quant_mat[1]); c->quant_mat[1]);
if (ret) if (ret)
@ -347,7 +335,7 @@ static int mss4_decode_image_block(MSS4Context *ctx, GetBitContext *gb,
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
vec_len[i] = vec_len_syms[!!i][get_unary(gb, 0, 3)]; vec_len[i] = vec_len_syms[!!i][get_unary(gb, 0, 3)];
for (j = 0; j < vec_len[i]; j++) { for (j = 0; j < vec_len[i]; j++) {
vec[i][j] = get_coeff(gb, &ctx->vec_entry_vlc[!!i]); vec[i][j] = get_coeff(gb, &vec_entry_vlc[!!i]);
vec[i][j] += ctx->prev_vec[i][j]; vec[i][j] += ctx->prev_vec[i][j];
ctx->prev_vec[i][j] = vec[i][j]; ctx->prev_vec[i][j] = vec[i][j];
} }
@ -586,20 +574,16 @@ static av_cold int mss4_decode_end(AVCodecContext *avctx)
av_frame_free(&c->pic); av_frame_free(&c->pic);
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
av_freep(&c->prev_dc[i]); av_freep(&c->prev_dc[i]);
mss4_free_vlcs(c);
return 0; return 0;
} }
static av_cold int mss4_decode_init(AVCodecContext *avctx) static av_cold int mss4_decode_init(AVCodecContext *avctx)
{ {
static AVOnce init_static_once = AV_ONCE_INIT;
MSS4Context * const c = avctx->priv_data; MSS4Context * const c = avctx->priv_data;
int i; int i;
if (mss4_init_vlcs(c)) {
av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n");
return AVERROR(ENOMEM);
}
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
c->dc_stride[i] = FFALIGN(avctx->width, 16) >> (2 + !!i); c->dc_stride[i] = FFALIGN(avctx->width, 16) >> (2 + !!i);
c->prev_dc[i] = av_malloc_array(c->dc_stride[i], sizeof(**c->prev_dc)); c->prev_dc[i] = av_malloc_array(c->dc_stride[i], sizeof(**c->prev_dc));
@ -615,6 +599,8 @@ static av_cold int mss4_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_YUV444P; avctx->pix_fmt = AV_PIX_FMT_YUV444P;
ff_thread_once(&init_static_once, mss4_init_vlcs);
return 0; return 0;
} }