From patchwork Thu Feb 4 19:10:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25419 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D1E9A4480C6 for ; Thu, 4 Feb 2021 21:12:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B68FC68AAD5; Thu, 4 Feb 2021 21:12:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA53468A403 for ; Thu, 4 Feb 2021 21:11:58 +0200 (EET) Received: by mail-qk1-f178.google.com with SMTP id a7so4397868qkb.13 for ; Thu, 04 Feb 2021 11:11:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uRat71KTZ0LsVdTCE3iDcikQorqunlvgGoMPWy2fYB8=; b=Dy22sgAJi4hHvB3tBFQkHLqeQoYZsphwycZ2/mAYoJNunOD6ItEHJBjouQayBhq/Kb Jqbk4yNR28zq/dZ95zzZc5bxEpPERAc1woBa+v0Hl1VOGXQPnhHvc3Y4tqhH1VRaiSP+ aVMaJw5ilCalbtxFbkz+eg75hvIGUylVSNh4ZN2JoxKEt57NSQvgw7i9jRUu9kd4A+la hgVntM7jz21tXzoTIYnIA+4t5i7NvABeCX5M1m+kzVbKBEdCmOi8ZyzcLxolfoVkudzo sc4fRTb1rZbnicTbFVPkt0tMJT2YxlRY1dCyOQQDb6UXsbb5+TSssdYG5l5GWLHWs7Ez k7jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uRat71KTZ0LsVdTCE3iDcikQorqunlvgGoMPWy2fYB8=; b=G7SU85gKTlVf8YMii89zWK2+9b+soSUIOTSlbf2TO4nj5IXeaToiSrS8UUIi9ZVGpG +jcznI460I/JGosQn2KC1RiNVG6TU+TLEsrpW1jZIIOJBW7ggpRHG9OC1xHNNMLMSUkk v2rDhpZ2UR/qfKRKBQWWnPm6j7evggsBc3xH4sJWGTywkxclqvjGATCq8AWXHWCFWV2B HV26HKC5s+Csx8HTymMen+uF4g4NHf2HZqgGKnTtnJ9q5aDkgKyEc54gC0KuCtha2qtY f4UZKayZs7mP4WZDrUedLQ4zViGbGc4Kr+IUSqQy0E8I3zAmtTfE14y8K1KTo+DkvHmb XJKw== X-Gm-Message-State: AOAM531ULlztWyDI5h1KhzyX82EDaCTuJd29NeKDyT5wIAdvdkjTv347 +gtU2BbjO6rMRdWmnO9QGn67FXF+S1k= X-Google-Smtp-Source: ABdhPJyEP/lRgOKSYrJKqHevZ5zEJtjvj/RT7H5oSXoLopd1b47vj13tLpvaG0QpYPJHbJXWtEv2pQ== X-Received: by 2002:a37:78c4:: with SMTP id t187mr630867qkc.139.1612465917418; Thu, 04 Feb 2021 11:11:57 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:56 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:10:02 -0300 Message-Id: <20210204191005.48190-48-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204191005.48190-1-jamrial@gmail.com> References: <20210204191005.48190-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 47/50] doc/examples/vaapi_transcode: use av_packet_alloc() to allocate packets X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- doc/examples/vaapi_transcode.c | 45 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/doc/examples/vaapi_transcode.c b/doc/examples/vaapi_transcode.c index 279d20f636..5fc09dd1d3 100644 --- a/doc/examples/vaapi_transcode.c +++ b/doc/examples/vaapi_transcode.c @@ -109,28 +109,23 @@ static int open_input_file(const char *filename) return ret; } -static int encode_write(AVFrame *frame) +static int encode_write(AVPacket *enc_pkt, AVFrame *frame) { int ret = 0; - AVPacket enc_pkt; - - av_init_packet(&enc_pkt); - enc_pkt.data = NULL; - enc_pkt.size = 0; if ((ret = avcodec_send_frame(encoder_ctx, frame)) < 0) { fprintf(stderr, "Error during encoding. Error code: %s\n", av_err2str(ret)); goto end; } while (1) { - ret = avcodec_receive_packet(encoder_ctx, &enc_pkt); + ret = avcodec_receive_packet(encoder_ctx, enc_pkt); if (ret) break; - enc_pkt.stream_index = 0; - av_packet_rescale_ts(&enc_pkt, ifmt_ctx->streams[video_stream]->time_base, + enc_pkt->stream_index = 0; + av_packet_rescale_ts(enc_pkt, ifmt_ctx->streams[video_stream]->time_base, ofmt_ctx->streams[0]->time_base); - ret = av_interleaved_write_frame(ofmt_ctx, &enc_pkt); + ret = av_interleaved_write_frame(ofmt_ctx, enc_pkt); if (ret < 0) { fprintf(stderr, "Error during writing data to output file. " "Error code: %s\n", av_err2str(ret)); @@ -148,6 +143,7 @@ end: static int dec_enc(AVPacket *pkt, AVCodec *enc_codec) { AVFrame *frame; + AVPacket *enc_pkt; int ret = 0; ret = avcodec_send_packet(decoder_ctx, pkt); @@ -159,10 +155,15 @@ static int dec_enc(AVPacket *pkt, AVCodec *enc_codec) while (ret >= 0) { if (!(frame = av_frame_alloc())) return AVERROR(ENOMEM); + if (!(enc_pkt = av_packet_alloc())) { + av_frame_free(&frame); + return AVERROR(ENOMEM); + } ret = avcodec_receive_frame(decoder_ctx, frame); if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) { av_frame_free(&frame); + av_packet_free(&enc_pkt); return 0; } else if (ret < 0) { fprintf(stderr, "Error while decoding. Error code: %s\n", av_err2str(ret)); @@ -216,11 +217,12 @@ static int dec_enc(AVPacket *pkt, AVCodec *enc_codec) initialized = 1; } - if ((ret = encode_write(frame)) < 0) + if ((ret = encode_write(enc_pkt, frame)) < 0) fprintf(stderr, "Error during encoding and writing.\n"); fail: av_frame_free(&frame); + av_packet_free(&enc_pkt); if (ret < 0) return ret; } @@ -230,7 +232,7 @@ fail: int main(int argc, char **argv) { int ret = 0; - AVPacket dec_pkt; + AVPacket *dec_pkt; AVCodec *enc_codec; if (argc != 4) { @@ -246,6 +248,12 @@ int main(int argc, char **argv) return -1; } + dec_pkt = av_packet_alloc(); + if (!dec_pkt) { + fprintf(stderr, "Failed to allocate decode packet\n"); + goto end; + } + if ((ret = open_input_file(argv[1])) < 0) goto end; @@ -275,20 +283,18 @@ int main(int argc, char **argv) /* read all packets and only transcoding video */ while (ret >= 0) { - if ((ret = av_read_frame(ifmt_ctx, &dec_pkt)) < 0) + if ((ret = av_read_frame(ifmt_ctx, dec_pkt)) < 0) break; - if (video_stream == dec_pkt.stream_index) - ret = dec_enc(&dec_pkt, enc_codec); + if (video_stream == dec_pkt->stream_index) + ret = dec_enc(dec_pkt, enc_codec); - av_packet_unref(&dec_pkt); + av_packet_unref(dec_pkt); } /* flush decoder */ - dec_pkt.data = NULL; - dec_pkt.size = 0; - ret = dec_enc(&dec_pkt, enc_codec); av_packet_unref(&dec_pkt); + ret = dec_enc(dec_pkt, enc_codec); /* flush encoder */ ret = encode_write(NULL); @@ -302,5 +308,6 @@ end: avcodec_free_context(&decoder_ctx); avcodec_free_context(&encoder_ctx); av_buffer_unref(&hw_device_ctx); + av_packet_free(&dec_pkt); return ret; }