virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/dfpwmenc: Correctly pad input

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt
2025-06-22 07:37:45 +02:00
parent e813e1e940
commit 11d3af0d7f
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/dfpwmenc.c
View File

@@ -25,11 +25,11 @@
* DFPWM1a encoder * DFPWM1a encoder
*/ */
#include "libavutil/internal.h"
#include "avcodec.h" #include "avcodec.h"
#include "codec_id.h" #include "codec_id.h"
#include "codec_internal.h" #include "codec_internal.h"
#include "encode.h" #include "encode.h"
#include "internal.h"
typedef struct { typedef struct {
int fq, q, s, lt; int fq, q, s, lt;
@@ -85,6 +85,10 @@ static av_cold int dfpwm_enc_init(struct AVCodecContext *ctx)
state->lt = -128; state->lt = -128;
ctx->bits_per_coded_sample = 1; ctx->bits_per_coded_sample = 1;
// Pad so that nb_samples * nb_channels is always a multiple of eight.
ctx->internal->pad_samples = (const uint8_t[]){ 1, 8, 4, 8, 2, 8, 4, 8 }[ctx->ch_layout.nb_channels & 7];
if (ctx->frame_size <= 0 || ctx->frame_size * ctx->ch_layout.nb_channels % 8U)
ctx->frame_size = 4096;
return 0; return 0;
} }
@@ -93,7 +97,7 @@ static int dfpwm_enc_frame(struct AVCodecContext *ctx, struct AVPacket *packet,
const struct AVFrame *frame, int *got_packet) const struct AVFrame *frame, int *got_packet)
{ {
DFPWMState *state = ctx->priv_data; DFPWMState *state = ctx->priv_data;
int size = frame->nb_samples * frame->ch_layout.nb_channels / 8 + (frame->nb_samples % 8 > 0 ? 1 : 0); int size = frame->nb_samples * frame->ch_layout.nb_channels / 8U;
int ret = ff_get_encode_buffer(ctx, packet, size, 0); int ret = ff_get_encode_buffer(ctx, packet, size, 0);
if (ret) { if (ret) {
@@ -112,10 +116,9 @@ const FFCodec ff_dfpwm_encoder = {
CODEC_LONG_NAME("DFPWM1a audio"), CODEC_LONG_NAME("DFPWM1a audio"),
.p.type = AVMEDIA_TYPE_AUDIO, .p.type = AVMEDIA_TYPE_AUDIO,
.p.id = AV_CODEC_ID_DFPWM, .p.id = AV_CODEC_ID_DFPWM,
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
.priv_data_size = sizeof(DFPWMState), .priv_data_size = sizeof(DFPWMState),
.init = dfpwm_enc_init, .init = dfpwm_enc_init,
FF_CODEC_ENCODE_CB(dfpwm_enc_frame), FF_CODEC_ENCODE_CB(dfpwm_enc_frame),
CODEC_SAMPLEFMTS(AV_SAMPLE_FMT_U8), CODEC_SAMPLEFMTS(AV_SAMPLE_FMT_U8),
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_VARIABLE_FRAME_SIZE |
AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
}; };

4
tests/ref/lavf/dfpwm
View File

@@ -1,3 +1,3 @@
c216a2b5576f3e7f31516854bbb41eb8 *tests/data/lavf/lavf.dfpwm 5f070e76586d0ddac277ad10dfd43d7e *tests/data/lavf/lavf.dfpwm
5513 tests/data/lavf/lavf.dfpwm 5513 tests/data/lavf/lavf.dfpwm
tests/data/lavf/lavf.dfpwm CRC=0x226be6b3 tests/data/lavf/lavf.dfpwm CRC=0x21dfe683