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/ac3dec: Read spx flags at once, not one bit at a time

Browse Source 
Doing so gets rid of a stupid GCC -Wstringop-overflow= warning
(GCC somehow believes that fbw_channels can be 7 with the old
form of the code, so that channel_uses_spx[7] would be written
to, but now it no longer believes so).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-30 13:40:58 +02:00
parent 2204efc2a6
commit ffa56f73a9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/ac3dec.c
View File

@ -854,16 +854,18 @@ static void decode_band_structure(GetBitContext *gbc, int blk, int eac3,
static inline int spx_strategy(AC3DecodeContext *s, int blk) static inline int spx_strategy(AC3DecodeContext *s, int blk)
{ {
GetBitContext *bc = &s->gbc; GetBitContext *bc = &s->gbc;
int fbw_channels = s->fbw_channels;
int dst_start_freq, dst_end_freq, src_start_freq, int dst_start_freq, dst_end_freq, src_start_freq,
start_subband, end_subband, ch; start_subband, end_subband;
/* determine which channels use spx */ /* determine which channels use spx */
if (s->channel_mode == AC3_CHMODE_MONO) { if (s->channel_mode == AC3_CHMODE_MONO) {
s->channel_uses_spx[1] = 1; s->channel_uses_spx[1] = 1;
} else { } else {
for (ch = 1; ch <= fbw_channels; ch++) unsigned channel_uses_spx = get_bits(bc, s->fbw_channels);
s->channel_uses_spx[ch] = get_bits1(bc); for (int ch = s->fbw_channels; ch >= 1; --ch) {
s->channel_uses_spx[ch] = channel_uses_spx & 1;
channel_uses_spx >>= 1;
}
} }
/* get the frequency bins of the spx copy region and the spx start /* get the frequency bins of the spx copy region and the spx start