From patchwork Fri Mar 8 13:21:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 46907 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp933024pzb; Fri, 8 Mar 2024 05:22:20 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWargVzv91Lp5uEQSVrLTshdpdO7ykzTh7wRQK0a72v9sp7TIO6sA3EMrvn1w5lQzbTpuseAezjjGvPSq1LZd0WraIzCTNw8HgVqw== X-Google-Smtp-Source: AGHT+IHklNn8J3gVpcqJ0MVbM/c2cOII5c9zkm3q3cODuhLyoqYeldeFmjE72HN2tmMWQMwY6RvO X-Received: by 2002:a17:906:f194:b0:a3e:9231:fe7e with SMTP id gs20-20020a170906f19400b00a3e9231fe7emr15404382ejb.71.1709904140447; Fri, 08 Mar 2024 05:22:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709904140; cv=none; d=google.com; s=arc-20160816; b=JCyE5Kv5AA+NnzAfgNX4vzOu/tnli/KQdWtqdZOz0fKqmB9a2gt+K0a/HXZATNY5Mq CSX12c0wi8FvrLsbniwZ9PZFdIwsIxSIVfPYd4MQaAZljuRopCDgsrOC79PULrYrE3T/ 5Q2FfAfKEoyFJH24U/9SdSgd/Ns70uUf77ARFn0gPgZb/j+iY9ExzzvjRnfG8olg4o3h JBKTBzs91FyXx7RwKAeqZoDs/nZCZxv/OGh/FY41ejKWZiplupYRKHRW5aiT5y4OyT+v lwtJSzN4NlK5uwLrCluQT4y3q5GbnPMbiuEJmQhHqv8SDajccwWExrRJjxiziKjF1zu0 K1MQ== 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=Xrp0LLcv0T1fCT005QzfzC9TFwI4W6y7QcIxQgC8NKs=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=01tJED3LJkvY/j9FKXyKqbi8DgrR3qodph3bJYl06jC6ZRABu6f+tDqDJHjDMo04CF /LLXoGj0ooyFzwZnVppWa968ivB28o+vz6J6lKVzC8c0jnE24qQ0eqUjtMmZU17HUJUN iN+AsA8neJKG08KcRGjuH2bbPmdDMV1AxJ+LOhpBuGq3eC4BucXb+FxD+3S/jHhI7ROB ul9MEFg8qt0+f28ACT6E9muU2+I3jR2Iyshst/Cofpqduy/14/tn6KV29a0c5ybSLiGF jrIJzRlEyXZY7X1qO8fxexXRLFquPCGjem0BYsqJEJPWqcfac6VN57MhisMDSuNOjlRq OBmQ==; 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=rgag8ycC; 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 pv26-20020a170907209a00b00a45e92149bfsi722085ejb.603.2024.03.08.05.22.20; Fri, 08 Mar 2024 05:22:20 -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; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=rgag8ycC; 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 6A20568CFDA; Fri, 8 Mar 2024 15:22:11 +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 2D7E068CFC8 for ; Fri, 8 Mar 2024 15:22:04 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1709904124; bh=dyA/bkoFg2xxBBQ652yFdjD8M/Bn69AbYXbv09gGm0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rgag8ycC3SrE4JmFryV1aNMSHf3YXW/k7X00CFbzGducmZ85MHxpF4tmH7HsY5Mxl qxfHNSij3uOqBq9C0HvJZjmTpBWCoou8Nm5rEyoc6+aEKWH3zT9C2+8lSpj/BvM2sx cXIc1n4YXB5pSyuLAsVJ8/HnBziD0hqgQMggkiFs= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id F30B641EE2; Fri, 8 Mar 2024 14:22:03 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2024 14:21:09 +0100 Message-ID: <20240308132108.28337-6-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240308132108.28337-1-ffmpeg@haasn.xyz> References: <20240308132108.28337-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/4] 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: 9QMY2NMW+a7C From: Niklas Haas Following the usual logic for H.274 film grain. --- libavcodec/Makefile | 2 +- libavcodec/hevcdec.c | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 68e5394d84e..67faf620742 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..2809be659a8 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, @@ -2935,13 +2939,24 @@ 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); + fgp = (AVFilmGrainParams *) sd->data; + switch (fgp->type) { + case AV_FILM_GRAIN_PARAMS_NONE: + return AVERROR_BUG; /* impossible, SD should not be present */ + 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 +3611,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)