From patchwork Sat Feb 10 08:21:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dariusz Marcinkiewicz X-Patchwork-Id: 46150 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp1428082pzc; Sat, 10 Feb 2024 00:22:09 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWQWifc5hhE9NT/xe8SSh3JtVq3kNRgNWUCnU8RAMA2oVc+x949QZaBQfPnQNT94V0CK8uWCkMfg6h7/i3qKc6pITMAd22jAPzuxw== X-Google-Smtp-Source: AGHT+IHdFXZqyOC7uafkHREcZnfWp/GkL/wDR4KtoFfx5A0oDyM+CfzkYeuLjjzD5iioL+PDUzgc X-Received: by 2002:a17:907:a806:b0:a3b:b56a:e711 with SMTP id vo6-20020a170907a80600b00a3bb56ae711mr842412ejc.4.1707553329567; Sat, 10 Feb 2024 00:22:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707553329; cv=none; d=google.com; s=arc-20160816; b=XvFeFtEf0+JrFSdSt32iWHx++LhKij5+q1piUMfQdNs2RdRI3bTIdoM/9jS2DEv3gV F5sARRZ5xWHTR29mibjjMgn/gFdnkEbRREUwMzh8/UOlxYtWHCScDUVoE/GaVex3woyd 7MwrV5IgEkpvpcljZswfUY8MowuJu10dbuAG5oygWOlnWhOtOybWYiBlzqzS3NUGwekC 9PQT9toX7NWf5x2eQIdQ0XLveSae/Qv76OXyBJdL+pvrPqMVKvtisHFQreMNAJYKIkQr cd1usgDFk4/qmKv1pdNSxQvQ5kTVN1dlaMmOMluscn3ZsoYgkHxqsbRKbI8fq6Gy1qal iz2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:references:mime-version :in-reply-to:date:delivered-to; bh=uN0sbzfBZhH/54JqyDSLzWo/o4scHoH0X1Wh5QH0PFo=; fh=nKFujGw8qrnarZriFKkAvPbLeiiSOsjHC8CUeHG33CY=; b=QivZhxWrrprSVk+C8xiht/UzWZBuMTe1ouSGujwZKJUiMSEjdhWCyVeQI95h4w/e6r asepspA8v3MyRofMNdE6C9mbcUxczesHwzg22KhXviZXGaTN0uSWh4IPnWE9PjXQ1FQS ol1DcXlQuePvneIgEDg7lhEimAHnipJiRT7gK1O/R5vqPmMwwNXO8mPXhxjdSYeXdbOp PIhcTVZvqeorkugj/ITM8p7H9BYXMttACjmT7+tPZbWh0AypM1ETZB0KSjXdi6K5P2Bn vaIH3WijzFKSoAFQNSfc8lRsHwQu2oVV2nzQUFY60GOK0HMprKH0XY53Jk6GIx8kET5T R7DQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 X-Forwarded-Encrypted: i=1; AJvYcCVzsBVMAh6k3XkKXdIYQT7JieI3okjrSB1YdJtccZ17YRFFdwCIH0YfAHVb98SAoG0lfZ5AKBlz3wHqXRu8XLWEhYuPuzjp8+MsXOmISTJcxFhpl8wcFc+0iSuzL+nsmyIyxUrlrhzwXWBQV27iIqIhivdItr6p8H2IJzVaoEUly8LnFTXDveo9ltGZRaAAj3B4oDmvHvwfw4UY9BhdvIX7OservgAozdDl5NNsjGKtQxO5Fm4LMC4gU8+9rYJVTUTEBJsqB+nuirH5WtRaLMLeQ10O9+IcsylIG0gXjYFNlYYqY05iQ23YRVvruA/vqzUiusk3j2sK3Mq6Ets7GGs6JAWLUcrT7H8HG3etTqtxnx3dLz3k5ToxYGiGYgImf+gJztpLjH0Ji8Y/pn565w/q2DtLdTGeLfyuQIMCoBDPaUuFXhbpzibg35yBpU1ULhDU/i+DFpRMy81v+auskGHglqAvEPSexxx2/Xi8R5FM1G6qRGP7lIXUtiaanlOYMKxCycI14I59auGmS46WDs3OUycOZj/Dbqv0ZXCGvdnQRdWHFqFjLeX6WhH63gbr3UQjt6N2qOeTFaYGK1L94RB6Df+Fnu9eLZ8JUpul8rPgi2efQ58nYzjvw+L9rJ1//lPRsLqvN4sJtHQC2v7d6Q2SsPuR4lRkcVtiXvjy++BIRz2Lvegbbxpj7CI/Ofj4PSSVR+7YTuxpJ3wkQSnxkew5xUIGtHTbfA+fYAXfO7apTtEH3w0AkHS2JI4CBaGviftNrBPtMNE9C8Gcqb6/hzivpCcc/RodjlTVLB11DD9h/SRg7WfPx4K2o+LDGNomxHxx356XfINGPmd9FY7AX1R+NWhthfOrec+n3cVP+DLxksZNh48DbcLWNszC1L7XD2YGdLNzSP2j1dBaiwyU5qOqUzGbHBWooF+mfIMB4zueaCKmMJPdeEmkH0xF1Jq1QJjRRm +oE4cNBHWeR4jyl6twB6G4LbUNcwemEtXuqWXpPj3/MH89JTnUGbbCe9KhPlCe334iiGHuieepsoMx5kmMUpO11qQ0p8hXss51aYwlQ+vJLfQpnLWj2wQfXL58wmxp6LKJQgg4In5zgLDCwYoIuPDfYuA90pp1R39pVNNLEAoqpjGygfr6MiCmrOEq9sttYmXkV6YURaudXolKcxbc+gbsR1pkcdmikhyi9UPvg0K6Yftk67Cw4UZRBDCjt7HgS8IZNx3ZEX7p/Ty6wIrSZf3MBT34Ot/kohP2/efDKUDQUyPtvofjRrus7humBzLXNOHjXRIaYA5NYJH0kNnWIpDzbLkc0ftiwhK1EvoXCuRnIl/efc18T69bOZF9zjvXXIN1Vrgg0bB6jTyejvT5tAxNs0JD3Iwqh+oks7omFEkaVQhv9XR7z3OY2wUuI7zMN5dUufYCqjzxtz7cFEJ2133BWPlX5ua9uCNSH76BEsGjT1yGRCOUQjzgE3RK1oxdV9NfpvwGIJWYhXG1wbSapH5YoZtw/FGlq+APT270+8NwaYSVFma+f1MIfFI8aaqbju2VF1pjIHDSvWXUQNXtbG0aTyzbl8VneFs= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ga16-20020a170906b85000b00a37d4a20a7bsi1760554ejb.156.2024.02.10.00.22.08; Sat, 10 Feb 2024 00:22:09 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F53368D010; Sat, 10 Feb 2024 10:22:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8F4868CB57 for ; Sat, 10 Feb 2024 10:21:58 +0200 (EET) Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc7489c346bso3699591276.0 for ; Sat, 10 Feb 2024 00:21:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707553317; x=1708158117; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=iw/LpUuu9dLsicGV6ap33woaBKRKm9YAWOdGXkMTUqM=; b=nWTz4/+DZNurogjDPHlpPL/OpQSpNHJ6ONbrcTB27P+mc1fbaR1W5aTqxtu7sPO686 Lktq6dCpcUh7GxVCjEB6KZ5l6HRsgCTZ4BjU+gMcNk5hQX5yLqt846/p8LGs8TkCtAQC F4/Iktx9Uwn83qFmEHBtnr7j6/jIZKUSFjj8gBbZVOof1MYU1AOIzhH+djtoxTSzMKZI B5IFF8cQFRv1Pm0prYtqm+orJTh+Zrxl0E724yc81Dxz6WinslrtAPbUEOkRMyIY4T9X 4kJPyB/Box4Npbs1CtLrSStdGFsYMRGBQfNh31RFdC4LXmDIfhnakcysggQno64yCfpd eSwg== X-Gm-Message-State: AOJu0YwBNOSSYAkI8uwtLQKTF1PVHtQOkbtfNDUJ15aNiW4YJjL6xcXv 302BmeLugUPgZ+yp+EQm/SMT/XEKg1OKGsymGT0xKNo+xF7+shcPkMSMGg+Ok7+aCbn7bahokm7 A8fTH/Hq0Hgw//YTFh8uYZMiP8AawrwLtfrhPbalLPYSdPszEeYANfhLNtl929cG3ER4ejhv73Q eQrl/X/6cMnYbFkz+r/PmYL5q1cveAgtu8IA== X-Received: from reksio.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1be8]) (user=darekm job=sendgmr) by 2002:a05:6902:150d:b0:dc6:d678:371d with SMTP id q13-20020a056902150d00b00dc6d678371dmr410489ybu.3.1707553312557; Sat, 10 Feb 2024 00:21:52 -0800 (PST) Date: Sat, 10 Feb 2024 08:21:43 +0000 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240210082143.1654211-1-darekm@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v4] lavc/libvpxenc: add screen-content-mode option 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: , X-Patchwork-Original-From: Dariusz Marcinkiewicz via ffmpeg-devel From: Dariusz Marcinkiewicz Reply-To: FFmpeg development discussions and patches Cc: Dariusz Marcinkiewicz , =?utf-8?q?Erik_Spr=C3=A5ng?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tfJHgLbjDCP+ This exposes VP8E_SET_SCREEN_CONTENT_MODE option from libvpx. Co-authored-by: Erik Språng Signed-off-by: Dariusz Marcinkiewicz --- doc/encoders.texi | 3 +++ libavcodec/libvpxenc.c | 11 +++++++++++ libavcodec/version.h | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index c9fe6d6143..0868aa66db 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2150,6 +2150,9 @@ of quality. Set a change threshold on blocks below which they will be skipped by the encoder. +@item screen-content-mode +Screen content mode, one of: off (0), screen (1), screen with more aggressive rate control (2). + @item slices (@emph{token-parts}) Note that FFmpeg's @option{slices} option gives the total number of partitions, while @command{vpxenc}'s @option{token-parts} is given as diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 80988a2608..0d507beaae 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -102,6 +102,7 @@ typedef struct VPxEncoderContext { #define VP8F_AUTO_ALT_REF 0x00000002 ///< Enable automatic alternate reference frame generation int auto_alt_ref; + int screen_content_mode; int arnr_max_frames; int arnr_strength; @@ -164,6 +165,7 @@ static const char *const ctlidstr[] = { [VP8E_SET_MAX_INTRA_BITRATE_PCT] = "VP8E_SET_MAX_INTRA_BITRATE_PCT", [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", [VP8E_SET_TEMPORAL_LAYER_ID] = "VP8E_SET_TEMPORAL_LAYER_ID", + [VP8E_SET_SCREEN_CONTENT_MODE] = "VP8E_SET_SCREEN_CONTENT_MODE", #if CONFIG_LIBVPX_VP9_ENCODER [VP9E_SET_LOSSLESS] = "VP9E_SET_LOSSLESS", [VP9E_SET_TILE_COLUMNS] = "VP9E_SET_TILE_COLUMNS", @@ -1262,6 +1264,14 @@ static av_cold int vpx_init(AVCodecContext *avctx, #endif } #endif + if (avctx->codec_id == AV_CODEC_ID_VP8 && ctx->screen_content_mode >= 0) { + if (ctx->screen_content_mode == 2 && ctx->is_alpha) { + av_log(avctx, AV_LOG_ERROR, + "Transparency encoding with screen mode with aggressive rate control not supported\n"); + return AVERROR(EINVAL); + } + codecctl_int(avctx, VP8E_SET_SCREEN_CONTENT_MODE, ctx->screen_content_mode); + } av_log(avctx, AV_LOG_DEBUG, "Using deadline: %d\n", ctx->deadline); @@ -1946,6 +1956,7 @@ static const AVOption vp8_options[] = { { "auto-alt-ref", "Enable use of alternate reference " "frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, VE}, { "cpu-used", "Quality/Speed ratio modifier", OFFSET(cpu_used), AV_OPT_TYPE_INT, {.i64 = 1}, -16, 16, VE}, + { "screen-content-mode", "Encoder screen content mode", OFFSET(screen_content_mode), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, VE, "screen_content_mode"}, LEGACY_OPTIONS { NULL } }; diff --git a/libavcodec/version.h b/libavcodec/version.h index f2f14eaed1..ecdbc51c74 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 39 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \