From patchwork Thu Feb 4 19:09:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25435 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 981E044A960 for ; Thu, 4 Feb 2021 21:17:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C57968AABC; Thu, 4 Feb 2021 21:11:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA5F168AA95 for ; Thu, 4 Feb 2021 21:11:52 +0200 (EET) Received: by mail-qk1-f175.google.com with SMTP id a19so4489649qka.2 for ; Thu, 04 Feb 2021 11:11:52 -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=QYq+7aUrBF0jBI52dITVhapBFeajgNqAvogUm+vXv2k=; b=M8c3LZnC2LkKUvI/Hb55uqc/2Av0tXRsWznaeQRrMqn8NqI0LCI+/S2FFeEgKww8AH 94GEsAEcJDMDLuwkEy+txvm6FHo6ubLWs4Z7HlZrm7rXiXzLtEukgdWEayrp9xmuW9ff VRgalzjcU7z88CPxUxB2BXmojfcCgsb1Gg3Bkxh2gOPMAcrYhGM5Hwlbr3NYss/e2CdS RMkl6mtabUJmNWFOUrLs6i3rNhxdFFdIwTvGrVm3uYvimLYPNqeLx/oIcbkfnJsXgu9t FHOkzCk5JEA12ysOSvNfxmncM8qDRKRi58+cG9pzYpVtfDR4Iq85RL43o7S6g07+0RTy aHfA== 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=QYq+7aUrBF0jBI52dITVhapBFeajgNqAvogUm+vXv2k=; b=ENOlcbGoi2w4a8JRIaYC9nu55KnDvZM7X/Ti5MJ2RDL12sJuUeG4/7lwKnhizf9FNT qJAXFYOmV31j8NP2hPle5RqbT/wZ9c97XpmMWbJNddoXXTvyeQI82ykJYgtT5ikXaqe2 1Owzgsqx6z+D6cPn3+nFa7KzxvYR4ax4jkVYFN9kYeM4E8dk7U2Y3Z3ONTZ+zyWrr2L4 xe2fZUaY3MbaCEPy3JWWIboU4rkmqwbwiYsjG2sTmaCgA1wggtpRH/vxHMe7tSeHwKyP WmwdqrrmV097FXgP1lGEBwp87XiKtHCd3MVJ+FNSyDhtyBPSE2uKQ+tI+DLs3SDPCJya M1XQ== X-Gm-Message-State: AOAM532qT8m8rJPkPm9OdFBbAgrxk3IfJJreb+jfavJmuz0LKPRuR/TW GjREyUFvcwXY1ZeYH7rgqXdBhj4ZyaU= X-Google-Smtp-Source: ABdhPJzUE63qxlN7WMeo36Ukf5hCAd8ilIp8UeWnq7WdhCD/vFOP71trY3YVgMz5a/zihyxCZGuUCQ== X-Received: by 2002:a37:63d4:: with SMTP id x203mr642110qkb.105.1612465911528; Thu, 04 Feb 2021 11:11:51 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:50 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:58 -0300 Message-Id: <20210204191005.48190-44-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 43/50] doc/examples/demuxing_decoding: 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/demuxing_decoding.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/doc/examples/demuxing_decoding.c b/doc/examples/demuxing_decoding.c index 803e35d25c..db5e0cb951 100644 --- a/doc/examples/demuxing_decoding.c +++ b/doc/examples/demuxing_decoding.c @@ -51,7 +51,7 @@ static int video_dst_bufsize; static int video_stream_idx = -1, audio_stream_idx = -1; static AVFrame *frame = NULL; -static AVPacket pkt; +static AVPacket *pkt = NULL; static int video_frame_count = 0; static int audio_frame_count = 0; @@ -303,10 +303,12 @@ int main (int argc, char **argv) goto end; } - /* initialize packet, set data to NULL, let the demuxer fill it */ - av_init_packet(&pkt); - pkt.data = NULL; - pkt.size = 0; + pkt = av_packet_alloc(); + if (!pkt) { + fprintf(stderr, "Could not allocate packet\n"); + ret = AVERROR(ENOMEM); + goto end; + } if (video_stream) printf("Demuxing video from file '%s' into '%s'\n", src_filename, video_dst_filename); @@ -314,14 +316,14 @@ int main (int argc, char **argv) printf("Demuxing audio from file '%s' into '%s'\n", src_filename, audio_dst_filename); /* read frames from the file */ - while (av_read_frame(fmt_ctx, &pkt) >= 0) { + while (av_read_frame(fmt_ctx, pkt) >= 0) { // check if the packet belongs to a stream we are interested in, otherwise // skip it - if (pkt.stream_index == video_stream_idx) - ret = decode_packet(video_dec_ctx, &pkt); - else if (pkt.stream_index == audio_stream_idx) - ret = decode_packet(audio_dec_ctx, &pkt); - av_packet_unref(&pkt); + if (pkt->stream_index == video_stream_idx) + ret = decode_packet(video_dec_ctx, pkt); + else if (pkt->stream_index == audio_stream_idx) + ret = decode_packet(audio_dec_ctx, pkt); + av_packet_unref(pkt); if (ret < 0) break; } @@ -372,6 +374,7 @@ end: fclose(video_dst_file); if (audio_dst_file) fclose(audio_dst_file); + av_packet_free(&pkt); av_frame_free(&frame); av_free(video_dst_data[0]);