From patchwork Thu Jul 1 21:54:46 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: 28737 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1041098ios; Thu, 1 Jul 2021 15:01:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+jHknyI3orWLZC8bvUfKHtNV41u1wfb8+ll5BmmfFwwa+oqcvQ7v2BrQcims+5HQt/3O0 X-Received: by 2002:aa7:d78b:: with SMTP id s11mr2547194edq.280.1625176900130; Thu, 01 Jul 2021 15:01:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625176900; cv=none; d=google.com; s=arc-20160816; b=S495SwP2JeOS5fHVGUnELbwmDC/5Yq3LNtOTj75zlGlcfyhiYvkeEGYF2U83d6XOxj Q55jy6a8H8Vcy1nfVDMs+8RdBxQ5qUzzdGNKbQJuA8xh/EpCsqqQxG7wFvtMO0e9/fKf JObaUZulcDPX3zs7ygSoQf5RAQL1g9Nihwm1JrRC55n4krHMiojfMc9GbxAzp1SX90BN nVvMN1EULT5HqhlRlZwzRiGBzexZug5Bg+JFBSPRt32mIZJHKSGbN8MOIylStjCUG2jk JYSaSTRGrP6V9FeCMWbLisJ/MQx+NnInyCXA8+fUkkWtb7tDIMBiU8iGVn5Z/uwm/ZKd eKbA== 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=TBRAUERBZ5MN1P0Ar1XZQxHbyShAjHLcXwGIpK3KG+s=; b=dtAFtoj25JbWbY9WmtAGgFRqI+hBlgUG+qmHqHaT0/O8GvqvOvNK6LlKwfN+2Nd08x BqQlZ9nC+C2BW8SESKMEEF+SrPcRi4+mwftnLi255p4ERKImgsTCuDYDmaFiWgZ1JdF+ kBDhKeAdZI03fFwhjqcDMqfZR/XCZADu5ltje2m87zQLyE8wQaBvw5/+Bvj/C2+cHI/2 IEwtka3OT4ZZ54YeZCkscraI69laSTYcqzV9twXrZSJZN2F+U5PN+/QH/7/feZu9Jopm CwNV4mi/oGdD9mSvYLSdPJl9hXNQb65WxVsCUusjwT31NbrOj7i+e1rYlr007E4dPDug D/kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eA0EZSQI; 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 hw6si1151481ejc.119.2021.07.01.15.01.39; Thu, 01 Jul 2021 15:01:40 -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=eA0EZSQI; 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 08E4768A4F9; Fri, 2 Jul 2021 01:01:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BF8A68A4FA for ; Fri, 2 Jul 2021 01:01:31 +0300 (EEST) Received: by mail-ed1-f53.google.com with SMTP id t3so10506757edc.7 for ; Thu, 01 Jul 2021 15:01:31 -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=WMuBTG804Bo9jQMs7pvZgGxgOoYfI5p0ss/h8LrIM5I=; b=eA0EZSQI+BMie+zI0vMXjw+/CQrJf2WB2WvATQoT3B0lX6HFhiMRqCUVoP2OxfpIR0 P0E9WOW0v8NpsNLiBcoG+w0uNlOYlb2jOj8Au2vYO1OZahXUcMIgb6fU+nd2mThsWYO1 pC1SE3XgyCT6hJwvRhvkMiZ+U6gMvfLGe8Tpu0QhxheFnWO0ZYSYzo/k4wbi698/Op7O EuyqBUOlBlrLbe7KRtAxVTOxiPPJEdTZhqaItGQwdxpT95mZl2qTj8e4IRxk1/oOzWPj D2Q6L8awz0O4HFBb0h4r01Y78RsZaoqzRMgytQVqFp3bp77slFdHOVqkOi1X9eTpZ862 gNEQ== 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=WMuBTG804Bo9jQMs7pvZgGxgOoYfI5p0ss/h8LrIM5I=; b=XIpbxDb7xAk/1wkVhwQ1BcnV/ZDOsbqyKBSr9H/qr7iAkyaZ1sSCIajqdOa9jYuHsj Rk5jEgV0g0RwF+nPoB7D4zR8B9NEoZ6tkLkDmcdLUksIyYo+CgmKp8snhYEwBcp+CZVO u9rX15RW+6B4qd7aY4z6UKa0kd6X+Wwnn97Xmv1tctxroofzDfir5WAnJKSYcNz7xPaF AGeX5MS4cGwAWJwNe4nW7N5nIEnuAjDlsR7PXoY2aNDaGTELt1DbsBy+JBUZIzCptn/n /hAIyTYnTA3tVbILhBqe6LEVmG+7Qkodd02qts9hsX+HucZo7zskztuscSQkvSVhXEO+ XDPA== X-Gm-Message-State: AOAM532sdGlXgr8OXYl6Dwi2iAaqM/HVMGRNpL0LheMhgRDbSLgr/8nu MzvqjrIMi76xYlZov4yMKML6deK362Qo9A== X-Received: by 2002:a05:6512:748:: with SMTP id c8mr1287886lfs.572.1625176496147; Thu, 01 Jul 2021 14:54:56 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id f15sm84225lfa.56.2021.07.01.14.54.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 14:54:55 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jul 2021 00:54:46 +0300 Message-Id: <20210701215447.34169-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210701215447.34169-1-jeebjp@gmail.com> References: <20210701215447.34169-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] {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: 5F3HiEy4SIDR 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 | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/configure b/configure index ab27220688..9e8d219449 100755 --- a/configure +++ b/configure @@ -3316,8 +3316,6 @@ 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_select="libx264_encoder" libx265_encoder_deps="libx265" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" @@ -6529,7 +6527,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..fdb9e285a6 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; @@ -1018,14 +1016,13 @@ static const enum AVPixelFormat pix_fmts_all[] = { #endif AV_PIX_FMT_NONE }; -#if CONFIG_LIBX264RGB_ENCODER + static const enum AVPixelFormat pix_fmts_8bit_rgb[] = { AV_PIX_FMT_BGR0, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE }; -#endif #if X264_BUILD < 153 static av_cold void X264_init_static(AVCodec *codec) @@ -1186,9 +1183,7 @@ AVCodec ff_libx264_encoder = { , .wrapper_name = "libx264", }; -#endif -#if CONFIG_LIBX264RGB_ENCODER static const AVClass rgbclass = { .class_name = "libx264rgb", .item_name = av_default_item_name,