From patchwork Thu Jul 1 21:54:45 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: 28734 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1041915ios; Thu, 1 Jul 2021 15:02:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMybX3CKh4BquQWGl/esA/MAHwAfuDAvWpDwd2v/CO2WQ7ZU/h+Q/WTpPVpPRQve1e4yhY X-Received: by 2002:a05:6402:34d3:: with SMTP id w19mr2506021edc.288.1625176960692; Thu, 01 Jul 2021 15:02:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625176960; cv=none; d=google.com; s=arc-20160816; b=MfIlJD590ubgFtddgtMnzA9Vzxeq4s2lS0ap2REHY23BjUeIKUHjfBllkFpTrMzZdh j24fd/hLts08mhiNu6t/UfZeQdaDHWTlx39DwR+0OgAauL52i9sEtEGUa7V12rdw852s tak36nNUMiEBAaBtz5VUiXEzWuVN6UlChKIqK1aAm3zKRrG5VBrjqAxidoyH5JO/2uQp rWL36kkkiyiWJgZbGfZz6hGIXQc3ccJTYqqyfpUYHxFQ4GOrEgHM4DimxaklzTHx0R1/ tJuErtcD6vB6nxCdMKw1spGvyuZdk9+tRWAgY+s7R3sAKUdYs1lhM3rlJ0RyIN06NnKH KRQA== 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=FhiERe8dVrlr+MUNXufvAv/QOacog7sygZpxnYnQciF/z2meV8RCJAXQUcsdJDhx1S GxuhTCRSNlLxyHFDZceq4irdoVYSWzDw+yrNIGWjIKXvQYqsAdPdnUDeu2sic0NePvJ9 2zVZt3qP85lbmOPYION/FCe630zVB7p2Si5l2ZHFQH8vMGb9UAiWTx20+cxXk091iad8 gxuEsQdhxk76C0Sw5KVYQ+8xYussWbcMqsKDt0j/8p1fvHXfJZeWrhOBUQLE3oosK0UG RBvhJUvtV+3n+UVur5qAmkjgoy+mg+Fm7rK2x+R9SnDoOa/AI6fFGw/po60Dvsv9MwAC Ycnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YvsQoBv4; 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 w12si964713edd.491.2021.07.01.15.02.40; Thu, 01 Jul 2021 15:02: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=YvsQoBv4; 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 70B3668A57B; Fri, 2 Jul 2021 01:02:38 +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 DDCA4688178 for ; Fri, 2 Jul 2021 01:02:30 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id t17so14589654lfq.0 for ; Thu, 01 Jul 2021 15:02:30 -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=YvsQoBv4MahYqsC67a5OWAApj15ZimoOWZ3bilbSem59YJOeC3bTfK5tr6DRRmi/pK gWQ7F5dIeMVfb1flq2XSDNJeb//3wOv+8Ss+usYv9AEsyjFwrEKooQuvGCdJ5NS6qg85 D9Xye3vh8scTLzpLwqULVkGeMRoE3Cqy97cSXjuV3G0E6B6PtpypYlleEILPd5kdmyGG 3bvzM7MUucJUhKdrWzKodYFwYfBmvbjt/PO/AuS8QMIq7GKgDNOBu3L9L/BI9QVU9oQj dOu0zPvHqm4T3EIjYZK+Ro4J+cqA9duQf2BbITdkh8AtOTMsA1rMiatuiteWF+gSeKo6 a6BA== 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=f300/piX8UTdM8/Vv1vWPFsoQUDKCGQkGltgoypB23KvZUxj3uuIqKWe8063n7TMPU p/y/HkmzECd+cCVuVhSvw5ppZM6Qb4QpvLwWvq20N9+RRV2v+Un6Jew6K564g3lE7tDA vluVdyTBlL4ES+aIfd7qtrQQkmNhC1iUs0ddoBSVn1qKlDo4vKGTvYVrRfE35VHKmYt+ NxbdwBYzUDZkGJiptG0t6MN+P9a44N1qkSXtXruT4q9iBgFQqI1VPlR806jaZ1i0gWPw sOxMVv75GOUYQU07p6mCH5ZraB0tBHCRlm/isztV7Zfamm1D9Kdv0KJcyFchyxoxsqDB bA/w== X-Gm-Message-State: AOAM532FMdsGndUfZ09pzfBhNkAkqMHf/KS3vCIIkV+v9yCWeJc1Y5AT KNQliAhC8BA8t2yM8+Th8W/GPOPT26YtfA== X-Received: by 2002:a2e:9b98:: with SMTP id z24mr1271071lji.161.1625176495329; Thu, 01 Jul 2021 14:54:55 -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.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 14:54:54 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jul 2021 00:54:45 +0300 Message-Id: <20210701215447.34169-2-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 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: p1taKw477X2D 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 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, From patchwork Thu Jul 1 21:54:47 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: 28735 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1041398ios; Thu, 1 Jul 2021 15:02:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGd7qn5EBw+aRbwiKulAV0cxZMI5/8we4eLnk1nG9cV0xMan0AUORNR/+SyeubGrSrFmxb X-Received: by 2002:a50:ed90:: with SMTP id h16mr2562279edr.348.1625176921483; Thu, 01 Jul 2021 15:02:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625176921; cv=none; d=google.com; s=arc-20160816; b=KJwMW6IKztnj/hh6GFOiGgRXqm9OWuAU7EP3lD13Su8Fo++UPAzLwCR09UXd3bbtz8 LyBDApmyQSjWMS5gDk5/RN33wz8eCS2FNZ7av4vSRszFeL3Yyk5xuGaMIBcD1TeQv6Nr yWk7nHyszG5lksvesu4Iv8SxgZqio5uVZokq5hBjpMzh0qhahq0OF4r6HT7vYP+mb3QY VH45U/tIHctsgLLRsq51nIiMekGV5wZWVxgv5Gdj8nZCM2UEBjj6VnPHdXbVZl3n+UMd 42aCgJ4DTl70I5C+fm4NH59N5hWOtW1lI6VAQj/QXa5WgwepFEx1dhfJP43GTTWevJCd ntkQ== 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=wpZDq+bW0snU1RGIHcxE7qcxns6YFYlF5IeB5lF9MFI=; b=gGsU3NUFcq/qUP64lnzqBmDDpRBg3BRdJKDewYxWtb9AJRrYX1YZhTJENiX4LpkIFu NmG1UnEW1bjyGwKkFZPivK1I34SIc1q7GfYSWLG11Y5GJy6k1ZbkMSoA5G3o01RCVXFP x73zSfh5TyW+jGiKN2rYZ0EqVAbh9KIv8uRj9ALFunGReOTr0lUWlUrVI4qrGbnpwZOP D5zm+cXwO7cbMJYQgJ0f/b4KqBrrwzgdzSmQZp9fF7sN7w4J/Yq6SHrJTW++q4MtmGZh u4qKePYmxBCuxVF+PVI1k1/rjyu0aTv4bsufaezNjiJBqZka0T/hhCGIItntNCD+HJGK Oc/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=T0FQBqn0; 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 f8si927334edy.220.2021.07.01.15.02.01; Thu, 01 Jul 2021 15:02: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=T0FQBqn0; 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 36C9668A55A; Fri, 2 Jul 2021 01:01:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B90B68A548 for ; Fri, 2 Jul 2021 01:01:52 +0300 (EEST) Received: by mail-lf1-f42.google.com with SMTP id k10so14396718lfv.13 for ; Thu, 01 Jul 2021 15:01:52 -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=ARRn4GSlwA63ak7LhpWhVZI3fUtruLxjA1xSOqNY7Bg=; b=T0FQBqn0qP488Z6DgpRlbBug8zdb1I042rcFC5JIO8SYTaNYTDZhp8xZxTJIJC/0F6 isXgHMC1rk07dQqeHIbGeMR8etlbwblhA8o2nkG7LTDMiHFoveAEVhunDvIu2CHxqHbK DGkRBk2bogOvKZm/b1ZzeQe808TLmNNN9OFPH9TmzsgXXPg3/ECRMmAxTGChy8PrHPSP eVqVVtZwE9i8cC8L1bRMTv8StVE4PBfNnTMoGknzLP9rJWh/UbTOuN7vqgFvqzMa94EB uNIelkL5mIfweFoQcNgFyK3qj1yIwIaQVM3lfum4yYo8iibwk0P8tZZEBuwnw/FZAN8S LuJA== 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=ARRn4GSlwA63ak7LhpWhVZI3fUtruLxjA1xSOqNY7Bg=; b=WNqV9CFGQS6qkM4B/kfNLEaxWgBWHZkXqrK42MQb8QaRtqvnEArDskkoe5sUi0mFaZ h3CcbPyWTb8hi7i6N5F2+icUwkN+HYXdxCrSQyaYjTmFPvhzKOK09mx+GKEeArHCfx+v Ptuc+Yk1W8Aj3mUYYPhOh/JNepswqYqYp17ANGij89AwDlsfUR/p2fhXeWpiUrhuSZ+2 QW9NAb0gLTYDioCLvCPcxbSKLT/slXEpyQwEmE2cLJcRftzYrcAbX5Y4zQUrVmXUKEFS o+lLo7O2CEM438Kx6XJn7fSoUwrVOsgmXpdko2OvVvk1tlYkSco26BMqM4s2Z+cTusXS b9tg== X-Gm-Message-State: AOAM531xx5GHfXPO4UmK5cgUIWe5cLHhOE5hW86q3r6cwjEF8H8meqtl 3o/Wmy70P3k/ys5hz8kHHE4+5zFTJEUDRQ== X-Received: by 2002:a2e:3505:: with SMTP id z5mr1280011ljz.308.1625176496892; 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.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 14:54:56 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jul 2021 00:54:47 +0300 Message-Id: <20210701215447.34169-4-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 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: rTogFFTxgfDo 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. --- doc/encoders.texi | 7 ++++--- libavcodec/allcodecs.c | 1 - libavcodec/libx264.c | 43 ++++++------------------------------------ libavcodec/version.h | 2 +- 4 files changed, 11 insertions(+), 42 deletions(-) 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, \