From patchwork Thu Jul 22 13:44:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29016 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp545735ios; Thu, 22 Jul 2021 07:06:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkuG3knUU7gzECXqrPGICS2px5rce1g2cOr3sd1TdYtIJS9mr5C1G7exKw8x3VVE8aAeip X-Received: by 2002:a17:906:e257:: with SMTP id gq23mr39740ejb.545.1626962804240; Thu, 22 Jul 2021 07:06:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626962804; cv=none; d=google.com; s=arc-20160816; b=ICzEinmxI0MfNIzOVPDrlNh/oHLyp8VlfhBGCzTPpDphIyOOQE6at0w7U9Ot2aJt9S Ybj/oOZyWFNYAEJxNnlrzC9x86fQuARrgck1uFf+bqY8eMUk/TXH5uztEoV+4C6FperI z8MSNsOaUsmQ7SlFOg4y/fp5ECRIJa4pssrs6P6ifYCr5KVYU+HHUrnXglEVmB2Drimc z7OK0BVA5w32/DVs8vrOnHvm75xh/3rZKXvgym30IIgd+csY319c37VGsjsLNShogAPG XSDwgYg2VTFEJ/zxHEVIg7h4s+1cDeduj367GMRUqXWyvOPoI42dJZQkLsfjHQpNfeB/ AQNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=d/8k64LaTB8m2ACQIOWR3cafv60nRM/2iM9Aq+4JxRE=; b=odTHnlDBgUyolDUz3PWrywjVVupD139zsq6HHlk1BYagM13DAuz7NpSY6b4ErLZpjM 3SgrjTmDLm9mQu1ACEhkQu3GVDy62L/gVFo0Ztr83cYQ6SOgEkXDZ6vvxGfEc7G3parl VeEvTKXWmDzfZxmu+mvvACJJkWBbIjUvNYmR+4I/qM1KGHusEaf7k4YMBtCqB1VHOjpU irWCK7U4bFI7FdSOrFA85huPUz01A8e1cR3OB7DEk0zfIO+lELSycDWlzlQb1fgo5C3K qVXRWJR7byy/WmtRxdgqKwT4Frw0YpIBZ6DYWemVeA9XoEjUO2HcLuxRz4SCCM45NUu+ LDjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Tq8aahCD; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jy22si32689346ejc.515.2021.07.22.07.06.43; Thu, 22 Jul 2021 07:06: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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Tq8aahCD; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 54BEC68A473; Thu, 22 Jul 2021 17:06:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77AA668A866 for ; Thu, 22 Jul 2021 17:06:33 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id e14so4539451plh.8 for ; Thu, 22 Jul 2021 07:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=LRyY2mVeCaUQe7ZUVcuJNcPWMFMT4wn9xHaA8oCxvPc=; b=Tq8aahCDfe7mJ4NSHy7zi6qpumlLI7A8Vfxo9Mlwi7oR4SDzsIYtbibAwGiHRlXSjv mAkwXQ/pphHaE0IlZ3dyuOdKDmozMaku4Km1gGN5F1pIxQFD5T/tvs6pUmIUEkF0Kydl OG8a0/JlB5QeQ80s6vPTD0IHpQpCQIHHS2iPOtZW51pw88jlegaUhbqWKtvSftm17PDd TyvZ2pVJNlWjfk+vOeouguNcLyWWASSSbikNxnIIbfxY0+zbCh6H8Qq5rNlninw1U/dy OE1Rua1o1JABqp6DVH5gsvLEcuXc3J0qsMS35c2Yn2FrVjJo6wtoOblY614ckf49Dhfb fj0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LRyY2mVeCaUQe7ZUVcuJNcPWMFMT4wn9xHaA8oCxvPc=; b=N5kuDbvCocOnFV+yNKKlQqhEKQDUZziaiZVGLWbQi6w07CTTS/V5aeqIvzXlCenJC0 BlA1BuaxvqDjipiUOAD113cVZIAi2bVXnbkDU6Ic4jAlWi2kZyFJu1xs0Zt3QRwAuXGk mSGCzkkuJDowT5x9+3+UlFpFwr25fzlkiAgVrv/WitJrHhCtB7c5O55p8opmxqTXZ78/ 4qKt+3L//GnUoYogHblj7nz2k6qkY2oDO+8gERU3tShNsGn3KIn+kOp4m0assIxwfcQE Qnpw2IcucA4oJ6g47ydNTVjCoxIa5EWoxwMyAOQW97a+dt4nRGzUjExu3pVBcrPQcCZd FSbA== X-Gm-Message-State: AOAM531qBBouSVZ+YyeOSlEh3yyzKNB316B/ttnnib0J3GHZ6drZxl40 zw5aoalxTZDtDL+2vt1Rz7KP1RD/8/k= X-Received: by 2002:a62:1a4b:0:b029:328:da0b:d83b with SMTP id a72-20020a621a4b0000b0290328da0bd83bmr41349219pfa.59.1626961539892; Thu, 22 Jul 2021 06:45:39 -0700 (PDT) Received: from localhost.localdomain ([191.83.217.217]) by smtp.gmail.com with ESMTPSA id b2sm33870136pgh.9.2021.07.22.06.45.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 06:45:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Jul 2021 10:44:54 -0300 Message-Id: <20210722134455.192-2-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722134455.192-1-jamrial@gmail.com> References: <20210722134455.192-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avutil/film_grain_params: add support for H.274 Film Grain Characteristics 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1Fx+SgmPYL8V Used by codecs like H.264, HEVC, and VVC. Signed-off-by: James Almer --- Missing version bump and APIchanges entry. libavutil/film_grain_params.h | 89 +++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/libavutil/film_grain_params.h b/libavutil/film_grain_params.h index 7629e3a041..7350dfc5b8 100644 --- a/libavutil/film_grain_params.h +++ b/libavutil/film_grain_params.h @@ -28,6 +28,11 @@ enum AVFilmGrainParamsType { * The union is valid when interpreted as AVFilmGrainAOMParams (codec.aom) */ AV_FILM_GRAIN_PARAMS_AV1, + + /** + * The union is valid when interpreted as AVFilmGrainH274Params (codec.h274) + */ + AV_FILM_GRAIN_PARAMS_H274, }; /** @@ -117,6 +122,89 @@ typedef struct AVFilmGrainAOMParams { int limit_output_range; } AVFilmGrainAOMParams; +/** + * This structure describes how to handle film grain synthesis for codecs using + * the ITU-T H.274 Versatile suplemental enhancement information message. + * + * @note The struct must be allocated as part of AVFilmGrainParams using + * av_film_grain_params_alloc(). Its size is not a part of the public ABI. + */ +typedef struct AVFilmGrainH274Params { + /** + * Specifies the film grain simulation mode. + * 0 = Frequency filtering, 1 = Auto-regression + */ + int model_id; + + /** + * Specifies the bit depth used for the luma component. + */ + int bit_depth_luma; + + /** + * Specifies the bit depth used for the chroma components. + */ + int bit_depth_chroma; + + enum AVColorRange color_range; + enum AVColorPrimaries color_primaries; + enum AVColorTransferCharacteristic color_trc; + enum AVColorSpace color_space; + + /** + * Specifies the blending mode used to blend the simulated film grain + * with the decoded images. + * + * 0 = Additive, 1 = Multiplicative + */ + int blending_mode_id; + + /** + * Specifies a scale factor used in the film grain characterization equations. + */ + int log2_scale_factor; + + /** + * Indicates if the modelling of film grain for a given component is present. + */ + int component_model_present[3 /* y, cb, cr */]; + + /** + * Specifies the number of intensity intervals for which a specific set of + * model values has been estimated, with a range of [1, 256]. + */ + uint16_t num_intensity_intervals[3 /* y, cb, cr */]; + + /** + * Specifies the number of model values present for each intensity interval + * in which the film grain has been modelled, with a range of [1, 6]. + */ + uint8_t num_model_values[3 /* y, cb, cr */]; + + /** + * Specifies the lower ounds of each intensity interval for whichthe set of + * model values applies for the component. + */ + uint8_t intensity_interval_lower_bound[3 /* y, cb, cr */][256 /* intensity interval */]; + + /** + * Specifies the upper bound of each intensity interval for which the set of + * model values applies for the component. + */ + uint8_t intensity_interval_upper_bound[3 /* y, cb, cr */][256 /* intensity interval */]; + + /** + * Specifies the model values for the component for each intensity interval. + * - When model_id == 0, the following applies: + * For comp_model_value[y], the range of values is [0, 2^bit_depth_luma - 1] + * For comp_model_value[cb..cr], the range of values is [0, 2^bit_depth_chroma - 1] + * - Otherwise, the following applies: + * For comp_model_value[y], the range of values is [-2^(bit_depth_luma - 1), 2^(bit_depth_luma - 1) - 1] + * For comp_model_value[cb..cr], the range of values is [-2^(bit_depth_chroma - 1), 2^(bit_depth_chroma - 1) - 1] + */ + int16_t comp_model_value[3 /* y, cb, cr */][256 /* intensity interval */][6 /* model value */]; +} AVFilmGrainH274Params; + /** * This structure describes how to handle film grain synthesis in video * for specific codecs. Must be present on every frame where film grain is @@ -143,6 +231,7 @@ typedef struct AVFilmGrainParams { */ union { AVFilmGrainAOMParams aom; + AVFilmGrainH274Params h274; } codec; } AVFilmGrainParams;