From patchwork Mon Feb 1 22:44:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25334 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 08B4B44BD9A for ; Tue, 2 Feb 2021 00:45:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E774568A700; Tue, 2 Feb 2021 00:45:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA26D68A328 for ; Tue, 2 Feb 2021 00:44:55 +0200 (EET) Received: by mail-qv1-f42.google.com with SMTP id l14so9032639qvp.2 for ; Mon, 01 Feb 2021 14:44:55 -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=xH0bWBeFCt3b9DeWvbU+1Q3FuUMluDQhDe8ndxho89w=; b=bfFTPzg9y1MVKpvKSgGDKF66TrC7YaZk/zr6j7R0vuB+g0Zt8MXNAKUbB4fjEfa/Si ZtHMhWVAuVrpldP+EHm5fJbMcTHYv4Pm5MeBbHJHaCMKYGMmXxIel17qbPYNtlJcx+jJ ACZFWk2SL1QV17t3uD1Vdq9HucCbMi3XV8lO8ejFmej7UlP90XJ1iaLnARgmS6T9FAf9 jcKMc7iq+dWDGK2B2qqzam7TiwB/ua86pJLFLyGJMeCgc/9UV3u6sw89dgNleKjW8Vb8 0vvcb9pMT8GNrlvhT/JdBKtHG9UCtrajqUgeTPxukIw/klUC6/D7RwJUemAhFX1WHIYQ 1Vsw== 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=xH0bWBeFCt3b9DeWvbU+1Q3FuUMluDQhDe8ndxho89w=; b=lRV+tY4CHGxxk6oRhlRWtw4KNcu/oy49O4EkEyj6RYf6QY3FKedsNU/VyYBYHDJ8tY 8TP1VDnUts+4vkE+55A6qTk6fRq/+WQmStslTXjtDj+HTfcOEFe7pLwogO56XSc9Rdgv Udyj1UMUhsm/LKpxbwe6cAP4CYpiZJ/PiTfLfivp5ZeoEL+v4BzNlgO9McpAdxadzNn0 eshi0uK96Y5io2SkQFG/0xFTkZmkeIMyTpIIqn9UvdM3eUcZW6kCEmBJxGEtmug+8VBW jDcrZ+U1Y4JSlyVtSTnn4hWzOT4znqKGJiBJ24kmOp1vixg8uRomlPWnfvy9gLTo4N2e 0Urw== X-Gm-Message-State: AOAM531RwmwrmMwR/tJxlvmUj+Ac+Ov4Rqrj+kaGUJvOp+xBfMWy2edh OY8lMWMLsRv0OwuTXJgHF7zzDQrinO9GVQ== X-Google-Smtp-Source: ABdhPJw8t1HECgqvSbd500WMtOzfth2MVlSVm+BT/oaB0c4TA46bVj/cPxN/GWJiCDrBiPJTnjb1qQ== X-Received: by 2002:a0c:cb82:: with SMTP id p2mr17279572qvk.54.1612219494282; Mon, 01 Feb 2021 14:44:54 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id e1sm15812720qkd.135.2021.02.01.14.44.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 14:44:53 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Feb 2021 19:44:18 -0300 Message-Id: <20210201224421.1395-8-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 07/10] fftools/ffprobe: 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 --- fftools/ffprobe.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 3453aa09ff..68fecd61e5 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2465,14 +2465,12 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile, const ReadInterval *interval, int64_t *cur_ts) { AVFormatContext *fmt_ctx = ifile->fmt_ctx; - AVPacket pkt; + AVPacket *pkt = NULL; AVFrame *frame = NULL; int ret = 0, i = 0, frame_count = 0; int64_t start = -INT64_MAX, end = interval->end; int has_start = 0, has_end = interval->has_end && !interval->end_is_offset; - av_init_packet(&pkt); - av_log(NULL, AV_LOG_VERBOSE, "Processing read interval "); log_read_interval(interval, NULL, AV_LOG_VERBOSE); @@ -2505,18 +2503,23 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile, ret = AVERROR(ENOMEM); goto end; } - while (!av_read_frame(fmt_ctx, &pkt)) { + pkt = av_packet_alloc(); + if (!pkt) { + ret = AVERROR(ENOMEM); + goto end; + } + while (!av_read_frame(fmt_ctx, pkt)) { if (fmt_ctx->nb_streams > nb_streams) { REALLOCZ_ARRAY_STREAM(nb_streams_frames, nb_streams, fmt_ctx->nb_streams); REALLOCZ_ARRAY_STREAM(nb_streams_packets, nb_streams, fmt_ctx->nb_streams); REALLOCZ_ARRAY_STREAM(selected_streams, nb_streams, fmt_ctx->nb_streams); nb_streams = fmt_ctx->nb_streams; } - if (selected_streams[pkt.stream_index]) { - AVRational tb = ifile->streams[pkt.stream_index].st->time_base; + if (selected_streams[pkt->stream_index]) { + AVRational tb = ifile->streams[pkt->stream_index].st->time_base; - if (pkt.pts != AV_NOPTS_VALUE) - *cur_ts = av_rescale_q(pkt.pts, tb, AV_TIME_BASE_Q); + if (pkt->pts != AV_NOPTS_VALUE) + *cur_ts = av_rescale_q(pkt->pts, tb, AV_TIME_BASE_Q); if (!has_start && *cur_ts != AV_NOPTS_VALUE) { start = *cur_ts; @@ -2538,26 +2541,27 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile, frame_count++; if (do_read_packets) { if (do_show_packets) - show_packet(w, ifile, &pkt, i++); - nb_streams_packets[pkt.stream_index]++; + show_packet(w, ifile, pkt, i++); + nb_streams_packets[pkt->stream_index]++; } if (do_read_frames) { int packet_new = 1; - while (process_frame(w, ifile, frame, &pkt, &packet_new) > 0); + while (process_frame(w, ifile, frame, pkt, &packet_new) > 0); } } - av_packet_unref(&pkt); + av_packet_unref(pkt); } - av_packet_unref(&pkt); + av_packet_unref(pkt); //Flush remaining frames that are cached in the decoder for (i = 0; i < fmt_ctx->nb_streams; i++) { - pkt.stream_index = i; + pkt->stream_index = i; if (do_read_frames) - while (process_frame(w, ifile, frame, &pkt, &(int){1}) > 0); + while (process_frame(w, ifile, frame, pkt, &(int){1}) > 0); } end: av_frame_free(&frame); + av_packet_free(&pkt); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Could not read packets in interval "); log_read_interval(interval, NULL, AV_LOG_ERROR);