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)