From patchwork Wed Jul 7 19:00:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 28856 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp6363190ios; Wed, 7 Jul 2021 12:08:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzeLJpTRUcSAs/8eFGplISsh6IIMOwT3eV1CJjd2gYM3xAilH7tVLwFFrHxAiSjqqzV7w1 X-Received: by 2002:a17:906:9742:: with SMTP id o2mr25872151ejy.532.1625684886410; Wed, 07 Jul 2021 12:08:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625684886; cv=none; d=google.com; s=arc-20160816; b=t96ooOYBT9FDNuF+zXTBUKyKebMtkvy17H0ZUcsSmebTFkVLdmxNxaARLY+IFkY+45 j4uM5Zc5mTAE/kNTELQz52sSYVsJCMTVTgbRDoApf53p3fiaX/awhkJsQEMp21FT7kbR 1h0NON6k/0C3ZQPoJINkTTXmlcuubEWIudirgvyWqg1HZjQ4IXCXJWT264o36bfpBiCx r+SZ8/dIihhC2+L87gCE27tp/FWQ/Z03FSRzWfW2d61pKmvmfMtxflMgnyPOpVmhqZfD 6tWP7ElP85vbJwqrej6Ft5+Yi//Qayz66AD/gMPZS2cm1gu29UVK3DSUq5efuBvfUPKo mj9A== 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=T/sVsdAJbNUfn78JuKU9lkDhl+cNc+RiL86DlPT+Cxs=; b=uf0Dzp6RZ70bDUzZWnsDUcbQA72XdzmHJsUXX+JMV94HxEBmaEQ4K4Ce8V+te7KIcj XKymThIUWDHSwLzRWXqPU/DRoxpMGvLvpjuRH8HfZ0YJ9RPbBImMSk0dNrkD4pGoGcDm XFMwdqJ+jaq3EOcO7Y5dIYxCFtm7xqVRnYk/sJrNyMidMn+f9koy6AEZll8WDUF9m/fa RKR0ltyR9OGxsxs2tdbY1RNH0Jff+IBw+gWtSjXgADfgN/pCahpprk0EWM4fJYd+rwd3 39YH3CWeXYq14cIEnZewI7r+fJOnKmKbyaH78urhX9xn8Isfwv6JRbvXHICQfYc/NE5U R0PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=p1frDS89; 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 z17si17808455edc.573.2021.07.07.12.08.05; Wed, 07 Jul 2021 12:08:06 -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=@gmail.com header.s=20161025 header.b=p1frDS89; 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 2598E68A761; Wed, 7 Jul 2021 22:08:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FCE168A2C0 for ; Wed, 7 Jul 2021 22:07:55 +0300 (EEST) Received: by mail-lf1-f43.google.com with SMTP id p21so6732731lfj.13 for ; Wed, 07 Jul 2021 12:07:55 -0700 (PDT) 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=d8kqpelCljsQMho/EOSsmf6WSi4pYxRErPOfzUHnAb0=; b=p1frDS89+5L7phTTv0lfMsqJX80nZXZofFUmLBUzHAGUWVPnL0RBNZj5KGbCNpQc6U QUpe7aPe7j4SOqdwGJhGruKiqvgzAkUZXhCCIwykwIBs/NjxKnaBGLPptwua+oTAWIwD zUIw7BcdVfy0UcL+xJbWw4oZHSLvercuTXGwiC2wLeC8ZypQIvsG3WhxSi7Un5keEY7C ldKin40EXqoGuHKbfIf3REy9uOOwZTqCDeEmYHwKxncjew0xQqKEFMKCwmy/kBCiVB6E W1F+Zzqd7YudMB4XWp3rO8thMZYo3RS4U2i1jGLxiQxfoWA3Lq4apijsulaD+N1bB9fA sLVw== 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=d8kqpelCljsQMho/EOSsmf6WSi4pYxRErPOfzUHnAb0=; b=cLRg5p6JxVNG9QBmF0nAFY7GogzqLAnG9OOCD8Qlqb5i60AnQOiqDjnHyyoEAz7PPd exh49mWaZo1LJXJUrfuHaMnWVqW/ifLHUK8uBTQ53VfAJk5ciPHDx7xK/p/9VbI/dGVe zmdnf3D/GwfVTCRCa5K9fILuE4t9mMxvHWqUvWpaJhhJJ1qF3B5QW7kR0U/JyQXEIWfD 0pRSTPL9E/sxwHW1UtM8I6wyAFjVrG6iw7lKnv1C6igy6oHoPhaqomx5rVjpE38OZIxy ekykF18eVNl6j13wFzmKBXdkDHmZN2B/rJtOFjvXnutz55ff7xA+/LwRJtlGiJsed/2w G/fQ== X-Gm-Message-State: AOAM531PbXWednm9K57ONc7fNmwkCmb3cOwdhICc+4uQGE6IxTe9TPuY vWpKGGkOghL9ZSV3vaq1EPzj8LoanK176ovO X-Received: by 2002:a05:6512:3125:: with SMTP id p5mr472760lfd.635.1625684467856; Wed, 07 Jul 2021 12:01:07 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id w13sm2252520ljd.27.2021.07.07.12.01.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 12:01:07 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Jul 2021 22:00:59 +0300 Message-Id: <20210707190100.76447-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707190100.76447-1-jeebjp@gmail.com> References: <20210707190100.76447-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] configure: move x264_csp_bgr check under general libx264 checks 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: GUIxVbwO47LY This makes the libx264rgb check work when pkg-config is utilized and x264.h is not part of the standard include path (as is often with cross-compilation, or when you just have a custom prefix in general in f.ex. your home directory). The X264_BUILD >= 118 required by configure since 2011 should have X264_CSP_BGR defined unconditionally (it was added a few X264_BUILD updates earlier), but as 134cba728bc6f4e3c5caec98b800faad244d8cfb added this additional check, I have kept it for now. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index b124411609..ab27220688 100755 --- a/configure +++ b/configure @@ -6132,7 +6132,6 @@ check_builtin MemoryBarrier windows.h "MemoryBarrier()" check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval; __sync_val_compare_and_swap(ptr, oldval, newval)" check_builtin gmtime_r time.h "time_t *time; struct tm *tm; gmtime_r(time, tm)" check_builtin localtime_r time.h "time_t *time; struct tm *tm; localtime_r(time, tm)" -check_builtin x264_csp_bgr "stdint.h x264.h" "X264_CSP_BGR" case "$custom_allocator" in jemalloc) @@ -6530,6 +6529,7 @@ enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && warn "using libx264 without pkg-config"; } } && require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && + check_cpp_condition x264_csp_bgr x264.h "X264_CSP_BGR" && check_cpp_condition libx262 x264.h "X264_MPEG2" enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && require_cpp_condition libx265 x265.h "X265_BUILD >= 70" From patchwork Wed Jul 7 19:01:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 28858 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp6378578ios; Wed, 7 Jul 2021 12:27:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuWE+nD6rL99XtraSWUUPcm2Ja0sXHpGRZ5W9ANUdBAdJFIBAObvS/+EWX7P/3EQ5pft8h X-Received: by 2002:a05:6402:b07:: with SMTP id bm7mr25709121edb.345.1625686079731; Wed, 07 Jul 2021 12:27:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625686079; cv=none; d=google.com; s=arc-20160816; b=lHiFgwmrxKsogyBv6WJ7n0M0nrCwONSB2vCEgOd0CsKssaXyGjRyShxfyFm3mwfIZk M/ApMzgLk/kpypO2wft7u67VPSNBOWuVNzV6ONg42k4qiqJ3OhPDIX0pCdzrUtMaP1Iy hgAjqlTaC/upqtdp7R6nXzEmZ0Cdz6XkwgW+V94/Rr0fDXMR9TdYv5b9M1JrDBeqkAj9 Fh7gFPwSDFXPDOxXXKREVC5NDdBucahhnzSSldUbt2miQZDAhZFdpIBRF9ODPfBbxcxP F94wWsLU2FJ8oyVwsqIR+sBhHgj83IVVopD+RYXXypRNj2k0J5t5DBv526WaXZ2+XUVS /OnA== 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=TLbzsejuzE9I/Puu4kbrp9BGCO8O0Lw96k+AiAgJRns=; b=no32rIwaYqiZiS4DXf228ufQ4TfWEr0KqlqRRgb2jtT+ft9/+WQUdOR05VtYxFwNoG mfPVhcouTV6NLKeAvXk1+WGZT7HBu0Id8OVnr+127kqlv3DUkGXKjoj/Y1nQZWi2E1bn opnFSDC4tGsaqE39q/MI7mwGEfhTkCJMWXri0f8rJ2F6KfgsXNn2jUP1JoNvxbcqwuNN /a2djEeo/MLXZbrFCw/WkNzYlLtkL4Wpqygo7p/3HsI2DQJVYWmtVUraBjfQd2kl+p01 ukj88C0tGDolokIpky55M9P/lbVzXk/SQkK8mQHYiQoLO12UfMjRJedGbaIxOGMcCwRP H2Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VBaHsFyL; 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 w8si18519687edc.463.2021.07.07.12.27.59; Wed, 07 Jul 2021 12:27:59 -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=@gmail.com header.s=20161025 header.b=VBaHsFyL; 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 DAEDF68A71A; Wed, 7 Jul 2021 22:27:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C4DF68A71A for ; Wed, 7 Jul 2021 22:27:48 +0300 (EEST) Received: by mail-lf1-f43.google.com with SMTP id q18so6977438lfc.7 for ; Wed, 07 Jul 2021 12:27:48 -0700 (PDT) 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=Nrnf9RwR7OvfqHM7KrSYY4E1g9optoJEpqfWp5k3mJc=; b=VBaHsFyLZhDfNCfSO1MH30xdfLUhAkAWp8D6ubTpOl0S6Ujrr7sB42sgiiCjmyb4ZZ D9StTbVcc1ejSR4AZoNd/5D2pQo2rijwOfpuUhyKjdmipuE0H44h2XnhJT0oe14UZE4m 9ap5jeDp4nVcmDwRpFlQQ1CzUdCGuT9EoPf0kK+O7ncaJz+4OPNLxcCXcxwdgOnx8dwv kc8s0mYgKwOoK+YXC+UYXYKmwoByutWTQ2xin2GtbgSvMpyJrwbj7nu16hysEDdefTyg 1uMTz9E5KpFJ5PYzRQBrvSuTylMgCQxaoXRlggsy2z0HGbpGQc6++9go5QsrDyd3Yz6f tbkw== 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=Nrnf9RwR7OvfqHM7KrSYY4E1g9optoJEpqfWp5k3mJc=; b=WkKV2YUW/p/KYup/XHrfDghRngYcd5agq/Zw60oRkobpW0PrsPxeNV3L/f1gDia61o oh4pgmFPDYLwryJw54hXkZMfuFlntZX0/4mOyUgsl0DZc6LpmfgR0Ldq+1/onRrxf+0w L8FOBIRyQqnC1wG+twSPs0tPxQPVOj9BAiu7yWIkHSN+EJtnVqUrAfVTdSq6RGO4j42/ VG7u7YKAsO4705OjornF2c0+mLa5iK2l1M0kmQqNEpLUj9DHH/2WpqdZG2IqtVf/sg++ s2awO92Dy2te17o+AIKEuzT858MUEaOarWGdxX5Cg9h3k+i9ncgg2Da6vnEqpG8UXuuZ VNqA== X-Gm-Message-State: AOAM531+zxHWsFAIAX/GnG1hl4qZjSXgWUVVi0MgzSJdsBv22CUSoSAU WZj2ZQQe2OdlKXDtmhOltJTOJgYbrq4uE0ey X-Received: by 2002:a2e:9910:: with SMTP id v16mr1870525lji.499.1625684468608; Wed, 07 Jul 2021 12:01:08 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id w13sm2252520ljd.27.2021.07.07.12.01.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 12:01:08 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Jul 2021 22:01:00 +0300 Message-Id: <20210707190100.76447-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707190100.76447-1-jeebjp@gmail.com> References: <20210707190100.76447-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/2] {configure, avcodec/libx264}: remove separate x264_csp_bgr check 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: LL2ODGOTOSPK We already require X264_BUILD >= 118, which includes an unconditional definition of X264_CSP_BGR in itself, thus making this check effectively always true. --- configure | 3 +-- libavcodec/libx264.c | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configure b/configure index ab27220688..b3b8065188 100755 --- a/configure +++ b/configure @@ -3316,7 +3316,7 @@ libwebp_anim_encoder_deps="libwebp" libx262_encoder_deps="libx262" libx264_encoder_deps="libx264" libx264_encoder_select="atsc_a53" -libx264rgb_encoder_deps="libx264 x264_csp_bgr" +libx264rgb_encoder_deps="libx264" libx264rgb_encoder_select="libx264_encoder" libx265_encoder_deps="libx265" libxavs_encoder_deps="libxavs" @@ -6529,7 +6529,6 @@ enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && warn "using libx264 without pkg-config"; } } && require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && - check_cpp_condition x264_csp_bgr x264.h "X264_CSP_BGR" && check_cpp_condition libx262 x264.h "X264_MPEG2" enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && require_cpp_condition libx265 x265.h "X265_BUILD >= 70" diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 4b905bf9da..9afaf19547 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -553,7 +553,6 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) case AV_PIX_FMT_YUVJ444P: case AV_PIX_FMT_YUV444P9: case AV_PIX_FMT_YUV444P10: return X264_CSP_I444; -#if CONFIG_LIBX264RGB_ENCODER case AV_PIX_FMT_BGR0: return X264_CSP_BGRA; case AV_PIX_FMT_BGR24: @@ -561,7 +560,6 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) case AV_PIX_FMT_RGB24: return X264_CSP_RGB; -#endif case AV_PIX_FMT_NV12: return X264_CSP_NV12; case AV_PIX_FMT_NV16: case AV_PIX_FMT_NV20: return X264_CSP_NV16;