highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mobiclip: Use static VLC tables

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-10-24 12:50:17 +02:00
parent 924bc6d860
commit 77e8c959aa
1 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
libavcodec/mobiclip.c
View File

@@ -316,9 +316,6 @@ typedef struct MobiClipContext {
uint8_t *bitstream; uint8_t *bitstream;
int bitstream_size; int bitstream_size;
VLC vlc[2];
VLC mv_vlc[2][16];
int qtab[2][64]; int qtab[2][64];
uint8_t pre[32]; uint8_t pre[32];
MotionXY *motion; MotionXY *motion;
@@ -327,10 +324,12 @@ typedef struct MobiClipContext {
BswapDSPContext bdsp; BswapDSPContext bdsp;
} MobiClipContext; } MobiClipContext;
static VLC rl_vlc[2];
static VLC mv_vlc[2][16];
static av_cold int mobiclip_init(AVCodecContext *avctx) static av_cold int mobiclip_init(AVCodecContext *avctx)
{ {
MobiClipContext *s = avctx->priv_data; MobiClipContext *s = avctx->priv_data;
int ret;
if (avctx->width & 15 || avctx->height & 15) { if (avctx->width & 15 || avctx->height & 15) {
av_log(avctx, AV_LOG_ERROR, "width/height not multiple of 16\n"); av_log(avctx, AV_LOG_ERROR, "width/height not multiple of 16\n");
@@ -341,20 +340,6 @@ static av_cold int mobiclip_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->pix_fmt = AV_PIX_FMT_YUV420P;
ret = ff_init_vlc_sparse(&s->vlc[0], MOBI_RL_VLC_BITS, 104,
bits0, sizeof(*bits0), sizeof(*bits0),
codes0, sizeof(*codes0), sizeof(*codes0),
syms0, sizeof(*syms0), sizeof(*syms0), 0);
if (ret < 0)
return ret;
ret = ff_init_vlc_sparse(&s->vlc[1], MOBI_RL_VLC_BITS, 104,
bits0, sizeof(*bits0), sizeof(*bits0),
codes0, sizeof(*codes0), sizeof(*codes0),
syms1, sizeof(*syms1), sizeof(*syms1), 0);
if (ret < 0)
return ret;
s->motion = av_calloc(avctx->width / 16 + 3, sizeof(MotionXY)); s->motion = av_calloc(avctx->width / 16 + 3, sizeof(MotionXY));
if (!s->motion) if (!s->motion)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -366,20 +351,30 @@ static av_cold int mobiclip_init(AVCodecContext *avctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
INIT_VLC_SPARSE_STATIC(&rl_vlc[0], MOBI_RL_VLC_BITS, 104,
bits0, sizeof(*bits0), sizeof(*bits0),
codes0, sizeof(*codes0), sizeof(*codes0),
syms0, sizeof(*syms0), sizeof(*syms0),
1 << MOBI_RL_VLC_BITS);
INIT_VLC_SPARSE_STATIC(&rl_vlc[1], MOBI_RL_VLC_BITS, 104,
bits0, sizeof(*bits0), sizeof(*bits0),
codes0, sizeof(*codes0), sizeof(*codes0),
syms1, sizeof(*syms1), sizeof(*syms1),
1 << MOBI_RL_VLC_BITS);
for (int j = 0; j < 16; j++) { for (int j = 0; j < 16; j++) {
ret = ff_init_vlc_sparse(&s->mv_vlc[0][j], MOBI_MV_VLC_BITS, mv_len[j], static VLC_TYPE vlc_buf[2 * 16 << MOBI_MV_VLC_BITS][2];
mv_bits_mods[j], sizeof(*mv_bits_mods[j]), sizeof(*mv_bits_mods[j]), mv_vlc[0][j].table = &vlc_buf[2 * j << MOBI_MV_VLC_BITS];
mv_codes_mods[j], sizeof(*mv_codes_mods[j]), sizeof(*mv_codes_mods[j]), mv_vlc[0][j].table_allocated = 1 << MOBI_MV_VLC_BITS;
mv_syms_mods[j], sizeof(*mv_syms_mods[j]), sizeof(*mv_syms_mods[j]), 0); ff_init_vlc_sparse(&mv_vlc[0][j], MOBI_MV_VLC_BITS, mv_len[j],
if (ret < 0) mv_bits_mods[j], sizeof(*mv_bits_mods[j]), sizeof(*mv_bits_mods[j]),
return ret; mv_codes_mods[j], sizeof(*mv_codes_mods[j]), sizeof(*mv_codes_mods[j]),
mv_syms_mods[j], sizeof(*mv_syms_mods[j]), sizeof(*mv_syms_mods[j]), INIT_VLC_USE_NEW_STATIC);
ret = ff_init_vlc_sparse(&s->mv_vlc[1][j], MOBI_MV_VLC_BITS, mv_len[j], mv_vlc[1][j].table = &vlc_buf[(2 * j + 1) << MOBI_MV_VLC_BITS];
mv_bits[j], sizeof(*mv_bits[j]), sizeof(*mv_bits[j]), mv_vlc[1][j].table_allocated = 1 << MOBI_MV_VLC_BITS;
mv_codes[j], sizeof(*mv_codes[j]), sizeof(*mv_codes[j]), ff_init_vlc_sparse(&mv_vlc[1][j], MOBI_MV_VLC_BITS, mv_len[j],
mv_syms[j], sizeof(*mv_syms[j]), sizeof(*mv_syms[j]), 0); mv_bits[j], sizeof(*mv_bits[j]), sizeof(*mv_bits[j]),
if (ret < 0) mv_codes[j], sizeof(*mv_codes[j]), sizeof(*mv_codes[j]),
return ret; mv_syms[j], sizeof(*mv_syms[j]), sizeof(*mv_syms[j]), INIT_VLC_USE_NEW_STATIC);
} }
return 0; return 0;
@@ -465,7 +460,7 @@ static void read_run_encoding(AVCodecContext *avctx,
{ {
MobiClipContext *s = avctx->priv_data; MobiClipContext *s = avctx->priv_data;
GetBitContext *gb = &s->gb; GetBitContext *gb = &s->gb;
int n = get_vlc2(gb, s->vlc[s->dct_tab_idx].table, int n = get_vlc2(gb, rl_vlc[s->dct_tab_idx].table,
MOBI_RL_VLC_BITS, 1); MOBI_RL_VLC_BITS, 1);
*last = (n >> 11) == 1; *last = (n >> 11) == 1;
@@ -1249,7 +1244,7 @@ static int predict_motion(AVCodecContext *avctx,
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
int ret, idx2; int ret, idx2;
idx2 = get_vlc2(gb, s->mv_vlc[s->moflex][tidx].table, idx2 = get_vlc2(gb, mv_vlc[s->moflex][tidx].table,
MOBI_MV_VLC_BITS, 1); MOBI_MV_VLC_BITS, 1);
ret = predict_motion(avctx, width, height, idx2, ret = predict_motion(avctx, width, height, idx2,
@@ -1323,7 +1318,7 @@ static int mobiclip_decode(AVCodecContext *avctx, void *data,
motion[x / 16 + 2].x = 0; motion[x / 16 + 2].x = 0;
motion[x / 16 + 2].y = 0; motion[x / 16 + 2].y = 0;
idx = get_vlc2(gb, s->mv_vlc[s->moflex][0].table, idx = get_vlc2(gb, mv_vlc[s->moflex][0].table,
MOBI_MV_VLC_BITS, 1); MOBI_MV_VLC_BITS, 1);
if (idx == 6 || idx == 7) { if (idx == 6 || idx == 7) {
@@ -1382,14 +1377,6 @@ static av_cold int mobiclip_close(AVCodecContext *avctx)
{ {
MobiClipContext *s = avctx->priv_data; MobiClipContext *s = avctx->priv_data;
ff_free_vlc(&s->vlc[0]);
ff_free_vlc(&s->vlc[1]);
for (int i = 0; i < 16; i++) {
ff_free_vlc(&s->mv_vlc[0][i]);
ff_free_vlc(&s->mv_vlc[1][i]);
}
av_freep(&s->bitstream); av_freep(&s->bitstream);
s->bitstream_size = 0; s->bitstream_size = 0;
av_freep(&s->motion); av_freep(&s->motion);