History

wav: convert to new channel layout API

Vittorio Giovara committed 9 years ago

Commit 95a3f131 parent ba36f3f2 files · +24 −22Browse files

Unified · Split

2 files
  1. libavformat/wavdec.c +17 −15
  2. libavformat/wavenc.c +7 −7
libavformat/wavdec.c+17−15
@@ -221,9 +221,11 @@ static int wav_parse_xma2_tag(AVFormatContext *s, int64_t size, AVStream *st) · 220 unmodified lines
221221 channels += avio_r8(pb);
222222 avio_skip(pb, 3);
223223 }
224− st->codecpar->channels = channels;
224+ av_channel_layout_uninit(&st->codecpar->ch_layout);
225+ st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
226+ st->codecpar->ch_layout.nb_channels = channels;
225227
226− if (st->codecpar->channels <= 0 || st->codecpar->sample_rate <= 0)
228+ if (st->codecpar->ch_layout.nb_channels <= 0 || st->codecpar->sample_rate <= 0)
227229 return AVERROR_INVALIDDATA;
228230
229231 avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
@@ -611,15 +613,15 @@ break_loop: · 381 unmodified lines
611613
612614 if ( st->codecpar->bit_rate > 0 && data_size > 0
613615 && st->codecpar->sample_rate > 0
614− && sample_count > 0 && st->codecpar->channels > 1
615− && sample_count % st->codecpar->channels == 0) {
616− if (fabs(8.0 * data_size * st->codecpar->channels * st->codecpar->sample_rate /
616+ && sample_count > 0 && st->codecpar->ch_layout.nb_channels > 1
617+ && sample_count % st->codecpar->ch_layout.nb_channels == 0) {
618+ if (fabs(8.0 * data_size * st->codecpar->ch_layout.nb_channels * st->codecpar->sample_rate /
617619 sample_count /st->codecpar->bit_rate - 1.0) < 0.3)
618− sample_count /= st->codecpar->channels;
620+ sample_count /= st->codecpar->ch_layout.nb_channels;
619621 }
620622
621− if ( data_size > 0 && sample_count && st->codecpar->channels
622− && (data_size << 3) / sample_count / st->codecpar->channels > st->codecpar->bits_per_coded_sample + 1) {
623+ if (data_size > 0 && sample_count && st->codecpar->ch_layout.nb_channels &&
624+ (data_size << 3) / sample_count / st->codecpar->ch_layout.nb_channels > st->codecpar->bits_per_coded_sample + 1) {
623625 av_log(s, AV_LOG_WARNING, "ignoring wrong sample_count %"PRId64"\n", sample_count);
624626 sample_count = 0;
625627 }
@@ -632,34 +634,34 @@ break_loop: · 6 unmodified lines
632634 }
633635
634636 if (!sample_count || av_get_exact_bits_per_sample(st->codecpar->codec_id) > 0)
635− if ( st->codecpar->channels
637+ if ( st->codecpar->ch_layout.nb_channels
636638 && data_size
637639 && av_get_bits_per_sample(st->codecpar->codec_id)
638640 && wav->data_end <= avio_size(pb))
639641 sample_count = (data_size << 3)
640642 /
641− (st->codecpar->channels * (uint64_t)av_get_bits_per_sample(st->codecpar->codec_id));
643+ (st->codecpar->ch_layout.nb_channels * (uint64_t)av_get_bits_per_sample(st->codecpar->codec_id));
642644
643645 if (sample_count)
644646 st->duration = sample_count;
645647
646648 if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S32LE &&
647− st->codecpar->block_align == st->codecpar->channels * 4 &&
649+ st->codecpar->block_align == st->codecpar->ch_layout.nb_channels * 4 &&
648650 st->codecpar->bits_per_coded_sample == 32 &&
649651 st->codecpar->extradata_size == 2 &&
650652 AV_RL16(st->codecpar->extradata) == 1) {
651653 st->codecpar->codec_id = AV_CODEC_ID_PCM_F16LE;
652654 st->codecpar->bits_per_coded_sample = 16;
653655 } else if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S24LE &&
654− st->codecpar->block_align == st->codecpar->channels * 4 &&
656+ st->codecpar->block_align == st->codecpar->ch_layout.nb_channels * 4 &&
655657 st->codecpar->bits_per_coded_sample == 24) {
656658 st->codecpar->codec_id = AV_CODEC_ID_PCM_F24LE;
657659 } else if (st->codecpar->codec_id == AV_CODEC_ID_XMA1 ||
658660 st->codecpar->codec_id == AV_CODEC_ID_XMA2) {
659661 st->codecpar->block_align = 2048;
660− } else if (st->codecpar->codec_id == AV_CODEC_ID_ADPCM_MS && st->codecpar->channels > 2 &&
661− st->codecpar->block_align < INT_MAX / st->codecpar->channels) {
662− st->codecpar->block_align *= st->codecpar->channels;
662+ } else if (st->codecpar->codec_id == AV_CODEC_ID_ADPCM_MS && st->codecpar->ch_layout.nb_channels > 2 &&
663+ st->codecpar->block_align < INT_MAX / st->codecpar->ch_layout.nb_channels) {
664+ st->codecpar->block_align *= st->codecpar->ch_layout.nb_channels;
663665 }
664666
665667 ff_metadata_conv_ctx(s, NULL, wav_metadata_conv);
libavformat/wavenc.c+7−7
@@ -170,12 +170,12 @@ static av_cold int peak_init_writer(AVFormatContext *s) · 169 unmodified lines
170170 "Writing 16 bit peak for 8 bit audio does not make sense\n");
171171 return AVERROR(EINVAL);
172172 }
173− if (par->channels > INT_MAX / (wav->peak_bps * wav->peak_ppv))
173+ if (par->ch_layout.nb_channels > INT_MAX / (wav->peak_bps * wav->peak_ppv))
174174 return AVERROR(ERANGE);
175− wav->size_increment = par->channels * wav->peak_bps * wav->peak_ppv;
175+ wav->size_increment = par->ch_layout.nb_channels * wav->peak_bps * wav->peak_ppv;
176176
177− wav->peak_maxpos = av_calloc(par->channels, sizeof(*wav->peak_maxpos));
178− wav->peak_maxneg = av_calloc(par->channels, sizeof(*wav->peak_maxneg));
177+ wav->peak_maxpos = av_calloc(par->ch_layout.nb_channels, sizeof(*wav->peak_maxpos));
178+ wav->peak_maxneg = av_calloc(par->ch_layout.nb_channels, sizeof(*wav->peak_maxneg));
179179 if (!wav->peak_maxpos || !wav->peak_maxneg)
180180 goto nomem;
181181
@@ -205,7 +205,7 @@ static int peak_write_frame(AVFormatContext *s) · 23 unmodified lines
205205 }
206206 wav->peak_output = tmp;
207207
208− for (c = 0; c < par->channels; c++) {
208+ for (c = 0; c < par->ch_layout.nb_channels; c++) {
209209 wav->peak_maxneg[c] = -wav->peak_maxneg[c];
210210
211211 if (wav->peak_bps == 2 && wav->peak_format == PEAK_FORMAT_UINT8) {
@@ -277,7 +277,7 @@ static int peak_write_chunk(AVFormatContext *s) · 65 unmodified lines
277277 avio_wl32(pb, wav->peak_format); /* 8 or 16 bit */
278278 avio_wl32(pb, wav->peak_ppv); /* positive and negative */
279279 avio_wl32(pb, wav->peak_block_size); /* frames per value */
280− avio_wl32(pb, par->channels); /* number of channels */
280+ avio_wl32(pb, par->ch_layout.nb_channels); /* number of channels */
281281 avio_wl32(pb, wav->peak_num_frames); /* number of peak frames */
282282 avio_wl32(pb, -1); /* audio sample frame position (not implemented) */
283283 avio_wl32(pb, 128); /* equal to size of header */
@@ -384,7 +384,7 @@ static int wav_write_packet(AVFormatContext *s, AVPacket *pkt) · 100 unmodified lines
384384 wav->peak_maxpos[c] = FFMAX(wav->peak_maxpos[c], (int16_t)AV_RL16(pkt->data + i));
385385 wav->peak_maxneg[c] = FFMIN(wav->peak_maxneg[c], (int16_t)AV_RL16(pkt->data + i));
386386 }
387− if (++c == s->streams[0]->codecpar->channels) {
387+ if (++c == s->streams[0]->codecpar->ch_layout.nb_channels) {
388388 c = 0;
389389 if (++wav->peak_block_pos == wav->peak_block_size) {
390390 int ret = peak_write_frame(s);

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