From patchwork Mon Feb 1 22:44:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25336 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 D6011448D78 for ; Tue, 2 Feb 2021 00:50:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE82868A3A3; Tue, 2 Feb 2021 00:50:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B629E68A33F for ; Tue, 2 Feb 2021 00:50:43 +0200 (EET) Received: by mail-pj1-f53.google.com with SMTP id g15so618698pjd.2 for ; Mon, 01 Feb 2021 14:50:43 -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=Bn1F3g30Gti0ClM2H2Hh3jcfFU7Xj0xqJqasDGAb4KVBrAwzm28axRF8+2SSjzAS+s 8OGGmWHO9OimzCix/a4ogbF//teLFkEAx/WqxKXAI2rRIcOPdIMgCsVGeg3DpbsHU/gw nGHYpQ9OzHrJdXgsSCTbkD/7t2KAa78y83+loXF5VlEPk/vLzn4Xsp4Xj7r0xIOPDLwA PhZY+eRe82Cnl+HnsbrzTtkwuzzLnNPteKAuBWea2JDuwwQgTy9Ipf5zhJADh1pNwxhV aOVpghyDQJsZgwjmCrqRo8Hjzauqq/r6+m66vyLyqHn8CiH2XfoudQc12hExR5bpZOFp hMjQ== 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=f5egeopObmS7SK8QKIZK+HrVavvlEKbR/CeuEiykr0X94/XSVWfk/OO4OLU3OXVsdF kjJivA84+CGZewza4VwlPA22uw5dNekqFw2UWp1fwebigQPAxpmZNDIPuEMQ99oRXM0a cs36HbVQoXhTiyFKOag1b02RrNgg8TqM9nagcigvo5VpZWk1ncWqhUmPBHeMboD45Fou 2Q4jkYSnZYxirewwfl5Fvpk/gAb7rlC9cQKh9ke//cEMKVg8Yy4vWYYyLsebsb13QDnW FJzOcwTnaGEck4nU+cTAiu7fe0U7qWYPLS4Yvcdr578AxlZcEIxai8qFO2xaxtV1kKzK sbXw== X-Gm-Message-State: AOAM531nEY6Yd5A+HqhsSkq6aNYMhhz7QwGkQoWXWUpJf2ukOU58Hh6l 6mpOxPV3qDDmynL/cMs1wzIsuSh0bWAumw== X-Google-Smtp-Source: ABdhPJyE2i9Fpe6q1ZpaAjlTL5zJ6ShxTH7V2pBCeX0+NrQMvn4NS+Rz2b7XBl/HIRTdRV4PSwwZIg== X-Received: by 2002:ad4:5bc8:: with SMTP id t8mr17841640qvt.36.1612219489968; Mon, 01 Feb 2021 14:44:49 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id e1sm15812720qkd.135.2021.02.01.14.44.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 14:44:49 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Feb 2021 19:44:15 -0300 Message-Id: <20210201224421.1395-5-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210201224421.1395-1-jamrial@gmail.com> References: <20210201224421.1395-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/10] 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]);