RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 16:22:37 +00:00
Code Issues Projects Releases Wiki Activity

avutil: allow NULL linesize in av_samples_fill_arrays() and av_samples_alloc()

Browse Source
This commit is contained in:
Justin Ruggles 2012-03-27 21:34:47 -04:00
parent b6c4518a87
commit 18ed3788b0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavutil/samplefmt.c
View File

@ -140,17 +140,20 @@ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
uint8_t *buf, int nb_channels, int nb_samples, uint8_t *buf, int nb_channels, int nb_samples,
enum AVSampleFormat sample_fmt, int align) enum AVSampleFormat sample_fmt, int align)
{ {
int ch, planar, buf_size; int ch, planar, buf_size, line_size;
planar = av_sample_fmt_is_planar(sample_fmt); planar = av_sample_fmt_is_planar(sample_fmt);
buf_size = av_samples_get_buffer_size(linesize, nb_channels, nb_samples, buf_size = av_samples_get_buffer_size(&line_size, nb_channels, nb_samples,
sample_fmt, align); sample_fmt, align);
if (buf_size < 0) if (buf_size < 0)
return buf_size; return buf_size;
audio_data[0] = buf; audio_data[0] = buf;
for (ch = 1; planar && ch < nb_channels; ch++) for (ch = 1; planar && ch < nb_channels; ch++)
audio_data[ch] = audio_data[ch-1] + *linesize; audio_data[ch] = audio_data[ch-1] + line_size;
if (linesize)
*linesize = line_size;
return 0; return 0;
} }

4
libavutil/samplefmt.h
View File

@ -139,7 +139,7 @@ int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
* for packed layout. * for packed layout.
* *
* @param[out] audio_data array to be filled with the pointer for each channel * @param[out] audio_data array to be filled with the pointer for each channel
* @param[out] linesize calculated linesize * @param[out] linesize calculated linesize, may be NULL
* @param buf the pointer to a buffer containing the samples * @param buf the pointer to a buffer containing the samples
* @param nb_channels the number of channels * @param nb_channels the number of channels
* @param nb_samples the number of samples in a single channel * @param nb_samples the number of samples in a single channel
@ -157,7 +157,7 @@ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, uint8_t *buf,
* The allocated samples buffer can be freed by using av_freep(&audio_data[0]) * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
* *
* @param[out] audio_data array to be filled with the pointer for each channel * @param[out] audio_data array to be filled with the pointer for each channel
* @param[out] linesize aligned size for audio buffer(s) * @param[out] linesize aligned size for audio buffer(s), may be NULL
* @param nb_channels number of audio channels * @param nb_channels number of audio channels
* @param nb_samples number of samples per channel * @param nb_samples number of samples per channel
* @param align buffer size alignment (1 = no alignment required) * @param align buffer size alignment (1 = no alignment required)