| Message ID | 20240305225147.6849-2-cus@passwd.hu |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,1/9] avcodec/bsf/pcm_rechunk: reorder supported codec list | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On date Tuesday 2024-03-05 23:51:40 +0100, Marton Balint wrote: > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > libavcodec/bsf/pcm_rechunk.c | 20 +++++++++++++++++++- > 1 file changed, 19 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/bsf/pcm_rechunk.c b/libavcodec/bsf/pcm_rechunk.c > index 9bbc5a74d6..7198554c17 100644 > --- a/libavcodec/bsf/pcm_rechunk.c > +++ b/libavcodec/bsf/pcm_rechunk.c > @@ -108,6 +108,18 @@ static int get_next_nb_samples(AVBSFContext *ctx) > } > } > > +static void set_silence(AVCodecParameters *par, uint8_t *buf, size_t size) > +{ > + int c = 0; > + switch (par->codec_id) { > + case AV_CODEC_ID_PCM_ALAW: c = 0xd5; break; > + case AV_CODEC_ID_PCM_MULAW: > + case AV_CODEC_ID_PCM_VIDC: c = 0xff; break; > + case AV_CODEC_ID_PCM_U8: c = 0x80; break; > + } > + memset(buf, c, size); > +} Didn't verify these. > + > static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt) > { > PCMContext *s = ctx->priv_data; > @@ -158,7 +170,7 @@ static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt) > ret = ff_bsf_get_packet_ref(ctx, s->in_pkt); > if (ret == AVERROR_EOF && s->out_pkt->size) { > if (s->pad) { > - memset(s->out_pkt->data + s->out_pkt->size, 0, data_size - s->out_pkt->size); > + set_silence(ctx->par_in, s->out_pkt->data + s->out_pkt->size, data_size - s->out_pkt->size); > s->out_pkt->size = data_size; > } else { > nb_samples = s->out_pkt->size / s->sample_size; > @@ -194,11 +206,17 @@ static const AVClass pcm_rechunk_class = { > > static const enum AVCodecID codec_ids[] = { > // 8 bit > + AV_CODEC_ID_PCM_ALAW, > + AV_CODEC_ID_PCM_MULAW, > + AV_CODEC_ID_PCM_VIDC, > AV_CODEC_ID_PCM_S8, > + AV_CODEC_ID_PCM_SGA, > + AV_CODEC_ID_PCM_U8, > // 16 bit > AV_CODEC_ID_PCM_S16BE, > AV_CODEC_ID_PCM_S16LE, > // 24 bit > + AV_CODEC_ID_PCM_S24DAUD, > AV_CODEC_ID_PCM_S24BE, > AV_CODEC_ID_PCM_S24LE, > // 32 bit Looks good to me.
diff --git a/libavcodec/bsf/pcm_rechunk.c b/libavcodec/bsf/pcm_rechunk.c index 9bbc5a74d6..7198554c17 100644 --- a/libavcodec/bsf/pcm_rechunk.c +++ b/libavcodec/bsf/pcm_rechunk.c @@ -108,6 +108,18 @@ static int get_next_nb_samples(AVBSFContext *ctx) } } +static void set_silence(AVCodecParameters *par, uint8_t *buf, size_t size) +{ + int c = 0; + switch (par->codec_id) { + case AV_CODEC_ID_PCM_ALAW: c = 0xd5; break; + case AV_CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_VIDC: c = 0xff; break; + case AV_CODEC_ID_PCM_U8: c = 0x80; break; + } + memset(buf, c, size); +} + static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt) { PCMContext *s = ctx->priv_data; @@ -158,7 +170,7 @@ static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt) ret = ff_bsf_get_packet_ref(ctx, s->in_pkt); if (ret == AVERROR_EOF && s->out_pkt->size) { if (s->pad) { - memset(s->out_pkt->data + s->out_pkt->size, 0, data_size - s->out_pkt->size); + set_silence(ctx->par_in, s->out_pkt->data + s->out_pkt->size, data_size - s->out_pkt->size); s->out_pkt->size = data_size; } else { nb_samples = s->out_pkt->size / s->sample_size; @@ -194,11 +206,17 @@ static const AVClass pcm_rechunk_class = { static const enum AVCodecID codec_ids[] = { // 8 bit + AV_CODEC_ID_PCM_ALAW, + AV_CODEC_ID_PCM_MULAW, + AV_CODEC_ID_PCM_VIDC, AV_CODEC_ID_PCM_S8, + AV_CODEC_ID_PCM_SGA, + AV_CODEC_ID_PCM_U8, // 16 bit AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE, // 24 bit + AV_CODEC_ID_PCM_S24DAUD, AV_CODEC_ID_PCM_S24BE, AV_CODEC_ID_PCM_S24LE, // 32 bit
Signed-off-by: Marton Balint <cus@passwd.hu> --- libavcodec/bsf/pcm_rechunk.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)