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
108 }108 }
109}109}
110 110
111static 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
111static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt)123static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt)
112{124{
113 PCMContext *s = ctx->priv_data;125 PCMContext *s = ctx->priv_data;
@@ -158,7 +170,7 @@ static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt) · 44 unmodified lines
158 ret = ff_bsf_get_packet_ref(ctx, s->in_pkt);170 ret = ff_bsf_get_packet_ref(ctx, s->in_pkt);
159 if (ret == AVERROR_EOF && s->out_pkt->size) {171 if (ret == AVERROR_EOF && s->out_pkt->size) {
160 if (s->pad) {172 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);
162 s->out_pkt->size = data_size;174 s->out_pkt->size = data_size;
163 } else {175 } else {
164 nb_samples = s->out_pkt->size / s->sample_size;176 nb_samples = s->out_pkt->size / s->sample_size;
@@ -193,21 +205,27 @@ static const AVClass pcm_rechunk_class = { · 28 unmodified lines
193};205};
194 206
195static const enum AVCodecID codec_ids[] = {207static const enum AVCodecID codec_ids[] = {
208 AV_CODEC_ID_PCM_ALAW,
196 AV_CODEC_ID_PCM_F16LE,209 AV_CODEC_ID_PCM_F16LE,
197 AV_CODEC_ID_PCM_F24LE,210 AV_CODEC_ID_PCM_F24LE,
198 AV_CODEC_ID_PCM_F32BE,211 AV_CODEC_ID_PCM_F32BE,
199 AV_CODEC_ID_PCM_F32LE,212 AV_CODEC_ID_PCM_F32LE,
200 AV_CODEC_ID_PCM_F64BE,213 AV_CODEC_ID_PCM_F64BE,
201 AV_CODEC_ID_PCM_F64LE,214 AV_CODEC_ID_PCM_F64LE,
215 AV_CODEC_ID_PCM_MULAW,
202 AV_CODEC_ID_PCM_S16BE,216 AV_CODEC_ID_PCM_S16BE,
203 AV_CODEC_ID_PCM_S16LE,217 AV_CODEC_ID_PCM_S16LE,
204 AV_CODEC_ID_PCM_S24BE,218 AV_CODEC_ID_PCM_S24BE,
219 AV_CODEC_ID_PCM_S24DAUD,
205 AV_CODEC_ID_PCM_S24LE,220 AV_CODEC_ID_PCM_S24LE,
206 AV_CODEC_ID_PCM_S32BE,221 AV_CODEC_ID_PCM_S32BE,
207 AV_CODEC_ID_PCM_S32LE,222 AV_CODEC_ID_PCM_S32LE,
208 AV_CODEC_ID_PCM_S64BE,223 AV_CODEC_ID_PCM_S64BE,
209 AV_CODEC_ID_PCM_S64LE,224 AV_CODEC_ID_PCM_S64LE,
210 AV_CODEC_ID_PCM_S8,225 AV_CODEC_ID_PCM_S8,
226 AV_CODEC_ID_PCM_SGA,
227 AV_CODEC_ID_PCM_U8,
228 AV_CODEC_ID_PCM_VIDC,
211 AV_CODEC_ID_NONE,229 AV_CODEC_ID_NONE,
212};230};
213 231

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