From patchwork Fri Jul 2 11:25:11 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: 28742 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1532805ios; Fri, 2 Jul 2021 04:25:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfwZHAjtf1BdBWy3v7+v6NzeFFRmQOjXIucFHzR4fYi9axWB3saAKUiEhIpnelCddtkyEG X-Received: by 2002:a17:907:961f:: with SMTP id gb31mr4667721ejc.159.1625225152447; Fri, 02 Jul 2021 04:25:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625225152; cv=none; d=google.com; s=arc-20160816; b=yLGi/aIjr2BYTjsvOT2uYNOJTqIr+9z5KrPmJlZMLZE7N/Oh3dtNf9ZgGradzVYSfK IboXgyr2rmAbAr4yggE7Bod9aRTlZUap66du8qOjvf/f00v7z3/IRUdRMlhcD2NZnSRV 7i5CK8LZw8hB6pFYyMoc1+tN3Fh+jhkj32Y9PChyd/Kw6gN/4a4R0n2M/noSdM4u3bFe M0E2tzp3jfq745s23WzcCIFUBhLULmbEIHHXo5c93sL9n1PhJq7vKoDZhwUi6zwD/3De RsjYNVE65c8cip4idtf2Gi7E7xo/5Sqvm9XW8BidhIfy5g3ukUUC3Yq0f96mkNKKEuIo 1EOA== 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=SEPmhRTtpogZFiI/ILjMoSLyV2xpPld/A3SRj7Fl4HMkmy23wQ0zSuK0++enxwnrgi axalC87PGFpyBDAUMYxu0J68UAc059u0shCNzVIXRecmpxIiWRAEP5TFp8r4+DQgEq/6 +/WTR5aH9pXNPluev/PBzmZoV3173hRZ4pYegjP2OwJiov83i3adCE8vQeN4oNOd15P3 C14uj90RNrjK7wTlN8Q1Iwp8UFEhv8UDNnXQY8QoWEACwJznXwvKYlrQpuqWt8tOslXV byIhPbyYvHmhfTe3O+Cat6/eNVpzwz+WMgPPfkPe/MSEH7BaOGEMH+lxEfVXhwK7jQbK 1AhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NqoaYJre; 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 h20si2912833ejl.315.2021.07.02.04.25.52; Fri, 02 Jul 2021 04:25:52 -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=NqoaYJre; 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 0C03868A548; Fri, 2 Jul 2021 14:25:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64BBE68A44A for ; Fri, 2 Jul 2021 14:25:23 +0300 (EEST) Received: by mail-lf1-f48.google.com with SMTP id q16so17502489lfr.4 for ; Fri, 02 Jul 2021 04:25:23 -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=NqoaYJreYtuR8Ug4Zu6sxDq+nNCTaqeMyBI/QNgfxAo/znQfpvr94SKwx0UfDulVK8 8op3xsgB+TXkmAU5pHB/MsFfQfEkrq702DYoneTTMLlKGbgkptCtiNSbVNFQf6ELp+Nm e0fprOF/IXAbveb3DUU18BlQxrbMewnf1y4m+Ghayn8jplxdFshYwNrtUiil7abHgRc6 sP1sx1Riu0qN3UuLiliH7lr0JmxbGQCciy01RQRrubtTvHw9k+c0bApWLwyaqerpOP2J BToR11olYAZ03CDjLtWXKuEQk9D0K3qd+pqBlU1vWDiV07xXXg3XRCMZhQy157MtouU4 2uqg== 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=Bey+X7ERLGBnz8rJPAeIMRQ0CwWf5xEgRhMAEw4ye/sqGDMBDBh5qUVGBxgemJnceK /2eNiUCD+c5D6266ytBA0TicZS7A4ZhfghodIoH5Np8c534dQ5odNxb1vqzWOItF+Irq 10v13lZq42UDd0O/iaT3HMrPBPaqtoD+27IBSmEIxQmUQ+cQarFIzEOSdO29/xQZEKlc TanF7maI4gKO4FBmpCoZpW/Y8pBfXAx3Xo9qX58yfMKB825cgpgBLV4HNX6T1L7QjqUP L9mnMdbvJRLg/wfXgZ5WfxhvLtQCJjRWTliIgkNEhe50YJHXdOq1FadKpga6eGRzg513 A78Q== X-Gm-Message-State: AOAM533OjzbDE2kG/7ctDV2hoboiWCgPUBZVjaReV02IUZUyXp6rGDlh GYfI+QSwi6NnxdkpUGHkMKy5AR6TttXXng== X-Received: by 2002:a05:6512:23a9:: with SMTP id c41mr3330507lfv.171.1625225120317; Fri, 02 Jul 2021 04:25:20 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id d6sm242479lfc.183.2021.07.02.04.25.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jul 2021 04:25:19 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jul 2021 14:25:11 +0300 Message-Id: <20210702112513.36348-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210702112513.36348-1-jeebjp@gmail.com> References: <20210702112513.36348-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] 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: lz4u/YdJYLr+ 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 Fri Jul 2 11:25:12 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: 28739 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1532935ios; Fri, 2 Jul 2021 04:26:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQyRju/UtHWBKNl/uHllOz8JN0yOwjal1zb7RbAIo2x9fW2xXEee9pNkRdMRH2EMwu7pMt X-Received: by 2002:a17:906:7314:: with SMTP id di20mr225080ejc.283.1625225161775; Fri, 02 Jul 2021 04:26:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625225161; cv=none; d=google.com; s=arc-20160816; b=ax4LzA5WldGEmwnMfYU2r48zpcElr4isDFt8Nq1HAZjYH2BZXYrh1V33gQonhIuM47 QtUTzkSAOq5b9FjNYHAd/9mB+G91QajQzvGR7EKQ5NH9CabtGjSFVw7+al8izf2COTYA bv8pIHdXr/dxk4JRRMSG584te5hLQ3jfWZsM8CacDW5O6gXqt7Bv774DuMQ/zsHLDhL9 /lvG76oWcwWk4QBHbzSImXN29GGRVyywvsGb/MWIa8IxF/bK28c+TssEIJoG3icbgiK4 QMjlQpPkkN59Arlv/f/IwcndgSb/uOGMA6cBGlUcVK+55NagEiBXoPQvhsx8grJMYDJk bN2Q== 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=TNX+kVWH9dh8BLYTza/8ZY1SoCvbZtCAPJzbnYdf6Yg=; b=fCIIEjG6Vq/Ea8L3VqiVdrzqkKCh0ARWEkJXTyOEtIO+0W93cHpFgWg4UQI/UrxqCB igmv8CK/0tmIp8VjWtLZkorivpub7aQm4wYL0ksC0Q19hvAKJC/+5IDiE7W3/LatOi2k /0nbgJOct12oG2NJEnyJzHpvpaMcrU3xWc8bdajYDAnKZ5ke0JiDNbzTpaNB6TFwBcI7 OqXbwaE8c5MTq8QOazWqhqd7sBrp1tsKEEZJglGJTLW0qiX0ibU+ixyD202iTy2L/N6Q S7S/QeQ7Qx37JVd6J2/moSWapO+aW0a9Dn4mB7wb/+dYMnzr3bf9+2ozP0R5FkVY49e7 0yhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lXi1NwfZ; 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 oz13si2700671ejc.440.2021.07.02.04.26.01; Fri, 02 Jul 2021 04:26:01 -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=lXi1NwfZ; 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 2052E688146; Fri, 2 Jul 2021 14:25:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6906F68A476 for ; Fri, 2 Jul 2021 14:25:23 +0300 (EEST) Received: by mail-lf1-f44.google.com with SMTP id t17so17576626lfq.0 for ; Fri, 02 Jul 2021 04:25:23 -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=ZoEM3+lzGsVjv6xQT1rrTUsn/FrPc2wAHEh2dqUrISA=; b=lXi1NwfZUP7Q+1VW8eO1wt77bdnBAJ2yDM+pog776iIEY+Wa30ghsTKJ2GTR20aeh9 P1Iw+iVZ0PJKfwLXihYbMUc6QgmWdzpPicNS9WHswbUK85nDpjko+tNqj0nMRLAZAzg3 1bxlvQY9nohxTXUWuHoWNhpmsjNX+0HIdPLMSSWRe51y1HE/b+CTrBkPm+KOpYd3RG28 rwbcBweGFpY9NtmUB2nNpOkPjcvf/dQZgor+iwEZ9bfuY8k7YQFrMxpNODR04+3uOlp2 h9LpBgbKrO1cjLd9AP/JvuybWPr2VEOvCcYrgKSA6xo5q5Fxp49m/RQ2xMoo3+nj4xEZ CQlw== 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=ZoEM3+lzGsVjv6xQT1rrTUsn/FrPc2wAHEh2dqUrISA=; b=iFWHVTCeedG7IGcZRPRaskJk2fP1dHaW2+qmXcCzt6O8mRgYxiokYQLmEYrC94w705 ns+bjzWVaDMI7B9oQN31wM0fnOAR4l0KhDr9VTewfxdq6tPPUtlalrfr1FhzBdmNz8Bd lwX4yGHHWvZq43ZY5VPV2iqeVjP9tov25UsIUw6qmIiv1EHeM5SGseB7qc/RJ/ZH4W2s 6q9e8pNfXIEP6Y2d75hofwqZlEFy7Xd8I3boisIs/bLhnMFvW13kg7qzq/euU5ntqqtO PSPfowOG/6A64vS4rqfc4gHD35EekOG5fv2lxhQ5vUl50AoO2Xwl1aXmwRndw8UgMDCv Mb4A== X-Gm-Message-State: AOAM530y49PRvptNjYV7DElBUd6cNCCvWMBnUO7EhNk3LWiYO4KZZtMo 9fjpj/4qIOJAdFh7uSGddnHaBZddlBFlrg== X-Received: by 2002:a05:6512:744:: with SMTP id c4mr3506315lfs.657.1625225121059; Fri, 02 Jul 2021 04:25:21 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id d6sm242479lfc.183.2021.07.02.04.25.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jul 2021 04:25:20 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jul 2021 14:25:12 +0300 Message-Id: <20210702112513.36348-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210702112513.36348-1-jeebjp@gmail.com> References: <20210702112513.36348-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: T5piedk6bMkD 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, 2 insertions(+), 8 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..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, From patchwork Fri Jul 2 11:25:13 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: 28740 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1532702ios; Fri, 2 Jul 2021 04:25:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbdAqaCnfzE9p9bS3mTWsTOwXktHIcBQUBFr6igJXlkeqey0u8ILN5q2IvPLQ1d8Vrh6js X-Received: by 2002:a05:6402:d53:: with SMTP id ec19mr6256889edb.4.1625225144282; Fri, 02 Jul 2021 04:25:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625225144; cv=none; d=google.com; s=arc-20160816; b=wH3h9jIKWLvVChXm8lN1vMKCZQX6/ehX7hqZSjt7vi6gYrxZ0DzHSo14V0+pLCdE3U k7Q7SJe5HKzhZ2uj9KcyeqNRL+CzkjFXE4eT14jgATVQZPqkPbi6CbfjitkLBHaEaL6t dP9PTfsSozdbS9Rj0LG4VT45AHcKRia79ZrHYgx1lW4KCddzU2wrly/dEaW9zr0YzTBt Qyr3sZW5uX2KXTLnjpVDZBt1mu002FotV4Gp6+tXvxDwjxjzGrlAn+fu6dgFv3PNiw7D 8mxgV8TGgfiAyCMAM4REuCFUdnIzMn+oGIImk8ZIzo/uVn2ccIRIsmvEUZYJX4RAYFG/ lXMA== 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=iVo2x8KizSzBdQREQraQj8nIh6I5LZUyc3PMv9nVSLQ=; b=vDOh0odS/0yQNs3M3P3RA0L5XR5L6Ghghmo0eWrtkefgGD8ty23vayKXP1y0HPOkZg 9HZSMsfkBRUARglCBfEff3zIs3CBYJ+20NdUJzxsNZJf3VY4HcildlV2J37nvY5ZwyF0 JnLIYabre8Dfd/8AGBqQP9p5KxZgyBIsfdnSxVVFZxMvPGF8EsRZU1dnEiyrDLKy/Wcd BcU04H3nbAQZQ1YOkecYq/MU1jMblty9djBEnREFgcCmtdCEDQg6Ps+86HkO/z2ViOwW BNJT2MvYn8yakUHt18a/HFIK2nQL+qAP/ljf/NU1yKgG4RqDXWojmkIGUP154OD/baVf LABA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=i4gPnw60; 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 cr10si2574409ejc.751.2021.07.02.04.25.42; Fri, 02 Jul 2021 04:25:44 -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=i4gPnw60; 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 D95A868A506; Fri, 2 Jul 2021 14:25:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67CC268A450 for ; Fri, 2 Jul 2021 14:25:22 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id k10so17392287lfv.13 for ; Fri, 02 Jul 2021 04:25:22 -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=VhXmJfwlbB/jK1MoGDPN46Wj3exH5fQsjGGT6YKY5Mg=; b=i4gPnw609EMiv5LT4hPC2IBi6fnrsgHlAg9vObiTMwNM8zwrghrnuvKOcQiqD/brFC 9+iNgAQ8twPj9Q2E3JauR3r1EUbZy5Bag3ebHHiejZvIWRrN/saCQZYuLAUkQEkCRtdX TU/nqDqO6pYYfU03ouQztbu6IQx48VXH01QNUL1XOnzG10nkn4WZXg3+sxkBfEQerykB qZ2YoE9pL+h1paowodIKOQwzPmogWJE54ekMMDsftGqW92rtG1m/oCp78JUh9y5BlQvP zZl4+BLNbdmvCDm8kQZ3v/C1KAkt8I6LucJb8rxnsrzVR6axlAOwZhmVegbf6exmEM8D psnQ== 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=VhXmJfwlbB/jK1MoGDPN46Wj3exH5fQsjGGT6YKY5Mg=; b=YDw595UMq/UlN93MsnJX+5jrSr9E+o1wAfpNSFj7EO4epUJl9tdDgPZ1Z1opKTDt91 aZ5aGQqCtELnz9zDfPf11QCX67zIhoem+7YRjgf4b5c46yIAuFHMgk8v3Yw0WppvC6Co /2xzM+/RiUCUIUO4RhFYBy1PtGY08Vymvlplay761TqSwbFY/Xwzp9KN/bA9EqsyqPsi +k3kQO+pyBMNOMU+7eVwMjiQxEJZevqQ2jPgchbvv/8EYPPVKmVRgcbqaI6f60PU0IVR WNbfmnSBk+JTdTs4b2V6aYIiT0aXRwr9PB09ztMb4X2emIlyQnf6HB7g/8VoEn/OlK1u AClw== X-Gm-Message-State: AOAM531/afx/m1ATeSIzQm4qwkam/HswsYrPSULsTOnscrAhKYLbL1wr kPvXi9orcVbYWrJ8z1Z9rPn5Ix5NAzgsLw== X-Received: by 2002:a05:6512:16a9:: with SMTP id bu41mr3523458lfb.428.1625225121801; Fri, 02 Jul 2021 04:25:21 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id d6sm242479lfc.183.2021.07.02.04.25.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jul 2021 04:25:21 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jul 2021 14:25:13 +0300 Message-Id: <20210702112513.36348-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210702112513.36348-1-jeebjp@gmail.com> References: <20210702112513.36348-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] avcodec/libx264: remove separate libx264rgb RGB wrapper 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: DbmThII3M1IS No other encoder wrapper in libavcodec is split like this, and with RGB input this currently does not lead to 4:2:0 (which would be generally supported in most hardware and software implementations), but rather 4:4:4. The libx262 encoder definition was not touched, as it already has 4:4:4 YCbCr defined for it, which as far as I can tell is not supported. --- configure | 2 -- doc/encoders.texi | 7 ++++--- libavcodec/allcodecs.c | 1 - libavcodec/libx264.c | 43 ++++++------------------------------------ libavcodec/version.h | 2 +- 5 files changed, 11 insertions(+), 44 deletions(-) diff --git a/configure b/configure index b3b8065188..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" -libx264rgb_encoder_select="libx264_encoder" libx265_encoder_deps="libx265" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" diff --git a/doc/encoders.texi b/doc/encoders.texi index 4c38996372..e60ffe9c7d 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2280,7 +2280,7 @@ Text-like @end table -@section libx264, libx264rgb +@section libx264 x264 H.264/MPEG-4 AVC encoder wrapper. @@ -2302,8 +2302,9 @@ by the libx264 @code{x264_param_parse} function. The x264 project website is at @url{http://www.videolan.org/developers/x264.html}. -The libx264rgb encoder is the same as libx264, except it accepts packed RGB -pixel formats as input instead of YUV. +Since libavcodec 59.4.100 the libx264 encoder wrapper now supports both +YCbCr as well as packed RGB pixel formats, and the separate libx264rgb +wrapper has been removed. @subsection Supported Pixel Formats diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 623db2a9fa..d1a5dfdb75 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -772,7 +772,6 @@ extern const AVCodec ff_libx262_encoder; #endif extern LIBX264_CONST AVCodec ff_libx264_encoder; #endif -extern const AVCodec ff_libx264rgb_encoder; extern AVCodec ff_libx265_encoder; extern const AVCodec ff_libxavs_encoder; extern const AVCodec ff_libxavs2_encoder; diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index fdb9e285a6..b31814bd4b 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -975,6 +975,9 @@ static const enum AVPixelFormat pix_fmts_8bit[] = { AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, + AV_PIX_FMT_BGR0, + AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGB24, AV_PIX_FMT_NV12, AV_PIX_FMT_NV16, #ifdef X264_CSP_NV21 @@ -1001,6 +1004,9 @@ static const enum AVPixelFormat pix_fmts_all[] = { AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, + AV_PIX_FMT_BGR0, + AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGB24, AV_PIX_FMT_NV12, AV_PIX_FMT_NV16, #ifdef X264_CSP_NV21 @@ -1017,13 +1023,6 @@ static const enum AVPixelFormat pix_fmts_all[] = { AV_PIX_FMT_NONE }; -static const enum AVPixelFormat pix_fmts_8bit_rgb[] = { - AV_PIX_FMT_BGR0, - AV_PIX_FMT_BGR24, - AV_PIX_FMT_RGB24, - AV_PIX_FMT_NONE -}; - #if X264_BUILD < 153 static av_cold void X264_init_static(AVCodec *codec) { @@ -1183,36 +1182,6 @@ AVCodec ff_libx264_encoder = { , .wrapper_name = "libx264", }; - -static const AVClass rgbclass = { - .class_name = "libx264rgb", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - -const AVCodec ff_libx264rgb_encoder = { - .name = "libx264rgb", - .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 RGB"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_H264, - .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | - AV_CODEC_CAP_OTHER_THREADS | - AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, - .priv_data_size = sizeof(X264Context), - .init = X264_init, - .encode2 = X264_frame, - .close = X264_close, - .priv_class = &rgbclass, - .defaults = x264_defaults, - .pix_fmts = pix_fmts_8bit_rgb, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS -#if X264_BUILD >= 158 - | FF_CODEC_CAP_INIT_THREADSAFE -#endif - , - .wrapper_name = "libx264", -}; #endif #if CONFIG_LIBX262_ENCODER diff --git a/libavcodec/version.h b/libavcodec/version.h index 2a420a7e28..554f293aad 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 59 -#define LIBAVCODEC_VERSION_MINOR 3 +#define LIBAVCODEC_VERSION_MINOR 4 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \