From patchwork Fri Aug 30 10:15:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 51238 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:4027:b0:48e:c0f8:d0de with SMTP id ky39csp304751vqb; Fri, 30 Aug 2024 03:35:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXWnF90TTEAwxZwo1jRI3mSuH1vxWwA+1l+wbZS0Wqz1IGVeNsRVWdXhxraZqpu9gzgDEeK7s5y/9h/+tgx2/C7@gmail.com X-Google-Smtp-Source: AGHT+IEqpYmeCx3/Cej4xIUNKxmLn2DBkBtFnHcSmctKYM2cWLXFSSqVRxZZ8xyJ/A9x2JYzn206 X-Received: by 2002:a17:907:3f89:b0:a80:a193:a509 with SMTP id a640c23a62f3a-a89a34e1a7emr56865766b.2.1725014114372; Fri, 30 Aug 2024 03:35:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725014114; cv=none; d=google.com; s=arc-20240605; b=QoFfZbTwqNxr5n9vKdMdmBzZdLNkkONF9Mat4vZd+gE++ci4tON2fE7g+Pr4qnmtQk V2a0Jgy4UahGd9E9hHWiv2lh4VVFkggGbyceyCz6z5Xjzv/g/gzoXd/QM4n9qBqYtooH FdcGZEabzegCKvWIqTC8jUlLuIKfUmtLjZHDWOO3QfkglLsh4NhevkxwnyXRPBzZszai OaoaLN2+ee+O8CIHIaySkRZlSEea7UukYmyqJttJ5BFU4O3vDYczVcaKbQihr8feqh31 h3mY1k2ZbhgAsO+e3020q8z4Bz19gtDKzohGoHi/AEFENwc3SZWI/tKHx872u4FPF0we Nh/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc: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=w/5l1C5Dv6CMmb3HAoxKG74qVQwgwSn8SngCH5adTUM=; fh=tuUXnhgwUopqrbuJY3BExN6aocuFs1Cf//owLTlTyNI=; b=abJueWm4s6Epc7sjcxhVPPHjEURMBjStwMjlmxzb48Ka5z6dKLK8TZejYl3xzKeasm s41Ns8smDx1oAD8zxISaMpt33Jeq6WqqqaAVwyQRcxtVg3pE07qoAUlOBPiaDL5rrObm ZwjkDHGo6q58qP/o327hYIQG7HrPMAnZF4j3g/LsQIw2Kg9cMxwpcCMLkmOmRt/udt+H xA54czOYdaQC7dX6H0woEd0xYtX8qpbZmszEaJJN4/aWTytjhkmDSmOzCfmyI3/lneOW ZAMC8TFxNI1fZ6r4u0WZdZGq3+ih4AvjlTLWnkb0lO0oyRP+cDCgRCOqqpQph/p15KjK Uu8w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=V8MKQe8V; 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 a640c23a62f3a-a8988f410d1si308490566b.86.2024.08.30.03.35.14; Fri, 30 Aug 2024 03:35:14 -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; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=V8MKQe8V; 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 7A36068DBED; Fri, 30 Aug 2024 13:24:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 582D068DB6E for ; Fri, 30 Aug 2024 13:24:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1725013451; bh=PLnSTlvWAZ3IPgkSlsOb5Zrh96noodhvzimRioZSFzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V8MKQe8VMAfXq96Orw6/nvNkJ9AIN4jRHX0MmAFeXCpA20CtoVReJ0laBz1oE15qK ntCRuMkanOD3Ankr8paNwTdWPqSDxcX9xUdhqANtmUsAkGztKfqOKpSKT6zDYIN2km sManSf18O/vty+K3chnu/5ZyzDURkB9+KKWOyfXc= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id DFEF548148; Fri, 30 Aug 2024 12:24:11 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Aug 2024 12:15:40 +0200 Message-ID: <20240830102402.18149-18-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240830102402.18149-1-ffmpeg@haasn.xyz> References: <20240830102402.18149-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 17/17] fftools/ffmpeg_filter: remove YUVJ hack 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 Cc: Anton Khirnov , Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: D0gh6jcCQRlL From: Niklas Haas This is no longer needed, since we now correctly negotiate the required range from the mjpeg encoder via avcodec_get_supported_config(). Signed-off-by: Anton Khirnov --- fftools/ffmpeg_mux_init.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index d65167bf7e..b0fe4c0f7e 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -997,21 +997,6 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter, return ret; } - // MJPEG encoder exports a full list of supported pixel formats, - // but the full-range ones are experimental-only. - // Restrict the auto-conversion list unless -strict experimental - // has been specified. - if (!strcmp(enc_ctx->codec->name, "mjpeg")) { - // FIXME: YUV420P etc. are actually supported with full color range, - // yet the latter information isn't available here. - static const enum AVPixelFormat mjpeg_formats[] = - { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, - AV_PIX_FMT_NONE }; - - if (enc_ctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) - opts.formats = mjpeg_formats; - } - if (threads_manual) { ret = av_opt_get(enc_ctx, "threads", 0, (uint8_t**)&opts.nb_threads); if (ret < 0)