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, \