From patchwork Thu Feb 4 19:10:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25439 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 A917844AD4B for ; Thu, 4 Feb 2021 21:18:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CADCC68AB04; Thu, 4 Feb 2021 21:12:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40FBC68AAC7 for ; Thu, 4 Feb 2021 21:12:00 +0200 (EET) Received: by mail-qt1-f175.google.com with SMTP id v3so3250793qtw.4 for ; Thu, 04 Feb 2021 11:12:00 -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=ij4dDJwMswA/4e8muiiBYd/BufdADRNO7X/UX/VxcfRW4ntcC1utk7xWLHLOAL78Fn L6boY+uqB6H3zHopXZE8VENJKrCUstyFRKIHW2GbIc/FV+kP7H7Z23bYxP1/n9KTQVg1 SSnkhjGt3w9xYHDh/PMo+O+5HIZOSatP+fz2rh9CkDuIk0u00VrbZO0ZpBkTHhEwNc6z +wGQU9u1JtemkTfy7aLfvDaWhGij79voVeIFwNCRT5wGYbX9JTnFGaIuh0Vl0rjG5Tes YtpDUbtOmNcxGNLvxPSgjUtdm6fN6PmBFrvHnZJxXaN8aUMIIggzzrJZAND2Kw+6pJCU XphA== 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=MceY5u5YX94F/obqFF6/HDvDg+aXySMBr8Nq7s94XHFxhZhrZq+eUan6nRFqZQDf+E hUvU8QDf5e1aUCTVt1No0/tmbBbBMC6GSlEbnUtGngj20icJ8M+eATYTwJOmcjqu27Y8 aejxkkLOwlhWCpvZZih+d/U7qZxrkm+MrYiUSlpszJcuZOVhlodGAOZasDJfG2F9Cw2W WSdK/2jh4oQ1NCfIc0/AzwzFTRgMLa/uYP/U1kdSfqsN3DOyarteRw+s5uFoj7YGJNQh FxKDMlRA5lgAUgp+my+1X/p1UjnaMMZGnxCJCn9RpUv5GBJjjfkUDJDgSwwrql1OIjmX 9BMw== X-Gm-Message-State: AOAM533hRoOKXy5m/4lTP3+3JwemZrt5jMbn1TJ4BSg8Chhp5U6tI6up 7im6fxE3qAFpbSsGzE6EOPC7ZHE5GU8= X-Google-Smtp-Source: ABdhPJzKLaILMXvP/AomZZTbtmPhNd6UXx8VHwr6bb/aTFGqQpMBzpTDVbsZevTkRTV1QgGqdnvUrw== X-Received: by 2002:ac8:7b86:: with SMTP id p6mr1023626qtu.23.1612465918811; Thu, 04 Feb 2021 11:11:58 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:58 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:10:03 -0300 Message-Id: <20210204191005.48190-49-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 48/50] 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);