From patchwork Wed Mar 15 23:34:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40691 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp3840413pzb; Wed, 15 Mar 2023 16:35:09 -0700 (PDT) X-Google-Smtp-Source: AK7set+M5yyCXJsvQCOT1LnDV27LQsgeDFmyE8RP5t91WE6V5KpSX7pg6RHRD2KTuXBjM0HuYNFH X-Received: by 2002:a17:907:c386:b0:92f:a00c:ee52 with SMTP id tm6-20020a170907c38600b0092fa00cee52mr2686744ejc.18.1678923308882; Wed, 15 Mar 2023 16:35:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678923308; cv=none; d=google.com; s=arc-20160816; b=B6K97tfqhyCnMnbEB/k4Qt7Roe0X0Y1KwMp+Rqo7CSffuuNyveIBZGM2ozP2KGhZnZ Kt6b6SQq1A5f/RWo+PpPnBQtrkmiHH7v2BSNfYSE+hJE2VIqyFIG4eJmLZR84XULT/MR VrfMUvkNPrJOK/89GBO0PcAXYiWIup8rrIbpL45YoZYdRvp1vk+0dKIUcMeNmP/qx2QU t6Fv1Jvhh4ER34r//7lDh+6lMShnry/mhyL1e0FsDyms7T5brU8NvRV9GqzTIA1keXa2 KSA2YmZ8ueZGhT0Knm7k2u+DRzAT9hvT8Kcmjv5v6B0ZGRqRZeeW7Ms/sIRkFq3J5Olt a1lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=j9/pRAiK41YYAyDCge0X0tB3lURIEqoKX8NoDP3xA2o=; b=vohJ3rSSZ2nvdyk4BbZX+6AvQ0nlEm5wOBPbNnfvwxuihK6HT36LBoaRFeS9JnT9jn 1HeTYKw+Ik1liahSMGbCYMbAiojb/LalOGXfVikvrtay7JXNUWSAriTgt+rfeq4JLp9+ Edb88aoEzJ8HkAdYt7/rlTADFqxPyMBgvnIRWzMK4ePV55KoTljtTuP4sk1h6oaB8fkN lwRDHX7x8BjFM0rf6nxEJ2Gz/x3bB7nSOqlPJQ5wOouBOstRG915YEFaQOeRihEaLJBa Y+pqrWSIeYPdGPKjAx10FECNxrb13hhLKDl7IMaNeD5y/cnn9XC9BS0lzNmZyEbOtM2j km0Q== ARC-Authentication-Results: i=1; mx.google.com; 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 v21-20020a170906489500b008d490a104b2si379406ejq.523.2023.03.15.16.35.08; Wed, 15 Mar 2023 16:35:08 -0700 (PDT) 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; 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 68F9F689E37; Thu, 16 Mar 2023 01:34:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1286068AD1B for ; Thu, 16 Mar 2023 01:34:48 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 59A051C0003 for ; Wed, 15 Mar 2023 23:34:46 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 16 Mar 2023 00:34:44 +0100 Message-Id: <20230315233445.5282-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230315233445.5282-1-michael@niedermayer.cc> References: <20230315233445.5282-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/vf_uspp: Support any codec 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3CrD7LeBlSRA Signed-off-by: Michael Niedermayer --- doc/filters.texi | 3 +++ libavfilter/vf_uspp.c | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 77b594f69c..d634924bfb 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -23364,6 +23364,9 @@ that value the speed drops by a factor of approximately 2. Default value is @item qp Force a constant quantization parameter. If not set, the filter will use the QP from the video stream (if available). + +@item codec +Use specified codec instead of snow. @end table @section v360 diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index 43114e1b50..a7bf8e3087 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -46,6 +46,7 @@ typedef struct USPPContext { int log2_count; int hsub, vsub; int qp; + char *codec_name; enum AVVideoEncParamsType qscale_type; int temp_stride[3]; uint8_t *src[3]; @@ -68,6 +69,7 @@ static const AVOption uspp_options[] = { { "quality", "set quality", OFFSET(log2_count), AV_OPT_TYPE_INT, {.i64 = 3}, 0, MAX_LEVEL, FLAGS }, { "qp", "force a constant quantizer parameter", OFFSET(qp), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 63, FLAGS }, { "use_bframe_qp", "use B-frames' QP", OFFSET(use_bframe_qp), AV_OPT_TYPE_BOOL,{.i64 = 0}, 0, 1, FLAGS }, + { "codec", "Codec name", OFFSET(codec_name), AV_OPT_TYPE_STRING, {.str = "snow"}, 0, 0, FLAGS }, { NULL } }; @@ -327,15 +329,14 @@ static int config_input(AVFilterLink *inlink) const int width = inlink->w; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); int i; - - const AVCodec *enc = avcodec_find_encoder(AV_CODEC_ID_SNOW); - const AVCodec *dec = avcodec_find_decoder(AV_CODEC_ID_SNOW); + const AVCodec *enc = avcodec_find_encoder_by_name(uspp->codec_name); + const AVCodec *dec = avcodec_find_decoder_by_name(uspp->codec_name); if (!enc) { - av_log(ctx, AV_LOG_ERROR, "SNOW encoder not found.\n"); + av_log(ctx, AV_LOG_ERROR, "encoder %s not found.\n", uspp->codec_name); return AVERROR(EINVAL); } if (!dec) { - av_log(ctx, AV_LOG_ERROR, "SNOW decoder not found.\n"); + av_log(ctx, AV_LOG_ERROR, "decoder %s not found.\n", uspp->codec_name); return AVERROR(EINVAL); }