History

avcodec/bsf/pcm_rechunk: add some more supported PCM formats

Marton Balint committed 2 years ago

Commit 9eebeea1 parent 66e62721 file · +19 −1Browse files

Unified · Split

libavcodec/bsf/pcm_rechunk.c+19−1
@@ -108,6 +108,18 @@ static int get_next_nb_samples(AVBSFContext *ctx) · 107 unmodified lines
108108 }
109109 }
110110
111+static void set_silence(AVCodecParameters *par, uint8_t *buf, size_t size)
112+{
113+ int c = 0;
114+ switch (par->codec_id) {
115+ case AV_CODEC_ID_PCM_ALAW: c = 0xd5; break;
116+ case AV_CODEC_ID_PCM_MULAW:
117+ case AV_CODEC_ID_PCM_VIDC: c = 0xff; break;
118+ case AV_CODEC_ID_PCM_U8: c = 0x80; break;
119+ }
120+ memset(buf, c, size);
121+}
122+
111123 static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt)
112124 {
113125 PCMContext *s = ctx->priv_data;
@@ -158,7 +170,7 @@ static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt) · 44 unmodified lines
158170 ret = ff_bsf_get_packet_ref(ctx, s->in_pkt);
159171 if (ret == AVERROR_EOF && s->out_pkt->size) {
160172 if (s->pad) {
161− memset(s->out_pkt->data + s->out_pkt->size, 0, data_size - s->out_pkt->size);
173+ set_silence(ctx->par_in, s->out_pkt->data + s->out_pkt->size, data_size - s->out_pkt->size);
162174 s->out_pkt->size = data_size;
163175 } else {
164176 nb_samples = s->out_pkt->size / s->sample_size;
@@ -193,21 +205,27 @@ static const AVClass pcm_rechunk_class = { · 28 unmodified lines
193205 };
194206
195207 static const enum AVCodecID codec_ids[] = {
208+ AV_CODEC_ID_PCM_ALAW,
196209 AV_CODEC_ID_PCM_F16LE,
197210 AV_CODEC_ID_PCM_F24LE,
198211 AV_CODEC_ID_PCM_F32BE,
199212 AV_CODEC_ID_PCM_F32LE,
200213 AV_CODEC_ID_PCM_F64BE,
201214 AV_CODEC_ID_PCM_F64LE,
215+ AV_CODEC_ID_PCM_MULAW,
202216 AV_CODEC_ID_PCM_S16BE,
203217 AV_CODEC_ID_PCM_S16LE,
204218 AV_CODEC_ID_PCM_S24BE,
219+ AV_CODEC_ID_PCM_S24DAUD,
205220 AV_CODEC_ID_PCM_S24LE,
206221 AV_CODEC_ID_PCM_S32BE,
207222 AV_CODEC_ID_PCM_S32LE,
208223 AV_CODEC_ID_PCM_S64BE,
209224 AV_CODEC_ID_PCM_S64LE,
210225 AV_CODEC_ID_PCM_S8,
226+ AV_CODEC_ID_PCM_SGA,
227+ AV_CODEC_ID_PCM_U8,
228+ AV_CODEC_ID_PCM_VIDC,
211229 AV_CODEC_ID_NONE,
212230 };
213231

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t