From patchwork Fri Feb 5 17:12:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25454 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 8270644B926 for ; Fri, 5 Feb 2021 19:12:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5EB3E689AEA; Fri, 5 Feb 2021 19:12:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E610268811C for ; Fri, 5 Feb 2021 19:12:41 +0200 (EET) Received: by mail-qt1-f176.google.com with SMTP id w20so5506819qta.0 for ; Fri, 05 Feb 2021 09:12:41 -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=gZz31bcJVhB2MHzdRTvloqxvl4Umn0gF3ggTVbYniOE=; b=q3Kk8z3zNHT7pDrRAZsvlprkkDYBOKIcageqE1c3fRhR0WeYgxnIKvINJa04IpJDiC xsQ5vOhnkWfHMcsmo/F39X/k4IlVsSRN8yinNCcqxTY+ipykYFw7RImBZ+tp2E8+UrEH 48ag2t053bbonXPOHmvgqMjppZ/HaPUkn8ink97lQOGGIHAHnJYVYx0HWHeZrVkBifQj APwVmQqXAAq7kAp2Bezsbnb2Gy8uq/iozuGCskaydL09L3qCJym8tpdn16jGQFciq1oP 4Zf/w9c8rZW2uINuLEJbNvZC891g2WtFFNRs3cs8LLYJMY5ZqWlfbV4uyizBPZVDJTz/ 8+vQ== 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=gZz31bcJVhB2MHzdRTvloqxvl4Umn0gF3ggTVbYniOE=; b=lqs4EsqBS5eUo5SO0E643JF0BiMQsSNf5FXiwDWT0P0jKuKLYCDQd6T25fmKqMuFW6 F7L/soNkz+Idb4EgGiTkcFbo7la7wdzL5+Vg6oyYRmuEn6fSeb/irOdyEYrP5PMa24Yt 7v1sVqYoLmNwsRjhpL5pRIMUkuFWVh35Y7vFVZylk5nCxwCOSPMMRl9kTevzPqtbEdRX Qm/l04xf9/Pp72bF+CWIKUxeY11BE1pKwN9XjIwbeKum92RqyUC+RtQRTgslJCF1lQbZ 8O5fQ/nYRHsvOLDbrn2cT3o/kQavDXp2Y7kNZLnv27Uq5o6LzP8F9zG8eH5npAokBPWU M+Xg== X-Gm-Message-State: AOAM530NaLuZPAxCE05Htg0uPz0RCl39EjbiOgLdmBTKzeXGace2tGTH 3MDQ6jNyH5g7DePDia5FLpfuDgVfwC0= X-Google-Smtp-Source: ABdhPJyH/tYHGNuEzVgGAZ4Dxu2KvVJMhR5PaF96+GHbkIykpJiYPKPoT2l9ix54EwXcV8y7hxAVLw== X-Received: by 2002:ac8:6f63:: with SMTP id u3mr5082832qtv.324.1612545160337; Fri, 05 Feb 2021 09:12:40 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id m2sm9676649qke.117.2021.02.05.09.12.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 09:12:39 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Feb 2021 14:12:09 -0300 Message-Id: <20210205171210.4062-1-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210205164906.GA938001@pb2> References: <20210205164906.GA938001@pb2> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 47/50 v2] 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; }