virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/cfhd: Move GetBitContext from context to stack

Browse Source 
Its lifetime is extremely limited.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-14 00:11:31 +01:00
parent 8a2e84dc96
commit 32fba0bce5
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/cfhd.c
View File

@ -772,6 +772,7 @@ static int cfhd_decode(AVCodecContext *avctx, AVFrame *pic,
if (tag == BandHeader || tag == BandSecondPass) { if (tag == BandHeader || tag == BandSecondPass) {
int highpass_height, highpass_width, highpass_a_width, highpass_a_height, highpass_stride, a_expected; int highpass_height, highpass_width, highpass_a_width, highpass_a_height, highpass_stride, a_expected;
int expected; int expected;
GetBitContext gbit;
int level, run, coeff; int level, run, coeff;
int count = 0, bytes; int count = 0, bytes;
@ -802,11 +803,11 @@ static int cfhd_decode(AVCodecContext *avctx, AVFrame *pic,
av_log(avctx, AV_LOG_DEBUG, "Start subband coeffs plane %i level %i codebook %i expected %i\n", s->channel_num, s->level, s->codebook, expected); av_log(avctx, AV_LOG_DEBUG, "Start subband coeffs plane %i level %i codebook %i expected %i\n", s->channel_num, s->level, s->codebook, expected);
ret = init_get_bits8(&s->gb, gb.buffer, bytestream2_get_bytes_left(&gb)); ret = init_get_bits8(&gbit, gb.buffer, bytestream2_get_bytes_left(&gb));
if (ret < 0) if (ret < 0)
goto end; goto end;
{ {
OPEN_READER(re, &s->gb); OPEN_READER(re, &gbit);
const int lossless = s->band_encoding == 5; const int lossless = s->band_encoding == 5;
@ -814,8 +815,8 @@ static int cfhd_decode(AVCodecContext *avctx, AVFrame *pic,
s->codebook = 1; s->codebook = 1;
if (!s->codebook) { if (!s->codebook) {
while (1) { while (1) {
UPDATE_CACHE(re, &s->gb); UPDATE_CACHE(re, &gbit);
GET_RL_VLC(level, run, re, &s->gb, s->table_9_rl_vlc, GET_RL_VLC(level, run, re, &gbit, s->table_9_rl_vlc,
VLC_BITS, 3, 1); VLC_BITS, 3, 1);
/* escape */ /* escape */
@ -845,8 +846,8 @@ static int cfhd_decode(AVCodecContext *avctx, AVFrame *pic,
} }
} else { } else {
while (1) { while (1) {
UPDATE_CACHE(re, &s->gb); UPDATE_CACHE(re, &gbit);
GET_RL_VLC(level, run, re, &s->gb, s->table_18_rl_vlc, GET_RL_VLC(level, run, re, &gbit, s->table_18_rl_vlc,
VLC_BITS, 3, 1); VLC_BITS, 3, 1);
/* escape */ /* escape */
@ -875,7 +876,7 @@ static int cfhd_decode(AVCodecContext *avctx, AVFrame *pic,
} }
} }
} }
CLOSE_READER(re, &s->gb); CLOSE_READER(re, &gbit);
} }
if (count > expected) { if (count > expected) {
@ -888,7 +889,7 @@ static int cfhd_decode(AVCodecContext *avctx, AVFrame *pic,
if (s->difference_coding) if (s->difference_coding)
difference_coding(s->plane[s->channel_num].subband[s->subband_num_actual], highpass_width, highpass_height); difference_coding(s->plane[s->channel_num].subband[s->subband_num_actual], highpass_width, highpass_height);
bytes = FFALIGN(AV_CEIL_RSHIFT(get_bits_count(&s->gb), 3), 4); bytes = FFALIGN(AV_CEIL_RSHIFT(get_bits_count(&gbit), 3), 4);
if (bytes > bytestream2_get_bytes_left(&gb)) { if (bytes > bytestream2_get_bytes_left(&gb)) {
av_log(avctx, AV_LOG_ERROR, "Bitstream overread error\n"); av_log(avctx, AV_LOG_ERROR, "Bitstream overread error\n");
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);

3
libavcodec/cfhd.h
View File

@ -25,7 +25,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "get_bits.h"
#include "cfhddsp.h" #include "cfhddsp.h"
enum CFHDParam { enum CFHDParam {
@ -144,8 +143,6 @@ typedef struct CFHDContext {
int lut[2][256]; int lut[2][256];
GetBitContext gb;
int planes; int planes;
int frame_type; int frame_type;
int frame_index; int frame_index;