From patchwork Fri Mar 5 16:33:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26161 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 43CE544B5D3 for ; Fri, 5 Mar 2021 18:44:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B4CD68ADE6; Fri, 5 Mar 2021 18:36:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A52D68ADC9 for ; Fri, 5 Mar 2021 18:36:25 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id 130so2513839qkh.11 for ; Fri, 05 Mar 2021 08:36:25 -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=OmcnHaW2wQSlkjoL/UX7DFv4MG1+wDQgXhAKEPIg0Kw=; b=l7HlYtD6C4kO1Vy6Eh+3SfK0Q6E4Xo/mpkdtlRVGZlJIFJEO8yPt9HKYB4snjnkIU6 6I85FyySaiYm2Zt0RpiybNZx/odiIWdW+8KM1uZWKZl6s2GSchh55J8CVA8hAkpMpGv5 69qmOeUTsLIAgq9OwDhBrEidtj5iHt+Qzya69HDq9RFQwpyeznF8ppnf5T0oDEXSTg7J UwIqvd3UDdVKQlWiX3UcWHn7NZd/6sgt11bGBpSj2ayWsRRV93qxyrTGpPUGvW+n6aem 45KaJnzpkoteHQgy5It6HwMx5WORWvqQrSBqso2e5v1ftUCtSqjn1bUBKHClsWwWcPk9 tJXg== 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=OmcnHaW2wQSlkjoL/UX7DFv4MG1+wDQgXhAKEPIg0Kw=; b=jPlXujCPFSH7NVcrqcZtkz1T/AhuUAZWEKPpncqrjs09/1VYv1NDCMeFmUcEFxbn40 TCBEbwGEB1a8ne99eTZJ7PTWSW01bZpy+YhMm6YqtHi8JZgwo9A8jieJiueczp/KczoS pFKSPCtA3kDzuMZlMLT+hcppS24MDVtwEWgqa070aoAiMrytb+64O2+/+Bf5oFvzbOJA HkhEx+KNByGPKZe+pWm9xdKJ0MWq6Yhe/ceq+NBsn4SHdf8ITobPOhptQGyApwmKeEan 4llZT3neQvHHVPhv0z10Ib6w/+/HPQsd7OMD2P02M51Rccrxd7PULd60aoM9+HBlGBgw nm3A== X-Gm-Message-State: AOAM530RfN+cOlAN/F7ISQlXsqbZQcfYVr4JK1YzZqVQeRIfAVxLgkDd I43EJpvxL5rp5T/1j86JStuRJt0r5E4E0A== X-Google-Smtp-Source: ABdhPJwbaquOZ4sxIiczsfikaee31yARDVD9tsoDvWc6cPBE2Xc62+zIOcNduGgpJS9YV6UaSrTmFQ== X-Received: by 2002:a05:620a:630:: with SMTP id 16mr10580203qkv.304.1614962183595; Fri, 05 Mar 2021 08:36:23 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.36.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:36:23 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:37 -0300 Message-Id: <20210305163339.63164-47-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305163339.63164-1-jamrial@gmail.com> References: <20210305163339.63164-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 46/48] 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 | 42 ++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/doc/examples/vaapi_transcode.c b/doc/examples/vaapi_transcode.c index 279d20f636..5a1a704a8e 100644 --- a/doc/examples/vaapi_transcode.c +++ b/doc/examples/vaapi_transcode.c @@ -109,28 +109,25 @@ 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; + av_packet_unref(enc_pkt); 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)); @@ -216,7 +213,7 @@ static int dec_enc(AVPacket *pkt, AVCodec *enc_codec) initialized = 1; } - if ((ret = encode_write(frame)) < 0) + if ((ret = encode_write(pkt, frame)) < 0) fprintf(stderr, "Error during encoding and writing.\n"); fail: @@ -230,7 +227,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 +243,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,23 +278,21 @@ 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); + av_packet_unref(dec_pkt); + ret = dec_enc(dec_pkt, enc_codec); /* flush encoder */ - ret = encode_write(NULL); + ret = encode_write(dec_pkt, NULL); /* write the trailer for output stream */ av_write_trailer(ofmt_ctx); @@ -302,5 +303,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; }