From patchwork Fri Mar 5 16:33:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26162 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 A2F6C44B5D3 for ; Fri, 5 Mar 2021 18:44:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2519868ADE5; Fri, 5 Mar 2021 18:36:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D53D68ADE5 for ; Fri, 5 Mar 2021 18:36:26 +0200 (EET) Received: by mail-qk1-f177.google.com with SMTP id x10so2532676qkm.8 for ; Fri, 05 Mar 2021 08:36:26 -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=jLppxZy/VWuSJR9EkDo8WhHaz8+M2gJSdBRU6QkpH0s=; b=eWN5Nzk1y2TZlyULn/7yEG6vE0WhzXbOGdsKURvvJLYaD3Z9uREHDeUWn+5uA8iUTi Gomd/91xqHCVPrSPGaKXiYk7w+uD0Y1UiI23zDPngs6t+GrkUFBTEf0X1eEd4upVy5jl dAbc+3nzVo2sTCb37Tw4969zYPjr1LKqi/zBS3sf5OgQna32cLLDbMYkRjtgkgFHv1Ip CGTkQbUm10KdJmh8JZaHPP1w6XsJRUL8lDuOD3wtWDW3aeos6Vj9J33rJkycRuNzFNSH Z8xRGP0z2/obIUnznCn25r8Z0kKPCNM/nuaQjH7/S3CGJ7T3xAC6sOCn3w5p843W+V1O aRYw== 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=jLppxZy/VWuSJR9EkDo8WhHaz8+M2gJSdBRU6QkpH0s=; b=iGCIUxkTNEVg6MzGLBVLGz+zTvXcMjGw3q5MWNfQaXrD4CG9RGNlAItfj7ygal/Dz1 NInYPykD93eF3w33YNB6BaXBRKRI2ecIPQXZqZ+DlYTSrG6cH0rh3zNR6+vceopXFew5 qlTAF0Le6Ybk3Q8n5ZUYNFUW1pg5ppEgmOp4f/oculiJwIDpacfXx+MS/PvKf+ibhms/ JdnM3wrsuhK2wJwkL9TUviHU13wm4vRUoTowtnjigoh8R14fq80LK40Pk3RTZzzvcDg9 g96b5agLrEu9Q98Iw+W4NUmRvXn7EOK62/ijHIDqgVi1RJEMiiTWWzy1eWnxM8o5lZsQ mlRQ== X-Gm-Message-State: AOAM533nsrCdtT3cePTgnyBjKj9h0Ma93OYFkCAxPrNZHa1RO1iFLinx VALDoO21sMnUmd3ce1TiQfgyE8tKZc7lLQ== X-Google-Smtp-Source: ABdhPJx8v0ccNvdjX2J5Fbow7iaa8V76qtA89/RuiTjPCppkU46mT0u7fOeVOK0owFMEaACKWFBfPA== X-Received: by 2002:a37:4690:: with SMTP id t138mr9947891qka.394.1614962184823; Fri, 05 Mar 2021 08:36:24 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.36.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:36:24 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:38 -0300 Message-Id: <20210305163339.63164-48-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305163339.63164-1-jamrial@gmail.com> References: <20210305163339.63164-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 47/48] 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 740e759958..a6735f70c6 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2463,14 +2463,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); @@ -2503,18 +2501,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; @@ -2536,26 +2539,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);