From patchwork Fri Mar 15 11:59:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47099 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8c91:b0:1a3:31a3:7958 with SMTP id k17csp194768pzh; Fri, 15 Mar 2024 05:06:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU4DYIQ9Q6hIocfZnZVCQdlWkdoseY3/HqthTwZiP5rwXQQh/ueaiPM7/f/oWx+fOd6Kxk+4PiHWsjlnzulmCpTA/pLhawiPf8U+g== X-Google-Smtp-Source: AGHT+IHrZvNJuGAl1h/kbzl0fqAAT1GWLiq15vOGupZVCChTdAmHrI2CcP8677eRFNt7qlBCJfVc X-Received: by 2002:a17:906:d104:b0:a44:2ba0:8200 with SMTP id b4-20020a170906d10400b00a442ba08200mr3102527ejz.26.1710504403850; Fri, 15 Mar 2024 05:06:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710504403; cv=none; d=google.com; s=arc-20160816; b=R70V9VS67tjii0tgk13jAzydObGS0X9b1kxPANvazUVJEZIWUIV9/ChXMGnGMxWjAi IJo3fdiV04rD5G66QEdm3Z12j17GbpPaiU8/RPFJ4X7C5+fELqFCcgfQQBW2c3tndFFf rZT4Q1IdGHT2x5gQ7isULPhq1kNGMUzJcGpUVqvMxRn7gp2TUDLs6bRt/ZgX2BoImX+m ih1T1eCwdLrjzoies9HaaITo6xqgSXYG5fg5YM91ZD8NX+moMe0E+umKYXs/Q00Llu3w C4+r0+ZFgpcNiRo6j/AtJP1F047YOtrpx62CNXZM8lvhfWdxGRW78aHOyOioEe9nOZr7 1vMQ== 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 :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=4HNbHGvUeEMkys0guomKXtyESAVfhxJ3mxxgiIpynzI=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=ti6y26pfu+wbLGSmeTwSZFj93+fn0nvAb6V0p2/7h6TRvDG4lGpWeCFfoKv670WwKu gvfqveQYkrQsBQePUHuCHRpnaQQNpcIdUujl3LzQZbKmiXUcewnSyyPz+m/F4tYkD27l lm68VQ76x/gEEmwhxl49qGefdA1eZiSS2SDiFHhu734L5AebyXfKmWRikHdszpFFLqnt R4OKB20CP1eKMZwW4YOHIsHivacvwnFKrnRzKR3wJjGyLDR6hLyz4Rgamacryl9OGqLw 9XiiM4TUQ/dcuDteiiJo8jCE4YdKhjZaBPW0BL+g778KYRvgkprzCIotfog0X3twD66Q hXxw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b="g/maXeM9"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f23-20020a170906049700b00a4633aa3431si1673370eja.458.2024.03.15.05.06.34; Fri, 15 Mar 2024 05:06:43 -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=@haasn.xyz header.s=mail header.b="g/maXeM9"; 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 3831D68D1D5; Fri, 15 Mar 2024 14:05:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01B2268D191 for ; Fri, 15 Mar 2024 14:04:52 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1710504288; bh=Brdg+HXEf+ZdoVNYcTOZPkoyTxPUvpzR8Nmylznw8LI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g/maXeM9ciieY8OMTeY7N3CqfEfAzGVB30GLozyJZHHibpYhltav55gS2q+DM4LU0 gj6Gj8DNFPDQRtqiKTzLOuHWj3nXyHXsc5H2TMP1M4vsOoKRxf+vxCNTa/JE1uslVd eon/mhv4JOM143CcE90/NgP1SJBOfG+mcgwdAbD0= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 2CEF243065; Fri, 15 Mar 2024 13:04:48 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Mar 2024 12:59:02 +0100 Message-ID: <20240315120442.73754-10-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240315120442.73754-1-ffmpeg@haasn.xyz> References: <20240315120442.73754-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 9/9] avcodec/hevcdec: apply AOM film grain synthesis 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: m20YHzOg8+B+ From: Niklas Haas Following the usual logic for H.274 film grain. --- libavcodec/Makefile | 2 +- libavcodec/hevcdec.c | 29 ++++++++++++++++++++++------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 824845276ae..7ef2e03ca6a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -432,7 +432,7 @@ OBJS-$(CONFIG_HDR_ENCODER) += hdrenc.o OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o \ hevc_cabac.o hevc_refs.o hevcpred.o \ hevcdsp.o hevc_filter.o hevc_data.o \ - h274.o + h274.o aom_film_grain.o OBJS-$(CONFIG_HEVC_AMF_ENCODER) += amfenc_hevc.o OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 76aa6b45882..575836e340c 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -35,6 +35,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/timecode.h" +#include "aom_film_grain.h" #include "bswapdsp.h" #include "cabac_functions.h" #include "codec_internal.h" @@ -388,7 +389,8 @@ static int export_stream_params_from_sei(HEVCContext *s) avctx->color_trc = s->sei.common.alternative_transfer.preferred_transfer_characteristics; } - if (s->sei.common.film_grain_characteristics.present) + if (s->sei.common.film_grain_characteristics.present || + s->sei.common.aom_film_grain.enable) avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; return 0; @@ -2885,11 +2887,13 @@ static int hevc_frame_start(HEVCContext *s) else s->ref->frame->flags &= ~AV_FRAME_FLAG_KEY; - s->ref->needs_fg = s->sei.common.film_grain_characteristics.present && + s->ref->needs_fg = (s->sei.common.film_grain_characteristics.present || + s->sei.common.aom_film_grain.enable) && !(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && !s->avctx->hwaccel; if (s->ref->needs_fg && + s->sei.common.film_grain_characteristics.present && !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id, s->ref->frame->format)) { av_log_once(s->avctx, AV_LOG_WARNING, AV_LOG_DEBUG, &s->film_grain_warning_shown, @@ -2934,14 +2938,24 @@ fail: static int hevc_frame_end(HEVCContext *s) { HEVCFrame *out = s->ref; - const AVFrameSideData *sd; + const AVFilmGrainParams *fgp; av_unused int ret; if (out->needs_fg) { - sd = av_frame_get_side_data(out->frame, AV_FRAME_DATA_FILM_GRAIN_PARAMS); - av_assert0(out->frame_grain->buf[0] && sd); - ret = ff_h274_apply_film_grain(out->frame_grain, out->frame, &s->h274db, - (AVFilmGrainParams *) sd->data); + av_assert0(out->frame_grain->buf[0]); + fgp = av_film_grain_params_select(out->frame); + switch (fgp->type) { + case AV_FILM_GRAIN_PARAMS_NONE: + av_assert0(0); + return AVERROR_BUG; + case AV_FILM_GRAIN_PARAMS_H274: + ret = ff_h274_apply_film_grain(out->frame_grain, out->frame, + &s->h274db, fgp); + break; + case AV_FILM_GRAIN_PARAMS_AV1: + ret = ff_aom_apply_film_grain(out->frame_grain, out->frame, fgp); + break; + } av_assert1(ret >= 0); } @@ -3596,6 +3610,7 @@ static int hevc_update_thread_context(AVCodecContext *dst, s->sei.common.alternative_transfer = s0->sei.common.alternative_transfer; s->sei.common.mastering_display = s0->sei.common.mastering_display; s->sei.common.content_light = s0->sei.common.content_light; + s->sei.common.aom_film_grain = s0->sei.common.aom_film_grain; ret = export_stream_params_from_sei(s); if (ret < 0)