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