From patchwork Thu Jul 22 13:44:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29015 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp536126ios; Thu, 22 Jul 2021 06:54:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXMLMAp75q6phk+FlcAHqrdK9q8qvxvIWAz6ard7ZShzvtteMHv1iUOBDqf+rsXua6nOlg X-Received: by 2002:a17:906:24c3:: with SMTP id f3mr10829ejb.145.1626962055996; Thu, 22 Jul 2021 06:54:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626962055; cv=none; d=google.com; s=arc-20160816; b=rrLBqkYI3hLSJNfhaCyo8cWgRY6NnbquuPLiNhd9zBrsoHLN2+/ojIzouTlrcoYPnj 8q0nNuTGJ+50wu84evXqfnkIbGzS2BuHU7ZH05EYcg30Z7pGDZnuUCtOXsHNUjQDZHTG ZB9VbXVWOU978ADc3DSQiGQzxakbNGkVyvxz0QlV4UYBxvikhmeQfCPhEXb2QOsVYmlI 4YWgLxbOwsZjk1OSJTblcPaUM5EzBTjXYGfXPBsnfuKxY9FVcF3/ALkjftGDpraFghgq ia258uL5MFY2TS90hOwtD7jpUFGYGIsrApD5AXzGrcY21OXMwM386+F/cx/p1wi7Qi9A zGNw== 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=qjeSlv8D/MwNuMXKO6ON82wObf4imEk1W7wy0LhNE9U=; b=vRCDMc3o2E7j5S25XXCI5J9qcUb7txPcOxELliaO6YxDnIlOo5LF3tuu2hzzYxy1yu 86+X/Q89k2MvZS+B2SWyLWg5HTJ1ZgC7W6uKiEiZQPzcmPOH8KwCFngzvcGlX2URSEd+ oUcaNxaAY/hvLE3C9/LAqZFiBjH7GjxS6b5olNSJVSUE+lfRwk/qmsKJJYdpin3G4RMw 7pLiw8KNQgpuU7jdXIb+4bcGRsDBKWDKvqcMPXOzDY+DfODXuYqZ0jNYYU3fteg45gr8 YoTsxVBPCdDl3vSDgNXr7MRxnUs2QyVZSN6yJk+irpftdvfuLK0BiNFRFQ1rkuGAh0sH KJWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=g0Qnt++j; 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 x41si20323912edy.592.2021.07.22.06.54.13; Thu, 22 Jul 2021 06:54:15 -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=g0Qnt++j; 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 1859568A808; Thu, 22 Jul 2021 16:54:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f51.google.com (mail-vs1-f51.google.com [209.85.217.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A11A689DD9 for ; Thu, 22 Jul 2021 16:54:03 +0300 (EEST) Received: by mail-vs1-f51.google.com with SMTP id r25so3354161vsk.2 for ; Thu, 22 Jul 2021 06:54:03 -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=+btBDUsgTfqYKNRcw5kd0zkcmFr8x4XrUZQGm34sIwI=; b=g0Qnt++jfdzOAJo3D0s9grmtCyVtqkdKJ/rdwLvI0DW9KGXMpLR/MvIZCzzhB7mtAH 7pJbdOVzVYuMokA78zlyjfH/hKUWKgod0Xsj9rl7c4LwOxF7IypaBIm0X8tGH3FFoWOx kKzNCDv+u0jeC4Fgm+ip0CJBUbZSUHoIu8/wE+f19mCYVdtuzwbrV9ceHx/adgTm/aCx LN/X4HbxIHPTaDKK0om7vcSdM6B8PF6ZQvNsLJ98D1WIUqUjHeo6BIyagS0wpN3fM6Vf ZE9zNAFlM3vWxt7k/gGF1t44RYU6WYmZ9LlAo2vhbXiA7rkcW7bx05d71TCIQH+H67/V mGSA== 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=+btBDUsgTfqYKNRcw5kd0zkcmFr8x4XrUZQGm34sIwI=; b=VLlZsqPdxcafAU1QGBGswGyWGEqhNbrC2910sqdcCMFhupQdHgClHIy/vLGGa9OaEs 8MxgQMd8I+xO2b/PJ2pzBNYvu68zJLwE0eW1zW7Fry9WINXf9QA9yB1SUmp9MXpVJHxM og90/pRsXm7WnnG0LpqgtHI66xVr5qiIQt+QA4fl8ldjbKl7BnTlZygkIL0So+07DVkz srpPlhStQfMwyukTayz+WCDB5aURtQT1kITV+SjI2lMQHyjwTNPPg3WyAhC/4ypuOXAv xtjrm4EXqzc+ir2dmZXJ5rTzuaKdcQI/KI9baHN1G2IzKUSG02BN5X0nnls4oAyZm9G9 V51A== X-Gm-Message-State: AOAM5331+s8YnTZRWWyAJ2h2bZhpvX1B4fBZYi5xmEngI4EE7JXyBbBZ QYtVSr1eXTZNWY0A0QLTAMQCKadst3A= X-Received: by 2002:a05:6a00:2306:b029:331:ebe8:a4b4 with SMTP id h6-20020a056a002306b0290331ebe8a4b4mr40947586pfh.15.1626961541191; Thu, 22 Jul 2021 06:45:41 -0700 (PDT) Received: from localhost.localdomain ([191.83.217.217]) by smtp.gmail.com with ESMTPSA id b2sm33870136pgh.9.2021.07.22.06.45.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 06:45:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Jul 2021 10:44:55 -0300 Message-Id: <20210722134455.192-3-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 3/3] avcodec/h264_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: Q4P8Qt+61hdZ Signed-off-by: James Almer --- libavcodec/h264_sei.c | 47 +++++++++++++++++++++++++++++++++++ libavcodec/h264_sei.h | 22 +++++++++++++++++ libavcodec/h264_slice.c | 54 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+) diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index ca2ca59e1f..ad7c27f9f6 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -49,6 +49,7 @@ void ff_h264_sei_uninit(H264SEIContext *h) h->picture_timing.present = 0; h->buffering_period.present = 0; h->frame_packing.present = 0; + h->film_grain_characteristics.present = 0; h->display_orientation.present = 0; h->afd.present = 0; @@ -410,6 +411,49 @@ static int decode_alternative_transfer(H264SEIAlternativeTransfer *h, return 0; } +static int decode_film_grain_characteristics(H264SEIFilmGrainCharacteristics *h, + GetBitContext *gb) +{ + int film_grain_characteristics_cancel_flag = get_bits1(gb); + + if (!film_grain_characteristics_cancel_flag) { + memset(h, 0, sizeof(*h)); + h->model_id = get_bits(gb, 8); + 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->repetition_period = get_ue_golomb_long(gb); + + h->present = 1; + } + + return 0; +} + int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb, const H264ParamSets *ps, void *logctx) { @@ -471,6 +515,9 @@ int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb, case SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS: ret = decode_alternative_transfer(&h->alternative_transfer, &gb_payload); break; + case SEI_TYPE_FILM_GRAIN_CHARACTERISTICS: + ret = decode_film_grain_characteristics(&h->film_grain_characteristics, &gb_payload); + break; default: av_log(logctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type); } diff --git a/libavcodec/h264_sei.h b/libavcodec/h264_sei.h index 14cc559361..f9166b45df 100644 --- a/libavcodec/h264_sei.h +++ b/libavcodec/h264_sei.h @@ -165,6 +165,27 @@ typedef struct H264SEIAlternativeTransfer { int preferred_transfer_characteristics; } H264SEIAlternativeTransfer; +typedef struct H264SEIFilmGrainCharacteristics { + 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 repetition_period; +} H264SEIFilmGrainCharacteristics; + typedef struct H264SEIContext { H264SEIPictureTiming picture_timing; H264SEIAFD afd; @@ -176,6 +197,7 @@ typedef struct H264SEIContext { H264SEIDisplayOrientation display_orientation; H264SEIGreenMetaData green_metadata; H264SEIAlternativeTransfer alternative_transfer; + H264SEIFilmGrainCharacteristics film_grain_characteristics; } H264SEIContext; struct H264ParamSets; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 9c2301d7e0..0b0b779409 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -28,6 +28,7 @@ #include "libavutil/avassert.h" #include "libavutil/display.h" #include "libavutil/imgutils.h" +#include "libavutil/film_grain_params.h" #include "libavutil/stereo3d.h" #include "internal.h" #include "cabac.h" @@ -1330,6 +1331,59 @@ static int h264_export_frame_props(H264Context *h) } h->sei.unregistered.nb_buf_ref = 0; + if (h->sei.film_grain_characteristics.present && + (h->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN)) { + H264SEIFilmGrainCharacteristics *fgc = &h->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 { + fgp->codec.h274.bit_depth_luma = sps->bit_depth_luma; + fgp->codec.h274.bit_depth_chroma = sps->bit_depth_chroma; + if (sps->video_signal_type_present_flag) + fgp->codec.h274.color_range = sps->full_range + 1; + else + fgp->codec.h274.color_range = AVCOL_RANGE_UNSPECIFIED; + if (sps->colour_description_present_flag) { + fgp->codec.h274.color_primaries = sps->color_primaries; + fgp->codec.h274.color_trc = sps->color_trc; + fgp->codec.h274.color_space = sps->colorspace; + } 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->repetition_period; + } + if (h->sei.picture_timing.timecode_cnt > 0) { uint32_t *tc_sd; char tcbuf[AV_TIMECODE_STR_SIZE];