From patchwork Mon Nov 15 11:55:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 31425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp5724104iob; Mon, 15 Nov 2021 03:56:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJy8z8Pr+RFZNDKlcfl7Ym+XN0zkKhvMikGrJItkc8SLBOlrLUPvDpx7fN/m4Ns3hyyRwBHr X-Received: by 2002:a05:6402:d49:: with SMTP id ec9mr14846681edb.235.1636977381456; Mon, 15 Nov 2021 03:56:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636977381; cv=none; d=google.com; s=arc-20160816; b=PF9P5m3hg8HLxxRF9ZUmqefZbfdtSvJBdZ19wot+bUMSuzmFbZthWMDvC8bLuq/eqJ LqlYe74SY1bDmvbH8piAnd6O14/axKyFVjYJZwJjwECSO/FINpf7LyY837g1ra4FQ8lA jdS+Y8OLltS631igdjRl+uvCXIpYV1EV5jmtHY/qoWENeGiY2kKo6iMt40JDUbEZuzsy KSyXfrZMpvOeOl79jiw9+KpdU4U4AVuMH6F/eCLrcBXeyTaq13t5z3eZVOeoVvph1MJx 6B51K/hrAPRMROkBfDcmH4sR9t0I5oQix9+y/mKXZ/1bpMp1I0Yq6MJlCWkg6absAeyp nhxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=dabRirHheKScoBLra502LfPLpXJ9sgBQ3Vxdnlt2070=; b=xbVg/sHIZtx/8XJOxir+TP7PlgaW3a913Q9cxFHLP6sKwD1FANcp9KOqKzJiZcCiuW VC8Dc1TcQ98ewA8FFNcIyKphZyqcyKbJ+5i12kG6e042PihBi7VKmsc3RXCjpqZ2s8Ay ZqpqoQrW2aepb7BgXVnqvaQhKw9fTWIpqzU+cYOvlCsg+uS/olO4IXwCokRRsX2A5qB3 uBr3ZA880OBfU0Mte5yIGk/xpjIv+N0kWGSmRUtTMPnyLCwTLh0hpylzy3t30cGp49t2 JHJz7/bwbx9YeHa0jVj89lAGrzHeyqhjMeZVphCn5GBMCqpjSA6lRvibkZRVg0emS411 796A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=h36Shxom; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k9si31383129edv.52.2021.11.15.03.56.21; Mon, 15 Nov 2021 03:56:21 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=h36Shxom; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A470F68ADD1; Mon, 15 Nov 2021 13:56:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f53.google.com (mail-ua1-f53.google.com [209.85.222.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E53068A619 for ; Mon, 15 Nov 2021 13:55:59 +0200 (EET) Received: by mail-ua1-f53.google.com with SMTP id az37so34209649uab.13 for ; Mon, 15 Nov 2021 03:55:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ChB+Q9KfwkoINNHREbyWb/gWPYc4CKWOi3dIRJKeGPc=; b=h36ShxomY19DNFbKyjeJTkFtmWb5ulZtYMMM5lnYnmTvLRWfihjEEBUvJ11iWOZLTM Hc3jVBAqcAcoSh+F+nmcRh8mZtLFJcKxlpgSZoENM2vrR3mHd8Mh25pt1amoTG9t2jhx cKOrZdinc4gC6zNmFDI0RdV/gdcGSVbJwYKY31z1jpt9bDEorc4mW4rPB0kO2VPcfjug 6fJS5ntQiuwoGwGDOOzKUubg9K8umOcJDrwMxRhkVObY0hAGvP3SzPL6wS91KSzCzli+ pDUoscHGQ5E1IlEghVOZlnJGz9Q38MGAksQ89ci/AVKrEgdczFRCgsE/9LelKTxTKUrp l2Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ChB+Q9KfwkoINNHREbyWb/gWPYc4CKWOi3dIRJKeGPc=; b=qhfoRS4pQ9CjoL6NCyMvSUgAokd8HeM0vVf0qDtBG5CtEUHKeJRqHUvKWXCxY7jj8j uayycD9u8k0e9ouUWZDuDfMfVtELzE/6/m9UT3YqJoSOwNeNcDs3i4SQ/m+2jXkaQuy2 2ug1z8HdIS4CUKbS/my6X5qOiVAOWf+980QJit4IJ4txuahcB0/pf6tCraHwJB1YDIb+ dz1lzAJPcNH2IXwJyEvZeNjFbpXX2JW4T//DRgwd7rlG3Zg54kUiSOq0kniWGekQgg6u Sx93UTE1NV0rxzhzQp6J9POb+n2Xh4o2h1ppUsVNMQ5llkmlK5S/L/2ZJNAgmjswNb+/ 2fMA== X-Gm-Message-State: AOAM533VfZD7RLdAoE5fw4SebYVYtxVECc5fzh+cuBOuKwA5DYCDwTYW 1+3fLwZeiTmZW3Eh0eGvB+54818kmhY= X-Received: by 2002:a05:6130:3a6:: with SMTP id az38mr58363222uab.126.1636977356462; Mon, 15 Nov 2021 03:55:56 -0800 (PST) Received: from localhost.localdomain ([181.23.88.82]) by smtp.gmail.com with ESMTPSA id v81sm8567552vsv.14.2021.11.15.03.55.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 03:55:55 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Nov 2021 08:55:24 -0300 Message-Id: <20211115115525.1414-1-jamrial@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] ffmpeg: Allocate (In|Out)putStream.filter_frame early X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: CwrIMZKwZdoG Based on a commit by Andreas Rheinhardt. Signed-off-by: James Almer --- fftools/ffmpeg.c | 7 ------- fftools/ffmpeg_opt.c | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index d141f34df9..f6ab33a614 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1533,9 +1533,6 @@ static int reap_filters(int flush) if (av_buffersink_get_type(filter) == AVMEDIA_TYPE_AUDIO) init_output_stream_wrapper(ost, NULL, 1); - if (!ost->filtered_frame && !(ost->filtered_frame = av_frame_alloc())) { - return AVERROR(ENOMEM); - } filtered_frame = ost->filtered_frame; while (1) { @@ -2342,8 +2339,6 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output, if (!ist->decoded_frame && !(ist->decoded_frame = av_frame_alloc())) return AVERROR(ENOMEM); - if (!ist->filter_frame && !(ist->filter_frame = av_frame_alloc())) - return AVERROR(ENOMEM); decoded_frame = ist->decoded_frame; update_benchmark(NULL); @@ -2410,8 +2405,6 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_ if (!ist->decoded_frame && !(ist->decoded_frame = av_frame_alloc())) return AVERROR(ENOMEM); - if (!ist->filter_frame && !(ist->filter_frame = av_frame_alloc())) - return AVERROR(ENOMEM); decoded_frame = ist->decoded_frame; if (ist->dts != AV_NOPTS_VALUE) dts = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ist->st->time_base); diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index ab4c63a362..278cab39bf 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -888,6 +888,10 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) exit_program(1); } + ist->filter_frame = av_frame_alloc(); + if (!ist->filter_frame) + exit_program(1); + ist->pkt = av_packet_alloc(); if (!ist->pkt) exit_program(1); @@ -1520,6 +1524,10 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e exit_program(1); } + ost->filtered_frame = av_frame_alloc(); + if (!ost->filtered_frame) + exit_program(1); + ost->pkt = av_packet_alloc(); if (!ost->pkt) exit_program(1); From patchwork Mon Nov 15 11:55:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 31424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp5723924iob; Mon, 15 Nov 2021 03:56:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJwRcbDGa6bxRcd2SLdwzobj0iq/fzsX8fhl6DA4G/n41t3YBqtPuqobgkz43NIFzrxZGHne X-Received: by 2002:a17:907:d8e:: with SMTP id go14mr50069877ejc.366.1636977373188; Mon, 15 Nov 2021 03:56:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636977373; cv=none; d=google.com; s=arc-20160816; b=baF69+B6pVQoUCqEE+JjzFAwq3j0K/HftS3P2veFI8xwx+5NdFxiJ0U+vPKIxTdNOO rZgQEeppI3uMGizlFIsTWCqy0dbwKH0W3c49mnJRTWTLPEz0yaYqtS40InJJ5MsRNMXj jG5Pq7Fbp2rZ4TrehzFGJMqFLrNDn34NxoUqKS1ulzFvZU/2RbBkQ0iTzq/25udP+voD v9swIB6won/26/d5qFPbk6AO+rr0lgdmzKDHv7LGxBvfdeySnIpRdeIQsqcHNTyM/SJ+ m8m5LPL2vvtmdBX2N/NcMcaTuF/b8r48QD9GCdrUOhcZgLrE1Q+3f8U/tBb8iGNKM64g YvaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=su7STyWNISpwnV3sE43nYOJiIQBjlq6B+DfAAS/DBVE=; b=xfAg4y1RyOykQ+i/wo86Sx9DZUecvRmzE6m8MHEiVYSVHPAn+0hV1fAx6BWE4zcXLW jl8B1ARypBr0B9VYj9GH1OVDrLMLlbVRmU1Qsq5rnmQq0u5A7yQx4zzMaN7bcAznmcqg n8k8j+sKYOQU92IrxkIVIyvBFTEAFy0ATMNKCW40u4mTse1XDQ7Yj0xg9ZWRwiUUYRB2 EquJ4Abyo1QGta3o9zru+/9wQ85H5SffmFOTfNkMZl/1EYnae2mGnkjH+dEWG7Cnrt5o +ubDHOnMBFUVtUwsPHz8GN8WH27R1yY7Z+GNzHmhZO3uoRkoJapNkeT26VZLx1GXcnV+ jpfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=V0GJlczN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y12si8918741eda.144.2021.11.15.03.56.09; Mon, 15 Nov 2021 03:56:13 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=V0GJlczN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 788DB68AD8B; Mon, 15 Nov 2021 13:56:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f50.google.com (mail-ua1-f50.google.com [209.85.222.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45CFF68A619 for ; Mon, 15 Nov 2021 13:55:59 +0200 (EET) Received: by mail-ua1-f50.google.com with SMTP id v3so34117657uam.10 for ; Mon, 15 Nov 2021 03:55:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=f9Med0irpn549murc+/3S9E1TU5SIpQYPZoOI3wz6PQ=; b=V0GJlczNtgHTqnKoJ0qEufsEES+3b7sHUa3LRMmBtFHtQ/Qg+rQ9t2Tq0cCzP1EfKn HCKsJhdpNzOQG9fiNUQVwXMdCVF6IG8DwrRLc2m1s1unxEco1DKOCk5/LzCd3AYQNh8y jhW0PbEF29VsVoeOBMUMOxazvq/zDTEwaBuMMkChDbUjNg42ehrJYgzukxvY5qxUexTU uK4kGAbpDfZRFHTvEFhj1jrjzdonyHSX1ZttqcFo9XI2Vhe4ZPbP0uGqeEnR5zpJpHQY mGbXgD2sUN+GSUzPpVzNi+NBZdFnHVVLh+0w4BVLO4npgs9afH5tfvXbTSraKmOXc/8B 7c4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f9Med0irpn549murc+/3S9E1TU5SIpQYPZoOI3wz6PQ=; b=uzVs8opD8DpKXQog5JVZACDWBJAfS3cibQzNnqOMTik3eKPP+BUtmwx7mUFZz7x2kS NL9AJuFXwRVsiQVk/6inIwjE2hdjwpZf45sGNaaHBAQl5FosoH0GBYIcz3C65ysJuHUF ztuGHO+hY5ufzUqUei1EMcBJNxxJnDdbAphdNZKdQrD6VmBsefY8Ifn9ZZVRvHYJOHVW KIP3kCPcVFZzO3UxO4xlbWv+MgnJvsrJwb+Y/U/GS5hnijPjsL6HdQD1Tzqjnhq7GTrs P5V5hUaL9Q0lcVKn/VvFqdWsyaHCglCOdQaqJ0R5kkiylbHqgAydDpd0e96VlhKM3MJW a6Wg== X-Gm-Message-State: AOAM530UdXEHRAQDfdtiPzaanxj5gWssYmbcsWd/khaF9wWk6tRpxBJN FmEysahU/kEDCMVGHDyCId6vMz6N3rE= X-Received: by 2002:a67:df04:: with SMTP id s4mr42074352vsk.46.1636977357598; Mon, 15 Nov 2021 03:55:57 -0800 (PST) Received: from localhost.localdomain ([181.23.88.82]) by smtp.gmail.com with ESMTPSA id v81sm8567552vsv.14.2021.11.15.03.55.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 03:55:57 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Nov 2021 08:55:25 -0300 Message-Id: <20211115115525.1414-2-jamrial@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211115115525.1414-1-jamrial@gmail.com> References: <20211115115525.1414-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] ffmpeg: Allocate InputStream.decoded_frame early X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: njLMGXdqHYRL Based on a commit by Andreas Rheinhardt. Signed-off-by: James Almer --- fftools/ffmpeg.c | 11 ++--------- fftools/ffmpeg_opt.c | 4 ++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index f6ab33a614..05d197b8af 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2332,15 +2332,11 @@ static int send_frame_to_filters(InputStream *ist, AVFrame *decoded_frame) static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output, int *decode_failed) { - AVFrame *decoded_frame; + AVFrame *decoded_frame = ist->decoded_frame; AVCodecContext *avctx = ist->dec_ctx; int ret, err = 0; AVRational decoded_frame_tb; - if (!ist->decoded_frame && !(ist->decoded_frame = av_frame_alloc())) - return AVERROR(ENOMEM); - decoded_frame = ist->decoded_frame; - update_benchmark(NULL); ret = decode(avctx, decoded_frame, got_output, pkt); update_benchmark("decode_audio %d.%d", ist->file_index, ist->st->index); @@ -2392,7 +2388,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output, static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_t *duration_pts, int eof, int *decode_failed) { - AVFrame *decoded_frame; + AVFrame *decoded_frame = ist->decoded_frame; int i, ret = 0, err = 0; int64_t best_effort_timestamp; int64_t dts = AV_NOPTS_VALUE; @@ -2403,9 +2399,6 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_ if (!eof && pkt && pkt->size == 0) return 0; - if (!ist->decoded_frame && !(ist->decoded_frame = av_frame_alloc())) - return AVERROR(ENOMEM); - decoded_frame = ist->decoded_frame; if (ist->dts != AV_NOPTS_VALUE) dts = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ist->st->time_base); if (pkt) { diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 278cab39bf..2a95c31107 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -888,6 +888,10 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) exit_program(1); } + ist->decoded_frame = av_frame_alloc(); + if (!ist->decoded_frame) + exit_program(1); + ist->filter_frame = av_frame_alloc(); if (!ist->filter_frame) exit_program(1);