From patchwork Fri Sep 20 00:45:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Segall, Andrew via ffmpeg-devel" X-Patchwork-Id: 51664 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp661846vqb; Thu, 19 Sep 2024 17:45:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWMO5oqjGn9e8r7ful7fNGaFlR7GhabVHvRcC+Y80FpfPxsbifRX28eGgb3oBcQXhMv+N9oqeBFTSJ/PviEHjwb@gmail.com X-Google-Smtp-Source: AGHT+IFaMbA+7ThdwU56zJ7tFnGrvuDZHXqge2rDcabYO7+ZWNt83NankVjNOyVNe7QOSwDG1qy3 X-Received: by 2002:a05:6512:10d5:b0:536:53f0:2f8e with SMTP id 2adb3069b0e04-536ac31efe7mr602873e87.37.1726793144089; Thu, 19 Sep 2024 17:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726793144; cv=none; d=google.com; s=arc-20240605; b=HWLgUVtBPKLBZR29FSWEtHXF/5jKQysc9GJfjkSp7NRuysSgBSNOqve0GvwLBHdxYJ vEm/mR4D8EMIRJcniz/WQiYJQa4S++2GHphsM0nXH4OL8emMiX/qL33LZ2MuFmpDWghv JV/iSbQlJB36U6iihlzAEftbmlCMt5sPJCMh7GL4R00QIRTWj1f11JWPVgKxFUs5jXXM 650PAYUI9Ww+yvdOGsBeCteSXF8lFM39pzZvby+TJZF+zCIDWKqDYjLxHYu36wk+rs8o Mzco2OOB957VrqzUH6qwUZypyLrZpBe4F58/ymglD6pwqmQGvvup+CkG+6nY6OaPu7v5 fP2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:mime-version:content-id:content-language :accept-language:message-id:date:thread-index:thread-topic:to :delivered-to; bh=178nwh09D/Xo7Jh2W9uNkrp08tYNY7c6KkHqzwNwjn8=; fh=95aBa8D1rLPK8RMCJmEpewcRxmtn52v1CfXNTjgpso4=; b=S1HLcC51+Z1ljX5GKrj/ANFxhAlRq8jhg/Caje+rh+7p5CUBImfsZJpPf8APs9M4/A eKFgXwIdtxsr8jyjCidy/sd6w3SjsvJohAGjAIa4d8YLOQksqvVt5gdndB5YU02nbVxv xx58WpvlVIwDCcm5ciOdpg5ivvbj08W8D56oanrD0NaBP5XEjekODW5Pth+yFN2TQKA0 RyTDQ28ybHszfg8I6knf03O2d2JqMtVG3IwReWeSX/AVswtIukapUoQj5VyGV8Za7uzr AuTAJ8gUNUxF2kzxZsaqrElDoST9nz//0vpKA7/9rQxp39FaDgjiY2TAciDjzcQkNL98 x0Fg==; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a906133adf3si846212466b.883.2024.09.19.17.45.43; Thu, 19 Sep 2024 17:45:44 -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; 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 7F42568DD3A; Fri, 20 Sep 2024 03:45:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-fw-80007.amazon.com (smtp-fw-80007.amazon.com [99.78.197.218]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3259068DBF5 for ; Fri, 20 Sep 2024 03:45:34 +0300 (EEST) X-IronPort-AV: E=Sophos;i="6.10,243,1719878400"; d="scan'208";a="332969248" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.25.36.210]) by smtp-border-fw-80007.pdx80.corp.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2024 00:45:32 +0000 Received: from EX19MTAUWA001.ant.amazon.com [10.0.38.20:49132] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.31.232:2525] with esmtp (Farcaster) id a1594fd4-7225-47d8-8e5c-4f42f5c13b4d; Fri, 20 Sep 2024 00:45:31 +0000 (UTC) X-Farcaster-Flow-ID: a1594fd4-7225-47d8-8e5c-4f42f5c13b4d Received: from EX19D022UWC001.ant.amazon.com (10.13.139.251) by EX19MTAUWA001.ant.amazon.com (10.250.64.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.34; Fri, 20 Sep 2024 00:45:31 +0000 Received: from EX19D022UWC002.ant.amazon.com (10.13.139.216) by EX19D022UWC001.ant.amazon.com (10.13.139.251) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.34; Fri, 20 Sep 2024 00:45:31 +0000 Received: from EX19D022UWC002.ant.amazon.com ([fe80::e13f:1459:3a4b:7b06]) by EX19D022UWC002.ant.amazon.com ([fe80::e13f:1459:3a4b:7b06%5]) with mapi id 15.02.1258.034; Fri, 20 Sep 2024 00:45:31 +0000 To: FFmpeg development discussions and patches Thread-Topic: [PATCH 3/3] - libavcodec/aom_film_grain: Mark AFGS1 parameters in the current message as eligible for selection Thread-Index: AQHbCvZlRYs9SzBPKEyPQBysQ0otfw== Date: Fri, 20 Sep 2024 00:45:31 +0000 Message-ID: <9EA48E88-54C5-45DD-81BE-EC486940112D@amazon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.13.138.67] Content-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] - libavcodec/aom_film_grain: Mark AFGS1 parameters in the current message as eligible for selection 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: "Segall, Andrew via ffmpeg-devel" From: "Segall, Andrew via ffmpeg-devel" Reply-To: FFmpeg development discussions and patches Cc: "Segall, Andrew" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mg0aCRSsDDMs Details: Limit selection of the film grain parameters to (only) those received in the current message. Signed-off-by: Andrew Segall > --- libavcodec/aom_film_grain.c | 7 +++++++ libavutil/film_grain_params.h | 5 +++++ 2 files changed, 12 insertions(+) */ diff --git a/libavcodec/aom_film_grain.c b/libavcodec/aom_film_grain.c index 251a2793ac..1096069922 100644 --- a/libavcodec/aom_film_grain.c +++ b/libavcodec/aom_film_grain.c @@ -127,6 +127,12 @@ int ff_aom_parse_film_grain_sets(AVFilmGrainAFGS1Params *s, AVFilmGrainParams *fgp, *ref = NULL; int ret, num_sets, n, i, uv, num_y_coeffs, update_grain, luma_only; + // Mark existing film grain parameters as ineligible for use in the current frame + for(n =0; n < 8; n++) { + if( s->sets[n].type == AV_FILM_GRAIN_PARAMS_AV1 ) + s->sets[n].type = AV_FILM_GRAIN_PARAMS_AV1_INACTIVE; + } + ret = init_get_bits8(gb, payload, payload_size); if (ret < 0) return ret; @@ -149,6 +155,7 @@ int ff_aom_parse_film_grain_sets(AVFilmGrainAFGS1Params *s, fgp = &s->sets[set_idx]; aom = &fgp->codec.aom; + // Mark current film grain parameters as eligible for selection in the current frame fgp->type = AV_FILM_GRAIN_PARAMS_AV1; fgp->apply_grain = get_bits1(gb); diff --git a/libavutil/film_grain_params.h b/libavutil/film_grain_params.h index f3275923e1..1b507829fe 100644 --- a/libavutil/film_grain_params.h +++ b/libavutil/film_grain_params.h @@ -29,6 +29,11 @@ enum AVFilmGrainParamsType { */ AV_FILM_GRAIN_PARAMS_AV1, + /** + * + */ + AV_FILM_GRAIN_PARAMS_AV1_INACTIVE, + /** * The union is valid when interpreted as AVFilmGrainH274Params (codec.h274)