mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-02-10 20:19:56 +00:00
11d3af0d7f
Before this patch, the DFPWM1a encoder was marked as supporting variable frame sizes. The DFPWM1a format converts eight bytes of input into one output byte and so it simply padded the number of data output by frame->nb_samples * frame->ch_layout.nb_channels / 8 + (frame->nb_samples % 8 > 0 ? 1 : 0) This has several bugs: a) The additional byte leads to eight additional input byte being read; this can read into the frame's padding, i.e. the data can be uninitialized. b) The criterion for whether one should pad is wrong: nb_samples * nb_channels should be tested for divisibility by eight. c) The created frames can be undecodable (at least with our decoder): Our decoder requires the number of bits per frame to divisible by the number of channels, yet the above approach does not guarantee this. d) The padding will be added in the middle of the stream (potentially for every packet). This commit fixes all of this by removing the variable frame size cap and using AVCodecInternal.pad_samples to pad the last frame so that nb_samples * nb_channels is always a multiple of eight. The lavf-dfpwm FATE-test was affected by a). The frames originated from lavfi and were part of an audio frame pool, so that the padding contained data from an earlier (bigger) frame. Now the last frame is properly filled with silence. Reported-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> |
||
|---|---|---|
| .. | ||
| api | ||
| checkasm | ||
| fate | ||
| filtergraphs | ||
| maps | ||
| ref | ||
| streamgroups | ||
| .gitignore | ||
| audiogen.c | ||
| audiomatch.c | ||
| base64.c | ||
| copycooker.sh | ||
| extended.ffconcat | ||
| fate-run.sh | ||
| fate-valgrind.supp | ||
| fate.sh | ||
| Makefile | ||
| md5.sh | ||
| refcmp-metadata.awk | ||
| reference.pnm | ||
| rotozoom.c | ||
| simple1.ffconcat | ||
| simple2.ffconcat | ||
| test.ffmeta | ||
| tiny_psnr.c | ||
| tiny_ssim.c | ||
| utils.c | ||
| videogen.c | ||