From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5E1B34A050 for ; Mon, 18 Mar 2024 16:58:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 625FB68D37C; Mon, 18 Mar 2024 18:57:12 +0200 (EET) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0564368D336 for ; Mon, 18 Mar 2024 18:57:03 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1710781018; bh=KRxb7r85lmHnEi1FUaWwGWH0qDY323ZcsDYgRAitQNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aOH/wUhpnS3FsQdOcTpNWEOWNYCkBN3Kb4is+Hpy6U5Aqzs54qjHkmRB/Jg5QWKMH NaCrVJZBc/Rf86TV7FqXc49OZKVtBRkN9CCCPrxms5Q1112pxtdERFyKZ+HvrH/1ye XKV57I8gji4cr0+p5Be0hVH/BOn1MgH3L0mBcvRc= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 160FD43504; Mon, 18 Mar 2024 17:56:58 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 17:54:13 +0100 Message-ID: <20240318165651.75520-6-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318165651.75520-1-ffmpeg@haasn.xyz> References: <20240318165651.75520-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 05/13] avcodec/h2645_sei: signal new AVFilmGrainParams members 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 Cc: Niklas Haas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Niklas Haas H.274 specifies that film grain parameters are signalled as intended for 4:4:4 frames, so we always signal this, regardless of the frame's actual subsampling. --- libavcodec/h2645_sei.c | 46 +++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index e60606f43f9..73f894436fd 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -641,35 +641,45 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, h274 = &fgp->codec.h274; fgp->seed = seed; + fgp->width = frame->width; + fgp->height = frame->height; + + /* H.274 mandates film grain be applied to 4:4:4 frames */ + fgp->subsampling_x = fgp->subsampling_y = 0; h274->model_id = fgc->model_id; if (fgc->separate_colour_description_present_flag) { - h274->bit_depth_luma = fgc->bit_depth_luma; - h274->bit_depth_chroma = fgc->bit_depth_chroma; - h274->color_range = fgc->full_range + 1; - h274->color_primaries = fgc->color_primaries; - h274->color_trc = fgc->transfer_characteristics; - h274->color_space = fgc->matrix_coeffs; + fgp->bit_depth_luma = fgc->bit_depth_luma; + fgp->bit_depth_chroma = fgc->bit_depth_chroma; + fgp->color_range = fgc->full_range + 1; + fgp->color_primaries = fgc->color_primaries; + fgp->color_trc = fgc->transfer_characteristics; + fgp->color_space = fgc->matrix_coeffs; } else { - h274->bit_depth_luma = bit_depth_luma; - h274->bit_depth_chroma = bit_depth_chroma; + fgp->bit_depth_luma = bit_depth_luma; + fgp->bit_depth_chroma = bit_depth_chroma; if (vui->video_signal_type_present_flag) - h274->color_range = vui->video_full_range_flag + 1; - else - h274->color_range = AVCOL_RANGE_UNSPECIFIED; + fgp->color_range = vui->video_full_range_flag + 1; if (vui->colour_description_present_flag) { - h274->color_primaries = vui->colour_primaries; - h274->color_trc = vui->transfer_characteristics; - h274->color_space = vui->matrix_coeffs; - } else { - h274->color_primaries = AVCOL_PRI_UNSPECIFIED; - h274->color_trc = AVCOL_TRC_UNSPECIFIED; - h274->color_space = AVCOL_SPC_UNSPECIFIED; + fgp->color_primaries = vui->colour_primaries; + fgp->color_trc = vui->transfer_characteristics; + fgp->color_space = vui->matrix_coeffs; } } h274->blending_mode_id = fgc->blending_mode_id; h274->log2_scale_factor = fgc->log2_scale_factor; +#if FF_API_H274_FILM_GRAIN_VCS +FF_DISABLE_DEPRECATION_WARNINGS + h274->bit_depth_luma = fgp->bit_depth_luma; + h274->bit_depth_chroma = fgp->bit_depth_chroma; + h274->color_range = fgp->color_range; + h274->color_primaries = fgp->color_primaries; + h274->color_trc = fgp->color_trc; + h274->color_space = fgp->color_space; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + memcpy(&h274->component_model_present, &fgc->comp_model_present_flag, sizeof(h274->component_model_present)); memcpy(&h274->num_intensity_intervals, &fgc->num_intensity_intervals, -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".