[FFmpeg-devel] [PATCH] doc/examples: do not allocate AVFrame directly.

[Paul B Mahol]

On 2/16/13, Nicolas George <nicolas.george at normalesup.org> wrote:
>
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  doc/examples/filtering_audio.c |   13 +++++++++----
>  doc/examples/filtering_video.c |   15 ++++++++++-----
>  2 files changed, 19 insertions(+), 9 deletions(-)
>
> diff --git a/doc/examples/filtering_audio.c
> b/doc/examples/filtering_audio.c
> index b28e02b..6f70a8d 100644
> --- a/doc/examples/filtering_audio.c
> +++ b/doc/examples/filtering_audio.c
> @@ -169,9 +169,13 @@ int main(int argc, char **argv)
>  {
>      int ret;
>      AVPacket packet;
> -    AVFrame frame;
> +    AVFrame *frame = avcodec_alloc_frame();
>      int got_frame;
>
> +    if (!frame) {
> +        perror("Could not allocate frame");
> +        exit(1);
> +    }
>      if (argc != 2) {
>          fprintf(stderr, "Usage: %s file | %s\n", argv[0], player);
>          exit(1);
> @@ -193,9 +197,9 @@ int main(int argc, char **argv)
>              break;
>
>          if (packet.stream_index == audio_stream_index) {
> -            avcodec_get_frame_defaults(&frame);
> +            avcodec_get_frame_defaults(frame);
>              got_frame = 0;
> -            ret = avcodec_decode_audio4(dec_ctx, &frame, &got_frame,
> &packet);
> +            ret = avcodec_decode_audio4(dec_ctx, frame, &got_frame,
> &packet);
>              if (ret < 0) {
>                  av_log(NULL, AV_LOG_ERROR, "Error decoding audio\n");
>                  continue;
> @@ -203,7 +207,7 @@ int main(int argc, char **argv)
>
>              if (got_frame) {
>                  /* push the audio data from decoded frame into the
> filtergraph */
> -                if (av_buffersrc_add_frame(buffersrc_ctx, &frame, 0) < 0)
> {
> +                if (av_buffersrc_add_frame(buffersrc_ctx, frame, 0) < 0) {
>                      av_log(NULL, AV_LOG_ERROR, "Error while feeding the
> audio filtergraph\n");
>                      break;
>                  }
> @@ -229,6 +233,7 @@ end:
>      if (dec_ctx)
>          avcodec_close(dec_ctx);
>      avformat_close_input(&fmt_ctx);
> +    av_freep(&frame);
>
>      if (ret < 0 && ret != AVERROR_EOF) {
>          char buf[1024];
> diff --git a/doc/examples/filtering_video.c
> b/doc/examples/filtering_video.c
> index 90babb6..660e526 100644
> --- a/doc/examples/filtering_video.c
> +++ b/doc/examples/filtering_video.c
> @@ -173,9 +173,13 @@ int main(int argc, char **argv)
>  {
>      int ret;
>      AVPacket packet;
> -    AVFrame frame;
> +    AVFrame *frame = avcodec_alloc_frame();
>      int got_frame;
>
> +    if (!frame) {
> +        perror("Could not allocate frame");
> +        exit(1);
> +    }
>      if (argc != 2) {
>          fprintf(stderr, "Usage: %s file\n", argv[0]);
>          exit(1);
> @@ -197,19 +201,19 @@ int main(int argc, char **argv)
>              break;
>
>          if (packet.stream_index == video_stream_index) {
> -            avcodec_get_frame_defaults(&frame);
> +            avcodec_get_frame_defaults(frame);
>              got_frame = 0;
> -            ret = avcodec_decode_video2(dec_ctx, &frame, &got_frame,
> &packet);
> +            ret = avcodec_decode_video2(dec_ctx, frame, &got_frame,
> &packet);
>              if (ret < 0) {
>                  av_log(NULL, AV_LOG_ERROR, "Error decoding video\n");
>                  break;
>              }
>
>              if (got_frame) {
> -                frame.pts = av_frame_get_best_effort_timestamp(&frame);
> +                frame->pts = av_frame_get_best_effort_timestamp(frame);
>
>                  /* push the decoded frame into the filtergraph */
> -                if (av_buffersrc_add_frame(buffersrc_ctx, &frame, 0) < 0)
> {
> +                if (av_buffersrc_add_frame(buffersrc_ctx, frame, 0) < 0) {
>                      av_log(NULL, AV_LOG_ERROR, "Error while feeding the
> filtergraph\n");
>                      break;
>                  }
> @@ -236,6 +240,7 @@ end:
>      if (dec_ctx)
>          avcodec_close(dec_ctx);
>      avformat_close_input(&fmt_ctx);
> +    av_freep(&frame);
>
>      if (ret < 0 && ret != AVERROR_EOF) {
>          char buf[1024];
> --
> 1.7.10.4
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

LGTM with description why it is bad idea.