generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/ebur128: rework channel weighting definition code

Browse Source 
Should fix CID1194399 (Bad bit shift operation)
This commit is contained in:
Clément Bœsch 2014-09-06 13:47:59 +02:00
parent 1654ca7d4e
commit b2c0b80f62
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/f_ebur128.c
View File

@ -363,7 +363,6 @@ static int config_audio_input(AVFilterLink *inlink)
static int config_audio_output(AVFilterLink *outlink) static int config_audio_output(AVFilterLink *outlink)
{ {
int i; int i;
int idx_bitposn = 0;
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
EBUR128Context *ebur128 = ctx->priv; EBUR128Context *ebur128 = ctx->priv;
const int nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout); const int nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout);
@ -379,23 +378,16 @@ static int config_audio_output(AVFilterLink *outlink)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (i = 0; i < nb_channels; i++) { for (i = 0; i < nb_channels; i++) {
/* find the next bit that is set starting from the right */
while ((outlink->channel_layout & 1ULL<<idx_bitposn) == 0 && idx_bitposn < 63)
idx_bitposn++;
/* channel weighting */ /* channel weighting */
if ((1ULL<<idx_bitposn & AV_CH_LOW_FREQUENCY) || const uint16_t chl = av_channel_layout_extract_channel(outlink->channel_layout, i);
(1ULL<<idx_bitposn & AV_CH_LOW_FREQUENCY_2)) { if (chl & (AV_CH_LOW_FREQUENCY|AV_CH_LOW_FREQUENCY_2)) {
ebur128->ch_weighting[i] = 0; ebur128->ch_weighting[i] = 0;
} else if (1ULL<<idx_bitposn & BACK_MASK) { } else if (chl & BACK_MASK) {
ebur128->ch_weighting[i] = 1.41; ebur128->ch_weighting[i] = 1.41;
} else { } else {
ebur128->ch_weighting[i] = 1.0; ebur128->ch_weighting[i] = 1.0;
} }
idx_bitposn++;
if (!ebur128->ch_weighting[i]) if (!ebur128->ch_weighting[i])
continue; continue;