ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Wed Oct 19 21:21:08 2016 +0200| [f76698e759a08e8d3b629c06edb0439f474e7fee] | committer: Anton Khirnov
examples/encode_audio: use the AVFrame API for allocating the data It is simpler and more efficient. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f76698e759a08e8d3b629c06edb0439f474e7fee --- doc/examples/encode_audio.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/doc/examples/encode_audio.c b/doc/examples/encode_audio.c index a8e0cd0..db2440f 100644 --- a/doc/examples/encode_audio.c +++ b/doc/examples/encode_audio.c @@ -97,7 +97,6 @@ int main(int argc, char **argv) AVFrame *frame; AVPacket pkt; int i, j, k, ret, got_output; - int buffer_size; FILE *f; uint16_t *samples; float t, tincr; @@ -159,21 +158,10 @@ int main(int argc, char **argv) frame->format = c->sample_fmt; frame->channel_layout = c->channel_layout; - /* the codec gives us the frame size, in samples, - * we calculate the size of the samples buffer in bytes */ - buffer_size = av_samples_get_buffer_size(NULL, c->channels, c->frame_size, - c->sample_fmt, 0); - samples = av_malloc(buffer_size); - if (!samples) { - fprintf(stderr, "could not allocate %d bytes for samples buffer\n", - buffer_size); - exit(1); - } - /* setup the data pointers in the AVFrame */ - ret = avcodec_fill_audio_frame(frame, c->channels, c->sample_fmt, - (const uint8_t*)samples, buffer_size, 0); + /* allocate the data buffers */ + ret = av_frame_get_buffer(frame, 0); if (ret < 0) { - fprintf(stderr, "could not setup audio frame\n"); + fprintf(stderr, "could not allocate audio data buffers\n"); exit(1); } @@ -185,6 +173,13 @@ int main(int argc, char **argv) pkt.data = NULL; // packet data will be allocated by the encoder pkt.size = 0; + /* make sure the frame is writable -- makes a copy if the encoder + * kept a reference internally */ + ret = av_frame_make_writable(frame); + if (ret < 0) + exit(1); + samples = (uint16_t*)frame->data[0]; + for (j = 0; j < c->frame_size; j++) { samples[2*j] = (int)(sin(t) * 10000); @@ -205,7 +200,6 @@ int main(int argc, char **argv) } fclose(f); - av_freep(&samples); av_frame_free(&frame); avcodec_free_context(&c); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
