ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/clearvideo: Remove unnecessary level parameter

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-11-06 21:03:19 +01:00
parent a7ccfdc0d7
commit 4e6ca99c36
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/clearvideo.c
View File

@ -362,19 +362,18 @@ static void mvi_update_row(MVInfo *mvi)
}
}
static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc, int level)
static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc)
{
TileInfo *ti;
int i, flags = 0;
int16_t bias = 0;
MV mv = { 0 };
if (lc[level].flags_cb.table) {
flags = get_vlc2(gb, lc[level].flags_cb.table, CLV_VLC_BITS, 2);
}
if (lc->flags_cb.table)
flags = get_vlc2(gb, lc->flags_cb.table, CLV_VLC_BITS, 2);
if (lc[level].mv_cb.table) {
uint16_t mv_code = get_vlc2(gb, lc[level].mv_cb.table, CLV_VLC_BITS, 2);
if (lc->mv_cb.table) {
uint16_t mv_code = get_vlc2(gb, lc->mv_cb.table, CLV_VLC_BITS, 2);
if (mv_code != MV_ESC) {
mv.x = (int8_t)(mv_code & 0xff);
@ -385,8 +384,8 @@ static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc, int l
}
}
if (lc[level].bias_cb.table) {
uint16_t bias_val = get_vlc2(gb, lc[level].bias_cb.table, CLV_VLC_BITS, 2);
if (lc->bias_cb.table) {
uint16_t bias_val = get_vlc2(gb, lc->bias_cb.table, CLV_VLC_BITS, 2);
if (bias_val != BIAS_ESC) {
bias = (int16_t)(bias_val);
@ -406,7 +405,7 @@ static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc, int l
if (ti->flags) {
for (i = 0; i < 4; i++) {
if (ti->flags & (1 << i)) {
TileInfo *subti = decode_tile_info(gb, lc, level + 1);
TileInfo *subti = decode_tile_info(gb, lc + 1);
ti->child[i] = subti;
}
}
@ -599,7 +598,7 @@ static int clv_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
TileInfo *tile;
MV mv, cmv;
tile = decode_tile_info(&c->gb, &lev[0], 0); // Y
tile = decode_tile_info(&c->gb, &lev[0]); // Y
if (!tile)
return AVERROR(ENOMEM);
mv = mvi_predict(&c->mvi, i, j, tile->mv);
@ -614,14 +613,14 @@ static int clv_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
cmv.x /= 2;
cmv.y /= 2;
av_freep(&tile);
tile = decode_tile_info(&c->gb, &lev[4], 0); // U
tile = decode_tile_info(&c->gb, &lev[4]); // U
if (!tile)
return AVERROR(ENOMEM);
ret = restore_tree(avctx, c->pic, c->prev, 1, x, y, size, tile, cmv);
if (ret < 0)
mb_ret = ret;
av_freep(&tile);
tile = decode_tile_info(&c->gb, &lev[7], 0); // V
tile = decode_tile_info(&c->gb, &lev[7]); // V
if (!tile)
return AVERROR(ENOMEM);
ret = restore_tree(avctx, c->pic, c->prev, 2, x, y, size, tile, cmv);