From patchwork Tue Aug 3 00:12:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29208 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2011593ioh; Mon, 2 Aug 2021 17:13:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+IuuRYD670T9WsCVKa4Z/TGxvz6KYoXCtXSVKipAJriaNyJx5NzQwPDFPAGZSGGnKRcBH X-Received: by 2002:a17:906:3495:: with SMTP id g21mr18137947ejb.359.1627949597070; Mon, 02 Aug 2021 17:13:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627949597; cv=none; d=google.com; s=arc-20160816; b=OST2aHEqVaZV1G4PA/ganZhLMSIRMbar3sKS7gkcAJwY2lb9q+iJJxCbXpYmGaJ9nu nky/DIki9oTSgwuPp2vynWwEAtPh6CX4J5C8KpuKfAlfKoHLLHrK6V6NLWbvtKNCdoNR 2KCqiwCgaAh58MCp8UiooDBU94A7o2zeE8/U6UWR4/GLLhD1rIM9V67nt/WFow9VF8Vq SjUGdfRvn1kQ7OC6FDd9OQqa3vP33/6IKy/pjLxBfaiHLL7K8koxsIhLKVYz6Jelt96r tnLKc7IyHchT2yQi2sZXBbhx61nhmD/hJIp/DYlEwvMZKtBrdFiMlDkk5P1zz4UrrdWF WNng== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=z8pl5NwoTN2pZSC4Q8GCsc9Bn8llpTCds2RIjFi7w/k=; b=IvCAcEPdw/eczYxPgWcYYCcma9ztETpbljZqyVAP3T8x2t2oeYMnenumTi1GdfYOjB pQNCdvf48Q75Hp1+lIboqSYOUrspAVD+196Ejy68HFNwVnhEjmR0OGYoi/BULQbDcmKV IvSgfaMXohdFEJHWTagexWfewSajzSeQpv6qZQrxEXpAqVOm0RzOKLOxY8/NRibwE9Mr Rso3JXXxlQ3xsdYB+ylbB14vxSXksfVhSt4nOjp4uI0KW1WzI5OdD7hX6GfG7toeKjHa qT9y4WHQo3OrfY1HRVTVsQBOfzTwgKS3FR4/KCn4FVTNVtydy0M/GlwZdMOdUsIKe8AG 4kjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=M2KrWCZ7; 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 e1si11011318eji.452.2021.08.02.17.13.16; Mon, 02 Aug 2021 17:13:17 -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=M2KrWCZ7; 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 7EF9A68806D; Tue, 3 Aug 2021 03:13:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D261680212 for ; Tue, 3 Aug 2021 03:13:05 +0300 (EEST) Received: by mail-pj1-f42.google.com with SMTP id j1so27434419pjv.3 for ; Mon, 02 Aug 2021 17:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=+rEZ3IKeM2wvU7bxS8JVoq0TBYwP/HB6gBt3/csnMEo=; b=M2KrWCZ7PlEyT1tVO5WJ+OLX+bhRvbmPpa3vlkqA1gGeAwQlGKj0KJ3/zVVXk9Z/1t WGwFqfUcHVGzcwZ0VVyYmr5GaV5aUtGk3QkuUoVLyC5YaELCQpM+ta7ZPltiYdjBUskM k/NXEO8r3Hru6lYRLnbRxbaFYH4Cmo60lulZfBMOWNqb0jz3jKTj7hgYsLbPRqFvtdD2 mVBBaUQccDTwar8ocESxDyQLebEgMCwSks+9YjnGoHN/acURY+I4SxKM32wrIwJrO2r9 K5Bp+bYaGm7D4cS22+esVmxx56rMA6EnakXnm0n6EbPDChcLW+aaBkCJ8NByWOabVkp0 Kt5w== 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:mime-version :content-transfer-encoding; bh=+rEZ3IKeM2wvU7bxS8JVoq0TBYwP/HB6gBt3/csnMEo=; b=JUS1DaOpchcdMTH1ouvgfhHs92tEsBYnqZlfS3k9pC5CfpyMN/bfp9RZMZrY4VBe0g bapEmOD9RfD7w16RJ9nAnHD5YgWh1Ayc33kBGxkpLr1foesKt10Yw0tQTWwcVybarnTn 3EfOlomGU1rnBKHxUHe+cn9SeFeccmwPf0uBPwKTNhEG7Mub6g8Ob/LWrEtmf2DLoiyQ sC7XAtWe1cScgAD8zCQDcVbvvmmCeBQKC4Tzz9K39/AopDt99n3ZzmZyJTFQuoANzEgA XNCTZBf1J0+Vj04pNgSMCch8Xt1Te809W7z8Yyt8p8cMFwNrdPruLNnTXxUmSEiBr0G9 UyYw== X-Gm-Message-State: AOAM5309FJpFjfIPFuDW/ALjgPM11aIHrhAp8kfj+R5+VSV9C+ObSL6W 8S306TtOhcU3QOj5XcGAdhokYbn5vtZsRA== X-Received: by 2002:a17:902:864c:b029:10d:8c9e:5f56 with SMTP id y12-20020a170902864cb029010d8c9e5f56mr16154949plt.8.1627949582877; Mon, 02 Aug 2021 17:13:02 -0700 (PDT) Received: from localhost.localdomain ([191.84.227.130]) by smtp.gmail.com with ESMTPSA id e12sm14832545pgv.51.2021.08.02.17.13.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 17:13:02 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 21:12:29 -0300 Message-Id: <20210803001231.2346-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] cbs_h265: add support for Film Grain Characteristics SEI message 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: cTom6WMHFkKt Signed-off-by: James Almer --- libavcodec/cbs_h2645.c | 6 +++ libavcodec/cbs_h265.h | 21 +++++++++ libavcodec/cbs_h265_syntax_template.c | 65 +++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 61c1e13cf7..3396c059c9 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1610,6 +1610,12 @@ static const SEIMessageTypeDescriptor cbs_sei_h265_types[] = { sizeof(H265RawSEIRecoveryPoint), SEI_MESSAGE_RW(h265, sei_recovery_point), }, + { + SEI_TYPE_FILM_GRAIN_CHARACTERISTICS, + 1, 0, + sizeof(H265RawFilmGrainCharacteristics), + SEI_MESSAGE_RW(h265, film_grain_characteristics), + }, { SEI_TYPE_DISPLAY_ORIENTATION, 1, 0, diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h index f7753f1206..f7cbd4970d 100644 --- a/libavcodec/cbs_h265.h +++ b/libavcodec/cbs_h265.h @@ -594,6 +594,27 @@ typedef struct H265RawSEIRecoveryPoint { uint8_t broken_link_flag; } H265RawSEIRecoveryPoint; +typedef struct H265RawFilmGrainCharacteristics { + uint8_t film_grain_characteristics_cancel_flag; + uint8_t film_grain_model_id; + uint8_t separate_colour_description_present_flag; + uint8_t film_grain_bit_depth_luma_minus8; + uint8_t film_grain_bit_depth_chroma_minus8; + uint8_t film_grain_full_range_flag; + uint8_t film_grain_colour_primaries; + uint8_t film_grain_transfer_characteristics; + uint8_t film_grain_matrix_coeffs; + uint8_t blending_mode_id; + uint8_t log2_scale_factor; + uint8_t comp_model_present_flag[3]; + uint8_t num_intensity_intervals_minus1[3]; + uint8_t num_model_values_minus1[3]; + uint8_t intensity_interval_lower_bound[3][256]; + uint8_t intensity_interval_upper_bound[3][256]; + int16_t comp_model_value[3][256][6]; + uint8_t film_grain_characteristics_persistence_flag; +} H265RawFilmGrainCharacteristics; + typedef struct H265RawSEIDisplayOrientation { uint8_t display_orientation_cancel_flag; uint8_t hor_flip; diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 5d216aad36..67bc77f975 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -1844,6 +1844,71 @@ static int FUNC(sei_recovery_point) return 0; } +static int FUNC(film_grain_characteristics)(CodedBitstreamContext *ctx, RWContext *rw, + H265RawFilmGrainCharacteristics *current, + SEIMessageState *state) +{ + CodedBitstreamH265Context *h265 = ctx->priv_data; + const H265RawSPS *sps = h265->active_sps; + int err, c, i, j; + + HEADER("Film Grain Characteristics"); + + flag(film_grain_characteristics_cancel_flag); + if (!current->film_grain_characteristics_cancel_flag) { + int filmGrainBitDepth[3]; + + u(2, film_grain_model_id, 0, 1); + flag(separate_colour_description_present_flag); + if (current->separate_colour_description_present_flag) { + ub(3, film_grain_bit_depth_luma_minus8); + ub(3, film_grain_bit_depth_chroma_minus8); + flag(film_grain_full_range_flag); + ub(8, film_grain_colour_primaries); + ub(8, film_grain_transfer_characteristics); + ub(8, film_grain_matrix_coeffs); + } else { + if (!sps) { + av_log(ctx->log_ctx, AV_LOG_ERROR, + "No active SPS for film_grain_characteristics.\n"); + return AVERROR_INVALIDDATA; + } + infer(film_grain_bit_depth_luma_minus8, sps->bit_depth_luma_minus8); + infer(film_grain_bit_depth_chroma_minus8, sps->bit_depth_chroma_minus8); + infer(film_grain_full_range_flag, sps->vui.video_full_range_flag); + infer(film_grain_colour_primaries, sps->vui.colour_primaries); + infer(film_grain_transfer_characteristics, sps->vui.transfer_characteristics); + infer(film_grain_matrix_coeffs, sps->vui.matrix_coefficients); + } + + filmGrainBitDepth[0] = current->film_grain_bit_depth_luma_minus8 + 8; + filmGrainBitDepth[1] = + filmGrainBitDepth[2] = current->film_grain_bit_depth_chroma_minus8 + 8; + + u(2, blending_mode_id, 0, 1); + ub(4, log2_scale_factor); + for (c = 0; c < 3; c++) + flags(comp_model_present_flag[c], 1, c); + for (c = 0; c < 3; c++) { + if (current->comp_model_present_flag[c]) { + ubs(8, num_intensity_intervals_minus1[c], 1, c); + us(3, num_model_values_minus1[c], 0, 5, 1, c); + for (i = 0; i <= current->num_intensity_intervals_minus1[c]; i++) { + ubs(8, intensity_interval_lower_bound[c][i], 2, c, i); + ubs(8, intensity_interval_upper_bound[c][i], 2, c, i); + for (j = 0; j <= current->num_model_values_minus1[c]; j++) + ses(comp_model_value[c][i][j], 0 - current->film_grain_model_id * (1 << (filmGrainBitDepth[c] - 1)), + ((1 << filmGrainBitDepth[c]) - 1) - current->film_grain_model_id * (1 << (filmGrainBitDepth[c] - 1)), + 3, c, i, j); + } + } + } + flag(film_grain_characteristics_persistence_flag); + } + + return 0; +} + static int FUNC(sei_display_orientation) (CodedBitstreamContext *ctx, RWContext *rw, H265RawSEIDisplayOrientation *current, SEIMessageState *sei) From patchwork Tue Aug 3 00:12:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29209 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2027221ioh; Mon, 2 Aug 2021 17:40:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/XJWLyg7peMO1duSOkuribUTXE3FEsICnn8aSu2dNRGAesxV6qGhtFRI0RL41rHzrU85f X-Received: by 2002:a17:906:2b4b:: with SMTP id b11mr12401759ejg.29.1627951250675; Mon, 02 Aug 2021 17:40:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627951250; cv=none; d=google.com; s=arc-20160816; b=FdiSsg2PtNI0DSBEXVxiWod347Sd4QBdfk9JcvoCnzGZWpwNBPdwspkNyUPfmY3Bjy brXk1hYvJ2CuKSQwMQbca3ZnK90SB9pTFLg4xD9d6FtmH1o+Es/sGOrbNsPD/mO4M7/H DYQlvGz4ZhVupEppEg8Fs9YszI1fHVHzp1IDr+xnlhXRO0ux3vj+28MCRRmW2PKuGg9m UvGunUJVtt5O9GrAIvZWol6GHjHcYD2M7n78TgL+xRoyv3DJ+G6RjATk9U/KqVQWhWHp gKX/0yGOnVW+u6IQl1JrKGmttMSz1v900iXTJUUJnDwGd0IxyoisKM+oczTHhbi/v7uP qdTQ== 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=N+oYvda1IOqhpaWnQzdLNT1SsiHSOOdF5Y3xmjQIBqs=; b=aGB3D7aId9L6B63y3mFUjjCqHnSoBrn3H/e21jvEfmmdWB18L0L9lSFiScisb+0aM0 jviA1vDM/V9fwYYohnTHKYbSbjfeiddMtfTLiP4toMCaZmjI0Z89IjjjceWOX4dWrskG 0aUuctYp/bM+NON/nDoOOAX9wGrwscw/RnEfkMX9lWAmk3uE029SCl1JC8omvFXavOOF EYc1j6fuyKvhltLNjkMU/2iYY1bFBkgMYzp3IvSImLIKzRDJFYGwixUH4ajkSpaSvgw4 cvXDO6BhvujtthVwhSvAK1aHXK45Y273LTeyT03FGv4KgTf5y9y2Oa8YzSd9bhpE37q9 Tkeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=dUr79G5q; 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 x64si11298074ede.13.2021.08.02.17.40.33; Mon, 02 Aug 2021 17:40:50 -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=dUr79G5q; 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 95940680836; Tue, 3 Aug 2021 03:40:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44CA7680836 for ; Tue, 3 Aug 2021 03:40:22 +0300 (EEST) Received: by mail-io1-f49.google.com with SMTP id n19so22517425ioz.0 for ; Mon, 02 Aug 2021 17:40:22 -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=hgBqdnGmMmT1D/vbzfLDzn1YUwS6sXHLfK4xeFwfPU4=; b=dUr79G5qfbKmb4KW8ekO9ZD3X0O0BMBmI3OMxJP1ROITjCFbtAzManUT23UXlGWtIQ 6++Dze1+Tsry9ejWhcwXCE4Hn8gOGf91U7KcrfRdqQAMgLxJnkmlhFoa/yuuwLKEKQm+ c7WkyRPdIPHZK1ppZM8NzrP0Fe/JFAWHYR/ax2FRHE1HNmo5kglYfqKZH+j9OHPyrJc2 A7sEobFr0ZwanP5rvGPjnTFNp6nkP4IQHdgswYV3aIOeTDCp8BEtFLGa+W1cYWDQz+yd oujzQRW4FuDR8Tm7WR9yeHoQWruQ/7HkBSFloCEIDOxrANlVdC400EWCu7vnJhZULhGM kfKA== 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=hgBqdnGmMmT1D/vbzfLDzn1YUwS6sXHLfK4xeFwfPU4=; b=EVsiQIYj4xWXApqfxDRe+TMMOsuu0srjZsAH2aPOi2xV8W2fiJHJ8nE8wWxmfRJJ9H 96Tb4yzUsT8S5kG6bgF/MaipJ49YvubRZ+MPmkEOrylf55wbcy6TqURMliwdkl6sve33 sKsjRdoe/dxRo0VTWQ69QKy33jp5xoe7TG/yDIzF8q7zD/ZvjXJsNaud5MwVXkNW3FCa /oOQycTRY0GMj+26R5yX/1+yQB1DulsJe+tIgmJsGiSWbdO88mQBXvUZ6QScUA8IRcqA nHB0Cz0CLfwfw0BFpymie7flet9UuwJfBwO8L5qS6mcQbIZREyqjUhxss2xnxhZLNfN6 LcEA== X-Gm-Message-State: AOAM532kvQxbIxcgX5/scFhWjqKBQmDUwwHiFUkzHPq+3x7pDL6TNVHD 3tZRyJf0i0k2G3zNGm/PdPLMkoUwP2Qgqg== X-Received: by 2002:a65:68c1:: with SMTP id k1mr47332pgt.204.1627949584226; Mon, 02 Aug 2021 17:13:04 -0700 (PDT) Received: from localhost.localdomain ([191.84.227.130]) by smtp.gmail.com with ESMTPSA id e12sm14832545pgv.51.2021.08.02.17.13.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 17:13:03 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 21:12:30 -0300 Message-Id: <20210803001231.2346-2-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210803001231.2346-1-jamrial@gmail.com> References: <20210803001231.2346-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/hevc_sei: parse and export Film Grain Characteristics SEI messages 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: jNNP1nzJR7HX Signed-off-by: James Almer --- libavcodec/hevc_sei.c | 44 ++++++++++++++++++++++++++++++++++ libavcodec/hevc_sei.h | 22 +++++++++++++++++ libavcodec/hevcdec.c | 56 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index e6ae777852..2c326bf1f7 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -395,6 +395,48 @@ static int decode_nal_sei_timecode(HEVCSEITimeCode *s, GetBitContext *gb) return 0; } +static int decode_film_grain_characteristics(HEVCSEIFilmGrainCharacteristics *h, + GetBitContext *gb) +{ + h->present = !get_bits1(gb); // film_grain_characteristics_cancel_flag + + if (h->present) { + memset(h, 0, sizeof(*h)); + h->model_id = get_bits(gb, 2); + h->separate_colour_description_present_flag = get_bits1(gb); + if (h->separate_colour_description_present_flag) { + h->bit_depth_luma = get_bits(gb, 3) + 8; + h->bit_depth_chroma = get_bits(gb, 3) + 8; + h->full_range = get_bits1(gb); + h->color_primaries = get_bits(gb, 8); + h->transfer_characteristics = get_bits(gb, 8); + h->matrix_coeffs = get_bits(gb, 8); + } + h->blending_mode_id = get_bits(gb, 2); + h->log2_scale_factor = get_bits(gb, 4); + for (int c = 0; c < 3; c++) + h->comp_model_present_flag[c] = get_bits1(gb); + for (int c = 0; c < 3; c++) { + if (h->comp_model_present_flag[c]) { + h->num_intensity_intervals[c] = get_bits(gb, 8) + 1; + h->num_model_values[c] = get_bits(gb, 3) + 1; + if (h->num_model_values[c] > 6) + return AVERROR_INVALIDDATA; + for (int i = 0; i < h->num_intensity_intervals[c]; i++) { + h->intensity_interval_lower_bound[c][i] = get_bits(gb, 8); + h->intensity_interval_upper_bound[c][i] = get_bits(gb, 8); + for (int j = 0; j < h->num_model_values[c]; j++) + h->comp_model_value[c][i][j] = get_se_golomb_long(gb); + } + } + } + h->persistence_flag = get_bits1(gb); + + h->present = 1; + } + + return 0; +} static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s, const HEVCParamSets *ps, int type, int size) @@ -422,6 +464,8 @@ static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s, return decode_nal_sei_alternative_transfer(&s->alternative_transfer, gb); case SEI_TYPE_TIME_CODE: return decode_nal_sei_timecode(&s->timecode, gb); + case SEI_TYPE_FILM_GRAIN_CHARACTERISTICS: + return decode_film_grain_characteristics(&s->film_grain_characteristics, gb); default: av_log(logctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", type); skip_bits_long(gb, 8 * size); diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h index 4b6bfddeb9..ac8c61c1f1 100644 --- a/libavcodec/hevc_sei.h +++ b/libavcodec/hevc_sei.h @@ -109,6 +109,27 @@ typedef struct HEVCSEITimeCode { int32_t time_offset_value[3]; } HEVCSEITimeCode; +typedef struct HEVCSEIFilmGrainCharacteristics { + int present; + int model_id; + int separate_colour_description_present_flag; + int bit_depth_luma; + int bit_depth_chroma; + int full_range; + int color_primaries; + int transfer_characteristics; + int matrix_coeffs; + int blending_mode_id; + int log2_scale_factor; + int comp_model_present_flag[3]; + uint16_t num_intensity_intervals[3]; + uint8_t num_model_values[3]; + uint8_t intensity_interval_lower_bound[3][256]; + uint8_t intensity_interval_upper_bound[3][256]; + int16_t comp_model_value[3][256][6]; + int persistence_flag; +} HEVCSEIFilmGrainCharacteristics; + typedef struct HEVCSEI { HEVCSEIPictureHash picture_hash; HEVCSEIFramePacking frame_packing; @@ -122,6 +143,7 @@ typedef struct HEVCSEI { int active_seq_parameter_set_id; HEVCSEIAlternativeTransfer alternative_transfer; HEVCSEITimeCode timecode; + HEVCSEIFilmGrainCharacteristics film_grain_characteristics; } HEVCSEI; struct HEVCParamSets; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 2d35b0b182..eafb883429 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -26,6 +26,7 @@ #include "libavutil/attributes.h" #include "libavutil/common.h" #include "libavutil/display.h" +#include "libavutil/film_grain_params.h" #include "libavutil/internal.h" #include "libavutil/mastering_display_metadata.h" #include "libavutil/md5.h" @@ -2880,6 +2881,61 @@ static int set_side_data(HEVCContext *s) s->sei.timecode.num_clock_ts = 0; } + if (s->sei.film_grain_characteristics.present && + (s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN)) { + HEVCSEIFilmGrainCharacteristics *fgc = &s->sei.film_grain_characteristics; + AVFilmGrainParams *fgp = av_film_grain_params_create_side_data(out); + if (!fgp) + return AVERROR(ENOMEM); + + fgp->type = AV_FILM_GRAIN_PARAMS_H274; + + fgp->codec.h274.model_id = fgc->model_id; + if (fgc->separate_colour_description_present_flag) { + fgp->codec.h274.bit_depth_luma = fgc->bit_depth_luma; + fgp->codec.h274.bit_depth_chroma = fgc->bit_depth_chroma; + fgp->codec.h274.color_range = fgc->full_range + 1; + fgp->codec.h274.color_primaries = fgc->color_primaries; + fgp->codec.h274.color_trc = fgc->transfer_characteristics; + fgp->codec.h274.color_space = fgc->matrix_coeffs; + } else { + const HEVCSPS *sps = s->ps.sps; + const VUI *vui = &sps->vui; + fgp->codec.h274.bit_depth_luma = sps->bit_depth; + fgp->codec.h274.bit_depth_chroma = sps->bit_depth_chroma; + if (vui->video_signal_type_present_flag) + fgp->codec.h274.color_range = vui->video_full_range_flag + 1; + else + fgp->codec.h274.color_range = AVCOL_RANGE_UNSPECIFIED; + if (vui->colour_description_present_flag) { + fgp->codec.h274.color_primaries = vui->colour_primaries; + fgp->codec.h274.color_trc = vui->transfer_characteristic; + fgp->codec.h274.color_space = vui->matrix_coeffs; + } else { + fgp->codec.h274.color_primaries = AVCOL_PRI_UNSPECIFIED; + fgp->codec.h274.color_trc = AVCOL_TRC_UNSPECIFIED; + fgp->codec.h274.color_space = AVCOL_SPC_UNSPECIFIED; + } + } + fgp->codec.h274.blending_mode_id = fgc->blending_mode_id; + fgp->codec.h274.log2_scale_factor = fgc->log2_scale_factor; + + memcpy(&fgp->codec.h274.component_model_present, &fgc->comp_model_present_flag, + sizeof(fgp->codec.h274.component_model_present)); + memcpy(&fgp->codec.h274.num_intensity_intervals, &fgc->num_intensity_intervals, + sizeof(fgp->codec.h274.num_intensity_intervals)); + memcpy(&fgp->codec.h274.num_model_values, &fgc->num_model_values, + sizeof(fgp->codec.h274.num_model_values)); + memcpy(&fgp->codec.h274.intensity_interval_lower_bound, &fgc->intensity_interval_lower_bound, + sizeof(fgp->codec.h274.intensity_interval_lower_bound)); + memcpy(&fgp->codec.h274.intensity_interval_upper_bound, &fgc->intensity_interval_upper_bound, + sizeof(fgp->codec.h274.intensity_interval_upper_bound)); + memcpy(&fgp->codec.h274.comp_model_value, &fgc->comp_model_value, + sizeof(fgp->codec.h274.comp_model_value)); + + fgc->present = fgc->persistence_flag; + } + if (s->sei.dynamic_hdr_plus.info) { AVBufferRef *info_ref = av_buffer_ref(s->sei.dynamic_hdr_plus.info); if (!info_ref) From patchwork Tue Aug 3 00:12:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29210 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2043871ioh; Mon, 2 Aug 2021 18:10:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXj9JKbUJLLSy3zYDiKKyzP7tIYFDkc3RGh1gdC+G/oup40vK5lgGGPUAXdveSEDvLvExo X-Received: by 2002:aa7:c2c8:: with SMTP id m8mr22616671edp.50.1627953042279; Mon, 02 Aug 2021 18:10:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627953042; cv=none; d=google.com; s=arc-20160816; b=ifwNMXiCRM1T2KrBlMJAX3ohlAGMMHiTnhbU6b0jUxIxEPBZb/tLUysWwycOycFvln G9UHejJD4q0cgtc8IIhvOhgNO1yyXm541nn26oOvVEMZfpYDMVG6SzYloW3yAmo0j5Jo kJegyydy1jsKZiCgeEfvsbRxL/c91pWLH8zJ+AL6fJtC0mhT+qgae7FJDewM7DsZxXMG k+ie4KsBqoDFWFD2YR+F2lW6Dh0bjhG4ZfdwHP1JxK4MhTrlqHjFf1kwiRdn2oxwNtcW 3tKnzDmKSqtBmU2HG54Q9W5WmBR7zen3wNLW/XsUcMlOE0ll7zg6Xp2GFjWaWkkPYEYB /cKg== 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=pjxmHt759rfW3OI4YdXJSdEpPfCAyFtvGunQCU5ZOTM=; b=peAN1PAzsi1VMLiqxGA+rAsQXJ+0ek4YOE8z1zlk3kuYBauIKUy7CN0jdE3FAYg+/a kzYXxyIAE4Xle92vKu9307ujyZNdco6gDOw//9i4qOwIgOeqWU1GP/Q2OjElaXN2AgsX KaaF3iPl6WRyUmfxPmgF9/qWJNCjO8l6LN2kASKqqfsTmEstcUovHni1FiyAeIGVDk45 Gd/EblkQSzZ0vFymdS2ibLqqHweeImqmdOxdy7FkxVywd6YRm5v6tTHpp1UJi7aPBuod c5f0W8jR7zEHOxmUqMk5uMVf4A/CZCfp9+7SfZatdOET4UVy3kxP67Sy89EWoRdSyfha Ugiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QkgQDfMk; 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 i14si14012836eje.573.2021.08.02.18.10.41; Mon, 02 Aug 2021 18:10:42 -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=QkgQDfMk; 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 E7666688178; Tue, 3 Aug 2021 04:10:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 753526804F4 for ; Tue, 3 Aug 2021 04:10:31 +0300 (EEST) Received: by mail-qv1-f50.google.com with SMTP id em4so5004556qvb.0 for ; Mon, 02 Aug 2021 18:10:31 -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=8WD/s5Gb5C/uzL24YIpSUzRFSktQsMNX+uMXrc09x+I=; b=QkgQDfMkU23CxIL1E+tkFQfjt5vefmAZJGLLwjDt3Ua2zcxnoqXEgLTrr/NqhhE/GB PxhfcYUgJEJ2GZNLJtuBknCovyNSZPRj3s7Mo3eBt841Gm8GQHxw/pmkX4JVyO6qMisj xe+h5Jkiy+vqW7hJu6iPUvugy2MNWxUsaejGwPunMepf+T2bq3KQLryHaVfg/M+ljlpL 73o9D9QBB63E4II0evtBO8LmhH9+oHKaot8MQAyYFmjQGumgJ0kxOk/URG3hgyv93+tA NogjBiWm3Pn3Lv929cvIIlKc1j6a6HnJOt95ot8vGRM7zzAqyUFyYFQHcUW7T4AyE6vW rVLQ== 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=8WD/s5Gb5C/uzL24YIpSUzRFSktQsMNX+uMXrc09x+I=; b=Ir24NA51fOUGoNi+0N30aRCrL982lpvlnjd/n5j1ropSDcw2sa4o7+F2vmp7LCh+an df4IdA7NEd87dETMMp2OIbvFEmb6LsnxOOlVwP/zroqIqwi32LaKHvFZU9XgFgFmDa9C HZ1ImOkf0dHCppE7ziGNv+guLSw9Ml/G0xVSW/8k1xEnts5G2Q1l7Q5PoNyJ2z9GrJgU dke8qkwkleguTusDmHcksqL8uEPNyrM++ZeFDOs41tfdritP5q1rYLqjtOFG3wFIyaEK LycQ9bKPzgaIi8V5y9Trt4Yjkh49tMgaAXBVfhyBh8AtoZ9Y4hH6UgXCF6ber7g+ztac Yv8A== X-Gm-Message-State: AOAM532TEmbzYfoZM+pecyvW0reMhg7xjnAAdOPib6IRgkwH3EiNFSvX eWi/EkMzJzNm9BC35dKHvpWuW2MAqD3lCA== X-Received: by 2002:a17:902:8c83:b029:11b:3f49:f88c with SMTP id t3-20020a1709028c83b029011b3f49f88cmr3348715plo.63.1627949585602; Mon, 02 Aug 2021 17:13:05 -0700 (PDT) Received: from localhost.localdomain ([191.84.227.130]) by smtp.gmail.com with ESMTPSA id e12sm14832545pgv.51.2021.08.02.17.13.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 17:13:05 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 21:12:31 -0300 Message-Id: <20210803001231.2346-3-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210803001231.2346-1-jamrial@gmail.com> References: <20210803001231.2346-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avfilter/vf_showinfo: add support for H.274 Film Grain Characteristics frame side data 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: KC9G+87am73Y Signed-off-by: James Almer --- libavfilter/vf_showinfo.c | 70 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 5e1c4dc2e3..2d1748bd0b 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -29,6 +29,7 @@ #include "libavutil/display.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" +#include "libavutil/film_grain_params.h" #include "libavutil/hdr_dynamic_metadata.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" @@ -361,6 +362,72 @@ static void dump_sei_unregistered_metadata(AVFilterContext *ctx, const AVFrameSi av_log(ctx, AV_LOG_INFO, "\n"); } +static void dump_sei_film_grain_params_metadata(AVFilterContext *ctx, const AVFrameSideData *sd) +{ + const AVFilmGrainParams *fgp = (const AVFilmGrainParams *)sd->data; + const char *const film_grain_type_names[] = { + [AV_FILM_GRAIN_PARAMS_NONE] = "none", + [AV_FILM_GRAIN_PARAMS_AV1] = "av1", + [AV_FILM_GRAIN_PARAMS_H274] = "h274", + }; + + if (fgp->type >= FF_ARRAY_ELEMS(film_grain_type_names)) { + av_log(ctx, AV_LOG_ERROR, "invalid data\n"); + return; + } + + av_log(ctx, AV_LOG_INFO, "film grain parameters: type %s; ", film_grain_type_names[fgp->type]); + av_log(ctx, AV_LOG_INFO, "seed=%"PRIu64"; ", fgp->seed); + + switch (fgp->type) { + case AV_FILM_GRAIN_PARAMS_NONE: + case AV_FILM_GRAIN_PARAMS_AV1: + return; + case AV_FILM_GRAIN_PARAMS_H274: { + const AVFilmGrainH274Params *h274 = &fgp->codec.h274; + const char *color_range_str = av_color_range_name(h274->color_range); + const char *color_primaries_str = av_color_primaries_name(h274->color_primaries); + const char *color_trc_str = av_color_transfer_name(h274->color_trc); + const char *colorspace_str = av_color_space_name(h274->color_space); + + av_log(ctx, AV_LOG_INFO, "model_id=%d; ", h274->model_id); + av_log(ctx, AV_LOG_INFO, "bit_depth_luma=%d; ", h274->bit_depth_luma); + av_log(ctx, AV_LOG_INFO, "bit_depth_chroma=%d; ", h274->bit_depth_chroma); + av_log(ctx, AV_LOG_INFO, "color_range=%s; ", color_range_str ? color_range_str : "unknown"); + av_log(ctx, AV_LOG_INFO, "color_primaries=%s; ", color_primaries_str ? color_primaries_str : "unknown"); + av_log(ctx, AV_LOG_INFO, "color_trc=%s; ", color_trc_str ? color_trc_str : "unknown"); + av_log(ctx, AV_LOG_INFO, "color_space=%s; ", colorspace_str ? colorspace_str : "unknown"); + av_log(ctx, AV_LOG_INFO, "blending_mode_id=%d; ", h274->blending_mode_id); + av_log(ctx, AV_LOG_INFO, "log2_scale_factor=%d; ", h274->log2_scale_factor); + + for (int c = 0; c < 3; c++) + if (h274->component_model_present[c] && (h274->num_model_values[c] > 6 || + h274->num_intensity_intervals[c] < 1 || + h274->num_intensity_intervals[c] > 256)) { + av_log(ctx, AV_LOG_ERROR, "invalid data\n"); + return; + } + + for (int c = 0; c < 3; c++) { + if (h274->component_model_present[c]) { + av_log(ctx, AV_LOG_INFO, "num_intensity_intervals[%d]=%u; ", c, h274->num_intensity_intervals[c]); + av_log(ctx, AV_LOG_INFO, "num_model_values[%d]=%u; ", c, h274->num_model_values[c]); + for (int i = 0; i < h274->num_intensity_intervals[c]; i++) { + av_log(ctx, AV_LOG_INFO, "intensity_interval_lower_bound[%d][%d]=%u; ", + c, i, h274->intensity_interval_lower_bound[c][i]); + av_log(ctx, AV_LOG_INFO, "intensity_interval_upper_bound[%d][%d]=%u; ", + c, i, h274->intensity_interval_upper_bound[c][i]); + for (int j = 0; j < h274->num_model_values[c]; j++) + av_log(ctx, AV_LOG_INFO, "comp_model_value[%d][%d][%d]=%d; ", + c, i, j, h274->comp_model_value[c][i][j]); + } + } + } + break; + } + } +} + static void dump_color_property(AVFilterContext *ctx, AVFrame *frame) { const char *color_range_str = av_color_range_name(frame->color_range); @@ -546,6 +613,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) case AV_FRAME_DATA_SEI_UNREGISTERED: dump_sei_unregistered_metadata(ctx, sd); break; + case AV_FRAME_DATA_FILM_GRAIN_PARAMS: + dump_sei_film_grain_params_metadata(ctx, sd); + break; default: av_log(ctx, AV_LOG_WARNING, "unknown side data type %d " "(%"SIZE_SPECIFIER" bytes)\n", sd->type, sd->size);