From patchwork Mon Mar 18 16:54:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47185 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp1139899pzb; Mon, 18 Mar 2024 09:58:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXkmmeR5LJX4Ilk969mPU9Z9dKNJ0mbYm2+YPMt7nGYaFi2mvdGzkDE1hFkZ0logC3UsA5+lZmZpV+3A62bOX81NsLdeyOni4O4ew== X-Google-Smtp-Source: AGHT+IGgSWFJDKUdApWW2yIB8ide4cqnN7cv8pQn5TuXiTmuqdArypgEKK9XNUabwse7Geab4bU3 X-Received: by 2002:ac2:4db1:0:b0:513:cfb8:8cb3 with SMTP id h17-20020ac24db1000000b00513cfb88cb3mr8731102lfe.1.1710781083851; Mon, 18 Mar 2024 09:58:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710781083; cv=none; d=google.com; s=arc-20160816; b=O3uJMP6M4Ab9kF7tLe/ZcfnyRyTVNT6o0+U7dNyrbcOVusTTH0X9TazoKPfCGRwJZF SUoEnxq2OkCNbf//2O+7Co463Tz+x7xA/ZOZ4zvWqb40Wp+zs3K5ntoYLuIm0iuHkrn5 Z7s4OCU8EGI0IY+CuQdklQwVe+fmGm6tNamWEqef3iURQhRLPBoVBoA+CWMgVp8LZC8V pj3ho/V6i0IKIrMoRUgq0r7BJpl1tiYH6fyAlbwso5AJef6oqBJ0avAQY4+n5quNV5EH LJZnWY5MzCYGYlsP6XabWXD5Gnb+ysOVau9XB3rYd62yPwbJepbrR50azaolqdXxAKrD 02dw== 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=08dillpPpKM/ODk3rvYFwkAgVjwOGbF9oxDLL0k/bDssnJPSAjlLd2NLPPwp2Xoevr gxrzdXsfjEO3pJ1RSc5zlyt6chn2NtXMK5HAzYlmQUW9SLnz3A+ZxY6ytEyALAfPb8Zs dZJPSkG//LAGT8o0V4X1KXsK1yXXli1a9VoxXVSyCLDdlky4Uq8/DeakmAGqA/JZQ5kE obm7dyN89v1rA3ZfPNDCVoM5GVSMbCHCHkhY68g3SNmhYFGWysocYYK/QeEmyqNESIpq 2XF1KyN9DcGmvJZh0WjQFjJ+gvHMFT6jXZn8Y8tsDTo7VFAIVTpDBiwFdrw41oYaC44G wRtQ==; 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="Ak6/4uGn"; 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 g14-20020a170906538e00b00a449027ce94si4572662ejo.682.2024.03.18.09.58.03; Mon, 18 Mar 2024 09:58:03 -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="Ak6/4uGn"; 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 A25B568D358; Mon, 18 Mar 2024 18:57:10 +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 4962268D2FD for ; Mon, 18 Mar 2024 18:57:03 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1710781020; bh=Brdg+HXEf+ZdoVNYcTOZPkoyTxPUvpzR8Nmylznw8LI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ak6/4uGn4q1hkccn8uqnaQikgWHsOOl6JW9UJs2WamMYZIvLe2QSdrMIMaVJ3ydoG jYSiz08tdhrxj9vDdFvXWJTghMW2WiXcPXwR87atbVumVZBGgj+lPxcGr1UHRe/zTq 8XoEL2SsusLbY5oePo66znljZkH/52X41GW1G8YU= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 82A044717D; Mon, 18 Mar 2024 17:57:00 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 17:54:21 +0100 Message-ID: <20240318165651.75520-14-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318165651.75520-1-ffmpeg@haasn.xyz> References: <20240318165651.75520-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 13/13] 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: 7jJuisduLPXO 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)