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

avcodec/aaccoder: Add minimal bias in search_for_ms()

Browse Source 
Fixes: floating point division by 0
Fixes: Ticket8218

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 75a099fc734a4ee2b1347d0a3d8c53d883b95174)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-05-31 21:00:32 +02:00
parent 7590dbf9be
commit c593517453
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/aaccoder.c
View File

@ -843,25 +843,25 @@ static void search_for_ms(AACEncContext *s, ChannelElement *cpe)
sce0->ics.swb_sizes[g], sce0->ics.swb_sizes[g],
sce0->sf_idx[w*16+g], sce0->sf_idx[w*16+g],
sce0->band_type[w*16+g], sce0->band_type[w*16+g],
lambda / band0->threshold, INFINITY, &b1, NULL, 0); lambda / (band0->threshold + FLT_MIN), INFINITY, &b1, NULL, 0);
dist1 += quantize_band_cost(s, &sce1->coeffs[start + (w+w2)*128], dist1 += quantize_band_cost(s, &sce1->coeffs[start + (w+w2)*128],
R34, R34,
sce1->ics.swb_sizes[g], sce1->ics.swb_sizes[g],
sce1->sf_idx[w*16+g], sce1->sf_idx[w*16+g],
sce1->band_type[w*16+g], sce1->band_type[w*16+g],
lambda / band1->threshold, INFINITY, &b2, NULL, 0); lambda / (band1->threshold + FLT_MIN), INFINITY, &b2, NULL, 0);
dist2 += quantize_band_cost(s, M, dist2 += quantize_band_cost(s, M,
M34, M34,
sce0->ics.swb_sizes[g], sce0->ics.swb_sizes[g],
mididx, mididx,
midcb, midcb,
lambda / minthr, INFINITY, &b3, NULL, 0); lambda / (minthr + FLT_MIN), INFINITY, &b3, NULL, 0);
dist2 += quantize_band_cost(s, S, dist2 += quantize_band_cost(s, S,
S34, S34,
sce1->ics.swb_sizes[g], sce1->ics.swb_sizes[g],
sididx, sididx,
sidcb, sidcb,
mslambda / (minthr * bmax), INFINITY, &b4, NULL, 0); mslambda / (minthr * bmax + FLT_MIN), INFINITY, &b4, NULL, 0);
B0 += b1+b2; B0 += b1+b2;
B1 += b3+b4; B1 += b3+b4;
dist1 -= b1+b2; dist1 -= b1+b2;