From e1c74148128ebed7c7bc9d36c776f24898267174 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 22 Mar 2011 13:29:28 +0100 Subject: samplefmt: change layout for arrays created by av_samples_alloc() and _fill_arrays() The new layout is consistent with that of the av_image_() API, and simplifies understanding and copy operations, it also preserves alignment information which was lost with the previous layout. This breaks API/ABI, but since the function was never referenced in the code (and it isn't unlikely already used by someone) then this should not be a problem. --- libavutil/samplefmt.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'libavutil/samplefmt.c') diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index ea004d926a..ca669da8b5 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -76,28 +76,30 @@ int av_samples_fill_arrays(uint8_t *pointers[8], int linesizes[8], uint8_t *buf, int nb_channels, int nb_samples, enum AVSampleFormat sample_fmt, int planar, int align) { - int i, step_size = 0; + int i, linesize; int sample_size = av_get_bits_per_sample_fmt(sample_fmt) >> 3; - int channel_step = planar ? FFALIGN(nb_samples*sample_size, align) : sample_size; - if(nb_channels * (uint64_t)nb_samples * sample_size >= INT_MAX - align*(uint64_t)nb_channels) + if (nb_channels * (uint64_t)nb_samples * sample_size >= INT_MAX - align*(uint64_t)nb_channels) return AVERROR(EINVAL); + linesize = planar ? FFALIGN(nb_samples*sample_size, align) : + FFALIGN(nb_samples*sample_size*nb_channels, align); if (pointers) { pointers[0] = buf; - for (i = 0; i < nb_channels; i++) { - pointers[i] = buf + step_size; - step_size += channel_step; + for (i = 1; planar && i < nb_channels; i++) { + pointers[i] = pointers[i-1] + linesize; } - memset(&pointers[nb_channels], 0, (8-nb_channels) * sizeof(pointers[0])); + memset(&pointers[i], 0, (8-i) * sizeof(pointers[0])); } if (linesizes) { - linesizes[0] = planar ? sample_size : nb_channels*sample_size; - memset(&linesizes[1], 0, (8-1) * sizeof(linesizes[0])); + linesizes[0] = linesize; + for (i = 1; planar && i < nb_channels; i++) + linesizes[i] = linesizes[0]; + memset(&linesizes[i], 0, (8-i) * sizeof(linesizes[0])); } - return planar ? channel_step * nb_channels : FFALIGN(nb_channels*sample_size*nb_samples, align); + return planar ? linesize * nb_channels : linesize; } int av_samples_alloc(uint8_t *pointers[8], int linesizes[8], -- cgit v1.2.3