From patchwork Wed Jan 24 08:16:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45783 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1130508pzf; Wed, 24 Jan 2024 00:21:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFx2CHrKRf1OOW74v8YlH9vFD1dyrkjOZ+tA17nGZ6hSiutAitO0FnKgBEcDsULXVIK00bN X-Received: by 2002:a2e:b543:0:b0:2cc:811f:f9ae with SMTP id a3-20020a2eb543000000b002cc811ff9aemr465282ljn.47.1706084472819; Wed, 24 Jan 2024 00:21:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706084472; cv=none; d=google.com; s=arc-20160816; b=GQLyeNtkORSoWVXzkj1u/eihPlnDNiWVC82kA5iErnHryMFmjwPI1n5rXcW/3uride TwjnSLDBLn2Ptgtq0bL/KWbaJ4uMPPp1nTgPBSzUuaPY4BU3u5AddXv1imPLBgNWlZrC NYdy4tbxuWDgC1QowVAf4U56eQdUqYtHzBPdrGIR9fGMCxu3dz9mBokCaVuey3NlA9Ew IQr5KTsibHIaWHvaU6m+Z9JcKknYoHl6gulpE9W8lTArbRQG3r40Vbq9SRZ7fVP+LB+E 6V4vsOvbQKGThTh9obPCDsOjd02Zjsc/68vRB0yk2PXEJs7wpgkyt/baNkx3K6vjejQB sKGw== 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=vOLe14eAKex+/vwyEI9t2qNV6s0Oz9FXqXGJbWr1cCI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=p5u7HYXc6bdrVELhpRzPAKT+bKfcj0O6mmSEKXdmtMpTYH3IeuSHur9YQa6BJnL1+j u0LJglUFdsJD1WIyou7Bj6VgwcxM3HLWIOq3ulyrYG7xa6dEqPZwyPLzX6bI0LGSRI4b 8enDsTxcQ4ayphB/uHvKTN7rvxOJIDi7HkFsMdHih6bLQOnwcMuAhrrZFDATJWFer1Xd Vhb2Rfa1FnZfbZzYgMnMwQJufPqX2gDBA8kfaupCbGXRf2Na0baAQJJzEOY8BuAHX+7s q4MyQhSHezV4T6V+8pQIWbF6R3k1EbBenGg+dTm0X4oECN3asOSwlkDSsOyMjejfRQJL coWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=a+ZBcVON; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j13-20020aa7c34d000000b00559b955c9besi8474429edr.520.2024.01.24.00.21.12; Wed, 24 Jan 2024 00:21:12 -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=@khirnov.net header.s=mail header.b=a+ZBcVON; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 31DA768D1E7; Wed, 24 Jan 2024 10:17:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B32368D113 for ; Wed, 24 Jan 2024 10:17:26 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=a+ZBcVON; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 946CFEEB for ; Wed, 24 Jan 2024 09:17:21 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 2IjYbgez3Q-l for ; Wed, 24 Jan 2024 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1706084239; bh=Wewx4y6YQhVvSw8/G6ZHokjZocxLUHbgM9nTOVcwXSE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=a+ZBcVONX58fyft8PnBau4Gn1Bl+SYNfbxBsAlosrpzzbsC30cswzhdEqEAaDIY7U cYVRP+Hl9t+0hSHkodFUE7ho8ynmLXSJQJUue7+9Yv4UIfeFZ7Eg3OU7ZNMcNFYfe7 Xl6RW3Qsj3krKczFwGSOHUxehngMwm+tAPEXyQG9a9NTwvIsFuayCkEY2whDL10Ci7 877dPquzQwEyxW0jauikZTV6Ja0RKOXYZa5UIGXpeQIBWPg2I+LiVOuT8XDaQvJ2XU hpmNhuBpRvITysEjm5TwQoOjkmRw3iDsAYnnC5+ALEv6ScVys8S5GPet5st86lkjyB X7PDC2ru2vPBQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 9BAD81A22 for ; Wed, 24 Jan 2024 09:17:19 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 8E2003A054A for ; Wed, 24 Jan 2024 09:17:19 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 09:16:40 +0100 Message-ID: <20240124081702.4759-10-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240124081702.4759-1-anton@khirnov.net> References: <20240124081702.4759-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/31] fftools/ffmpeg: move decoder existence check to a more appropriate place 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: rGmLA0t2RreL --- fftools/ffmpeg_dec.c | 7 ------- fftools/ffmpeg_demux.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 00428dff48..d16049ab4c 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -898,13 +898,6 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, const AVCodec *codec = ist->dec; int ret; - if (!codec) { - av_log(ist, AV_LOG_ERROR, - "Decoding requested, but no decoder found for: %s\n", - avcodec_get_name(ist->par->codec_id)); - return AVERROR(EINVAL); - } - ret = dec_alloc(&ist->decoder); if (ret < 0) return ret; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 5a58bb735a..11db118b72 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -866,6 +866,13 @@ static int ist_use(InputStream *ist, int decoding_needed) return AVERROR(EINVAL); } + if (decoding_needed && !ist->dec) { + av_log(ist, AV_LOG_ERROR, + "Decoding requested, but no decoder found for: %s\n", + avcodec_get_name(ist->par->codec_id)); + return AVERROR(EINVAL); + } + if (ds->sch_idx_stream < 0) { ret = sch_add_demux_stream(d->sch, d->f.index); if (ret < 0)