From patchwork Sat Jul 2 22:22:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36615 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1884496pzh; Sat, 2 Jul 2022 15:25:11 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s3HP5fdD/MvXuTNin7agegoNlYito6070TaGP7+mEXJp7RhRnI5nve852MX4VMA9XQYRYn X-Received: by 2002:a05:6402:240a:b0:437:d2b6:3dde with SMTP id t10-20020a056402240a00b00437d2b63ddemr28020829eda.62.1656800710871; Sat, 02 Jul 2022 15:25:10 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ga30-20020a1709070c1e00b00726bdd2bbc7si5101035ejc.1005.2022.07.02.15.25.10; Sat, 02 Jul 2022 15:25:10 -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=@outlook.com header.s=selector1 header.b=VDbjJ1qT; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F12768B9C8; Sun, 3 Jul 2022 01:22:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068054.outbound.protection.outlook.com [40.92.68.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE97B68B993 for ; Sun, 3 Jul 2022 01:22:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=knPOuI4K4F//WkAZ4V3oLDupm17h5K4hiWgIGSO7QHBLb6zM65fF1qWp/STnwixvd1udJ1VMMQsjxSzNvzHETuiHMfIEZKS+q5TGNZwjuUmjRaoalq0Q36eJfXcCTBYEEovSZUXAX/FcyJV61txluUAubEslGZiPrUD1B9V947BOwzs0p+UiLoZaGtnSYo26ykEDxZluiFyeQrIre74nYLBUqL0eZAKzUP6Ujv4IjNc9aw4HtnLS2C3r8fInN1TGY+kL29XL5l7ptsdSbdb0KYVZZ2P++yNMRnOTcZYWx5Ep8nlng2mu7FsPKisCWxsJ9nN6pbrXH+vSh4a/fH77TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hlXyeKgbR+wtdZR22/mY0dkcxkMIcDkQvAtMsHfNMvQ=; b=N0SjnEhknhSjhFGjvuvkm6+zORw0nWyFHP458EkcFtN5PmpivMwuT452HXiZIHNc2q+dJxCBNpuSZR4gj2kVj3fxUX7N62VDjA+Yw3mrwklTff4dxhIoC0Qx6oumYmq+0lSR78VN4YQcWd1m3RrXfi3JPpJJB3Phd9+dGzrDSSfo29SefiiV8m98PTL8a26MaF2Tew42uPZk78dPy0GlM4pkSbZOK9f9MR5KPZerO9oTnaUZ8t3AD5/3may07UZ200wlr9QqpRMZbtExM9e81NuwpKCOWwDKyIZ5j4Qwnh08yv4DsRrPHlTj4ymM1KIVKUqpGGYL1CKoW8VhkYriLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hlXyeKgbR+wtdZR22/mY0dkcxkMIcDkQvAtMsHfNMvQ=; b=VDbjJ1qT8wISEIEYqTLGy//zk/EjplnV6gp/VKghQ1fwmcXaqtCCZyH1ZwwwtJr+E1aZ0kmpOtdznf6pjzwBzLgVHFc7Obvo4HubS2nljdyhFq+v+f1b4ZR6Q7wpazGBFR0Z6S8PIfTWiRxnnFUpfpmAFWM17Er2Ufnvg8fJOJgFnZ3/7Qc7M4F82pcqVq0XJ9I/oFcvkiV0MISdsLnIpDFKPxKlpET4FKB5WyDTV2rjpd53G/7WA8SWGBsDwrweYa6BizFIRtlsrkZhWsmZSyyKeVVHtlAvT06QhXNRPL1DB5O0Be1+LcVKnPDTki9c8QKfjH4B9AFiWOr1DZ1B0w== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB8PR01MB5948.eurprd01.prod.exchangelabs.com (2603:10a6:10:e4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.17; Sat, 2 Jul 2022 22:22:41 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5395.018; Sat, 2 Jul 2022 22:22:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Jul 2022 00:22:00 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [f2py9n9dsl4Id+LHNI57MWkKTJed0CUZ] X-ClientProxiedBy: FR3P281CA0089.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::18) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220702222200.169681-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59bf02e4-0b6f-4a28-3afc-08da5c7960e5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXwBRntoGkOsgo00FNZK4OlUD7qpUkPvtQLUu/LrdGZ9xUDt3nlg8NPLB86CarAvXR3AjAJPSzR+pfdru9nVI9/uT1BvCgnRB7Z5CHoXKrSiA7SovtDlFlSyJpqpE+OFqABzqqtaxksWKFpI17bkUCK/iZWBu1D9BcM8N4SHIA3k+kv7w1D0mCFsbh3Ib7RGTTyFaLLfAAjRxg2D8OLet0lK8B2zSO44IjeNJfGdW/s+Mu0+LalOiPZhrZrcZaIv3+mQJhVS/vMIleLmBcCrBDe/o35Tkd+6uYvGtKPyGcTDdgPmilvwk+YN2iIW2nGhUX/RnVpuEUPLpawBYH4fdHNAGtQz9ifiGZCfEdqY6b1riO9zO9JW7AV38ilY0HzVyh0xwtd/5GhIIZbp1cKFSD8UwW72rmsvSlTJ6GfzeeqHnzcQzF6xYCpvRsPSOXcn7YyFEwgVbdSInryiR9RTN++ez1inh8fbwKIqE08Y4LJ6hX0pVJZ+xb80tHmAT6dMWFMDtFZbnovFHHMqhsTK0/Io9suzMV7Oie8TxgXHL7MXtv6p3fZ/tbBd8O/sRCnPLrJOYekWxvh4HEELsvJtfma6y72dApxgBtZglDxR95JZBgz/nj828vI/d2kG3NsD4TnduPKOhDTVnYgtl1HnJKIdVb3PgdSULHUGdecyiuiRT6D1E9o4WBDDpkGjQdtsAF4cfoVtpLd54gMoxd9LDvY5D44He0QmAw= X-MS-TrafficTypeDiagnostic: DB8PR01MB5948:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ITY6n6nXT2cHyVdIQEuYdDhEjFOOzltU1acZ5S941j7mUKOMRjPxse2d9spP57/GGvbzY0SIy7y2TaT4NFPMh5t1zfdt6VTgxpGhl9juGbFpua3Ip+pSgxy/mfBKL1amSHsy/G7oaZEmeH7g6YZFmkthZv7Z5p0JhGRaKSn/Dmr5x9v9/g5w0bxHg+1nEjPQM9MwNROlYQk/p7YIFb+mgqQarw2xo2OURO+mZARPRWi8VEqDrbXchF8mvtj1JG8VJqmiqEuo3+LIIg56TRHn5tgW8MO840005r+UP/k6KBWx9NhGbFfMwliEz0Fe1vcV0WOsqfzMN4+8zl0fGcq7LQBzOMVqnN1nJIehB0f8k5xgGqGYL8YHvbSnwndKE/c32EolaZdJN8ahSep9Yu3XBMMeEns1AK+75ppssQGQC5cWPaNCnjKCPx2SwPaWnRh1OKK8GU4xicblzLabotAwWvY4eGbXRVv0Ny/7mtcsT7Xb0JHb0LlMsY2Z47NgmJHwjymdlHEQ4B54rgl9sZJYcCS278m1AjFL57bHGGbppyNU9sUPln1fGNBlfvr+H+LtCw7vrReiSjLEdZkban+sl5ViP7NmE5hXX32tNNvky14mnIfdkRGKMj/IcGA9AbmVBPEPqkNd+ex0fBc6GrAYFw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AljOBgwg9PI2RsgVxQeS/309QhX68RDCwgK/Sqmfyw8MdQemRosQ/yCnzNanY7FuDdHRoobTS1K9A9PQe52rrHjoa5fxsIESRsf5hTJ+H7lYAuE5VYyYAGHnMh7+Of0emWPcXbZsGq80J3mPSRsfgAP0PxkRflIWz4ynczWeTbgOwWUpl/u+dq/CuACAtfFXDawT8ZsDHNxKiYulbIGNKqvWYJuqVMrS3WTHiB4VjpuXZNlI38jtikDZ9NlZWuZT313iZLvcpvzs84CSCRvHW2NUgHwZ8WwM9UnLAp4ReJghAxIqsxjT2QSw2JjKyrj1/abOIHO+ttRQFfzjEwXgHIFv31DwaeIg1RCvtQ/RUFbzTGjjBAPXzmm6QEr+a2UXhkEYUvbK6Rb6eFN3PpyVM7J5IiFID8Pv5wXv7H4GR6BBHuA7BHGbKpVdfRMmkudgyHWwIWH0FgR9D7uElXAcZATKoFhfELYbJjMb6IJ0noR56d8noMJbZe1roLv3IRa17wT+d94bGJim7549dsAZdwvuTFtvgm3+w5skdrsDJLWHLEsRtq71utzpqNAuDdgSng+XY3PQWriZcZvwSMDHPx/dl6fSHxPrRdS8bcXAp7gSKU9/AUF+YpIvyOKRGEU8xCcnskjx3+F/lQ13iw5RakTz8NI8Qj0uIcqWytvldYTI9R6dTUY6PT7SYM2MOTMAznEAt/VxV4rLZbRRj/AS66xiaJEm9yAOx87DR1tdUaDKTvChTYtINnNoF2gPX6oj8abC2qTGj/3QAlSvbMYTaEhBrpAx6z51CyWbXpCw1RRU/2vg/paUTAxwbVvqem5mFIXxW2BX5dYKL+ta/XnCGYpMWjQpdivraDVGyNREUIOVI4T0kdQQyNNhYG32Nmyv+Wj7+3QX3WMwM/AZDjePlO13Wh3xB+nCkox0eOrAuTe5rg1eEBw4VwbOZkbyy+uE/Jwhzi2LI6AIKq2z1Kjqub2+06h1sC9BLNMKbKXO5+Td1+8UJE45P/7IX2hQGl8wEeTvRsBjHLW676F/R+/j0FqikTcZ1cE94a16ML3ZhshGv9U0HRafpJ87QGowy2YToukYHC248QTDH/hK+n84TCOS932hTGVqv/ancqurQYbv5QkbuSGkTFKVNRvf8o/jwAN1HNhTMU7pFkqgF66TK70MXilH2LrdkUTVfiWhUrlBg9O/6yMWyiNUlHL4CYo00AwhrsILJQfGbIaEsalWgYCzF+KzPcEhdHDMyOJJKfUXlqCQZB6VszqV9jZwbqS4brTP/Yxsq7fKNgGIiumAl7QwePw1jBgBBvCQ28NKLOo= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59bf02e4-0b6f-4a28-3afc-08da5c7960e5 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2022 22:22:41.5788 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR01MB5948 Subject: [FFmpeg-devel] [PATCH 20/20] avcodec/h2645_sei: Factor attaching film grain side-data to frame out 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lMZZvK+DOW7J This unfortunately involved adding some parameters to ff_h2645_sei_to_frame() that will be mostly unused. Signed-off-by: Andreas Rheinhardt --- libavcodec/h2645_sei.c | 67 ++++++++++++++++++++++++++++++++++++++++- libavcodec/h2645_sei.h | 5 ++- libavcodec/h264_slice.c | 59 ++---------------------------------- libavcodec/hevcdec.c | 60 +++--------------------------------- 4 files changed, 77 insertions(+), 114 deletions(-) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index 1793c07285..72b976f92e 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -429,7 +429,9 @@ static int is_frame_packing_type_valid(SEIFpaType type, enum AVCodecID codec_id) int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, enum AVCodecID codec_id, - AVCodecContext *avctx) + AVCodecContext *avctx, const H2645VUI *vui, + unsigned bit_depth_luma, unsigned bit_depth_chroma, + int seed) { H2645SEIFramePacking *fp = &sei->frame_packing; @@ -544,6 +546,69 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, } } + if (sei->film_grain_characteristics.present) { + H2645SEIFilmGrainCharacteristics *fgc = &sei->film_grain_characteristics; + AVFilmGrainParams *fgp = av_film_grain_params_create_side_data(frame); + AVFilmGrainH274Params *h274; + + if (!fgp) + return AVERROR(ENOMEM); + + fgp->type = AV_FILM_GRAIN_PARAMS_H274; + h274 = &fgp->codec.h274; + + fgp->seed = seed; + + 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; + } else { + h274->bit_depth_luma = bit_depth_luma; + h274->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; + 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; + } + } + h274->blending_mode_id = fgc->blending_mode_id; + h274->log2_scale_factor = fgc->log2_scale_factor; + + memcpy(&h274->component_model_present, &fgc->comp_model_present_flag, + sizeof(h274->component_model_present)); + memcpy(&h274->num_intensity_intervals, &fgc->num_intensity_intervals, + sizeof(h274->num_intensity_intervals)); + memcpy(&h274->num_model_values, &fgc->num_model_values, + sizeof(h274->num_model_values)); + memcpy(&h274->intensity_interval_lower_bound, &fgc->intensity_interval_lower_bound, + sizeof(h274->intensity_interval_lower_bound)); + memcpy(&h274->intensity_interval_upper_bound, &fgc->intensity_interval_upper_bound, + sizeof(h274->intensity_interval_upper_bound)); + memcpy(&h274->comp_model_value, &fgc->comp_model_value, + sizeof(h274->comp_model_value)); + + if (IS_H264(codec_id)) + fgc->present = !!fgc->repetition_period; + else + fgc->present = fgc->persistence_flag; + + if (avctx) + avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; + } + return 0; } diff --git a/libavcodec/h2645_sei.h b/libavcodec/h2645_sei.h index eb00107abb..f3ee9af524 100644 --- a/libavcodec/h2645_sei.h +++ b/libavcodec/h2645_sei.h @@ -28,6 +28,7 @@ #include "bytestream.h" #include "codec_id.h" #include "get_bits.h" +#include "h2645_vui.h" #include "sei.h" typedef struct H2645SEIA53Caption { @@ -136,6 +137,8 @@ void ff_h2645_sei_reset(H2645SEI *s); int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, enum AVCodecID codec_id, - AVCodecContext *avctx); + AVCodecContext *avctx, const H2645VUI *vui, + unsigned bit_depth_luma, unsigned bit_depth_chroma, + int seed); #endif /* AVCODEC_H2645_SEI_H */ diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index ba873254ce..51d8d944be 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1225,65 +1225,12 @@ static int h264_export_frame_props(H264Context *h) } } - ret = ff_h2645_sei_to_frame(out, &h->sei.common, AV_CODEC_ID_H264, h->avctx); + ret = ff_h2645_sei_to_frame(out, &h->sei.common, AV_CODEC_ID_H264, h->avctx, + &sps->vui, sps->bit_depth_luma, sps->bit_depth_chroma, + cur->poc + (h->poc_offset << 5)); if (ret < 0) return ret; - if (h->sei.common.film_grain_characteristics.present) { - H2645SEIFilmGrainCharacteristics *fgc = &h->sei.common.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->seed = cur->poc + (h->poc_offset << 5); - - 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->vui.video_signal_type_present_flag) - fgp->codec.h274.color_range = sps->vui.video_full_range_flag + 1; - else - fgp->codec.h274.color_range = AVCOL_RANGE_UNSPECIFIED; - if (sps->vui.colour_description_present_flag) { - fgp->codec.h274.color_primaries = sps->vui.colour_primaries; - fgp->codec.h274.color_trc = sps->vui.transfer_characteristics; - fgp->codec.h274.color_space = sps->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->repetition_period; - - h->avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; - } - if (h->sei.picture_timing.timecode_cnt > 0) { uint32_t *tc_sd; char tcbuf[AV_TIMECODE_STR_SIZE]; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 7147944bc6..298edb782b 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2799,7 +2799,10 @@ static int set_side_data(HEVCContext *s) metadata->MaxCLL, metadata->MaxFALL); } - ret = ff_h2645_sei_to_frame(out, &s->sei.common, AV_CODEC_ID_HEVC, NULL); + ret = ff_h2645_sei_to_frame(out, &s->sei.common, AV_CODEC_ID_HEVC, NULL, + &s->ps.sps->vui.common, + s->ps.sps->bit_depth, s->ps.sps->bit_depth_chroma, + s->ref->poc /* no poc_offset in HEVC */); if (ret < 0) return ret; @@ -2829,61 +2832,6 @@ static int set_side_data(HEVCContext *s) s->sei.timecode.num_clock_ts = 0; } - if (s->sei.common.film_grain_characteristics.present) { - H2645SEIFilmGrainCharacteristics *fgc = &s->sei.common.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->seed = s->ref->poc; /* no poc_offset in HEVC */ - - 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->common.video_signal_type_present_flag) - fgp->codec.h274.color_range = vui->common.video_full_range_flag + 1; - else - fgp->codec.h274.color_range = AVCOL_RANGE_UNSPECIFIED; - if (vui->common.colour_description_present_flag) { - fgp->codec.h274.color_primaries = vui->common.colour_primaries; - fgp->codec.h274.color_trc = vui->common.transfer_characteristics; - fgp->codec.h274.color_space = vui->common.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.common.dynamic_hdr_plus.info) { AVBufferRef *info_ref = av_buffer_ref(s->sei.common.dynamic_hdr_plus.info); if (!info_ref)