har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

doc/examples/transcode_aac: use av_samples_alloc_array_and_samples to allocate the input samples buffer and pointers

Browse Source 
Fixes -Wuse-after-free warnings and simplifies code.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-05-05 15:26:19 -03:00
parent 09b2ca93b4
commit ed3691338b
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
doc/examples/transcode_aac.c
View File

@ -447,26 +447,17 @@ static int init_converted_samples(uint8_t ***converted_input_samples,
int error; int error;
/* Allocate as many pointers as there are audio channels. /* Allocate as many pointers as there are audio channels.
* Each pointer will later point to the audio samples of the corresponding * Each pointer will point to the audio samples of the corresponding
* channels (although it may be NULL for interleaved formats). * channels (although it may be NULL for interleaved formats).
*/ * Allocate memory for the samples of all channels in one consecutive
if (!(*converted_input_samples = calloc(output_codec_context->ch_layout.nb_channels,
sizeof(**converted_input_samples)))) {
fprintf(stderr, "Could not allocate converted input sample pointers\n");
return AVERROR(ENOMEM);
}
/* Allocate memory for the samples of all channels in one consecutive
* block for convenience. */ * block for convenience. */
if ((error = av_samples_alloc(*converted_input_samples, NULL, if ((error = av_samples_alloc_array_and_samples(converted_input_samples, NULL,
output_codec_context->ch_layout.nb_channels, output_codec_context->ch_layout.nb_channels,
frame_size, frame_size,
output_codec_context->sample_fmt, 0)) < 0) { output_codec_context->sample_fmt, 0)) < 0) {
fprintf(stderr, fprintf(stderr,
"Could not allocate converted input samples (error '%s')\n", "Could not allocate converted input samples (error '%s')\n",
av_err2str(error)); av_err2str(error));
av_freep(&(*converted_input_samples)[0]);
free(*converted_input_samples);
return error; return error;
} }
return 0; return 0;
@ -598,10 +589,9 @@ static int read_decode_convert_and_store(AVAudioFifo *fifo,
ret = 0; ret = 0;
cleanup: cleanup:
if (converted_input_samples) { if (converted_input_samples)
av_freep(&converted_input_samples[0]); av_freep(&converted_input_samples[0]);
free(converted_input_samples); av_freep(&converted_input_samples);
}
av_frame_free(&input_frame); av_frame_free(&input_frame);
return ret; return ret;