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 5772A435CB for ; Fri, 17 Jun 2022 20:19:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 93C6968B8EC; Fri, 17 Jun 2022 23:19:57 +0300 (EEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064047.outbound.protection.outlook.com [40.92.64.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78DFE68B818 for ; Fri, 17 Jun 2022 23:19:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XO1HZaLWggK3+8LPo3Tx/Pzy1Kp13+oSqCbowoxD/5wALq+5sLki3rXt5/BwgWOLESKYR0lG2WZ6GCV/tSUE4i/jb1J9eXA2xvcC2au2JHVkdeMwpVHahaKmjjB/VjDCJVJt1yaT9bS2IwNbb3MP1y4S+dDf/zEfMZ62h/PhvbcJoH2LZU1fxQT3CyYRZhj4M8iPdCTH5m43JxLoXYZphBCdgRYK88ynO+FnEYhC9INa8lWh/wd+8/wniEvlt+NiBl5qvs06jWsCi6sduw8PNg3E9FNfQHyz0JQrdv3JZF4yJmED6mnkEgmQE0TNZHLBMGCT/ielMlYROdkKhKjEfQ== 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=53VZ8+QuU0m5GcVv1RqtlxXzC6/H9MFcjEjODmts0D4=; b=M4Ei6d3gNk8AzXPBkOz1Gx4rXwO969s3dd1FudjGRP9v9x0DeTsiblilEZAW6m+zM0RG7SxLQunv7g/QzPlPK68yhehOjbiFRd4puxnes09OBmhkfBsT8ysQ8fH8r6HpGcitWlEh0R+gnLq7V6Gs+GZRT1+gtmhe8vNCFw7E08wWkVXCo8Gid/u+dpmX5pgIqMkA7yWO3i+yzj3UaQVkObD9WNz1HOQmppjaVyH7vhOahdaLqijWRQhoQNizAVYkljeNPas//AAnkp77xjxHkeAT9uFCPzUl0WQ8sigAo0ituZyWQRglO4bHhTrSuyDlgpShsJNTQnO4X3F0WxSOug== 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=53VZ8+QuU0m5GcVv1RqtlxXzC6/H9MFcjEjODmts0D4=; b=aAKIexua8KsSiJBRaKNYXxRx7VSZ71bXmr7DQJppoGj1FWQH55MuUyarJgbv78df6sYuSgDhxw2pk2XphFvVuVJWrKuyXDTNhXQORB26ud5EDEyRh0Y74HuBNWr/8jDHqBKmMsuKGTPg0yg+etPbxpS6XOXNiaGHfQbg6UPKB5ddtNqd8WjyzS0dOxrhC9IctE3KrJNdP0O4Z37EZNvmjvWjrYI+7y1ydr+2TwDb/SJXFiRzmVUElZG1vFY1w8UFYifQPfVEMDRDfD57fqD0kddOgov0v0ZYXqTR4N0QsxqsfTSCIctJauHOIK8Iiq8QCK+TJIUfw1TEqqC/asPFvg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB8439.eurprd01.prod.exchangelabs.com (2603:10a6:102:220::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14; Fri, 17 Jun 2022 20:19:50 +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.5353.016; Fri, 17 Jun 2022 20:19:44 +0000 Message-ID: Date: Fri, 17 Jun 2022 22:19:42 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220617193436.78-1-tcChlisop0@gmail.com> <20220617193436.78-2-tcChlisop0@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20220617193436.78-2-tcChlisop0@gmail.com> X-TMN: [NS32ug5Bu2Cer3ug0eOkoKSCy83ycyns] X-ClientProxiedBy: ZR0P278CA0112.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::9) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f3dc09a8-49b5-469d-77bf-08da509eb7ad X-MS-TrafficTypeDiagnostic: PAXPR01MB8439:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aOBpccJKMld9G+z8qGw7SVekL9vRHskM65ldPOo9OTpdcfPNcQSqCOHAwSFNJfGNyW8OLDWOm3oRJDkq2uhoFK4X0eViGhl0linEvRHk42IaLiB6LwDBblEdPHbPtss8dt7ivxQWfnzXgattbfdCvv0AE9+ihN9lipHN8SonOomLVpDv931Bq3CAgkL7d+3HD+d9yZK707H0WXKPqsC2aA72jyXLcncjqLQtjI6RorEotvLOkdch56zBA68He8x1+HOxpcmCrAtBnuQTRjqEMsY2uXxRt9vtcNjMxdIQWhXF6QSg5Q02nMz1QzumWjmBnANh4RvLu79kFi5AQ/0B7FQWvsnQk6dtRpkGsFkUlkBZAIJys5ldsRtaRf9iElXY28QD+UPBuUJrXKEmeubKuuEPAfKhMGAMXii1OUbDwu1JC+Gcg2irfmjwCvjJfYFW7syAnTDMqVtWP2QepklJNSGFVbgOdHMGGHi0V7iIjY7fyPKivaF0O62zoemliTSao1t/10xbllrrt7MAnrZrKr10Z4ijz8xVzJ8mh3dK2GFsCUqDCW7pwkDLHOt43ZNd0MBf7vNmF04BgEfp+dX9tQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dm4yMnBRdHo3OUNCOFV4UW1OMXIwQWlRazZYbnZqT3hyTWkvbldGaWlJN2h3?= =?utf-8?B?bzJhaE5uN0hCL1VISStkZFIwb1p2WHBzVUQrODRORWgzSHl4dUQyamplYmVH?= =?utf-8?B?STBsdmtRMUxMeVdsQy8yWXViOHZiMVJFNTBTUjJvZHorU2thNVZLZGZ2dlV2?= =?utf-8?B?aHRReFNleGo5eldFYkhCZUtvM1NSUHhqcVFBaDdRS1VLWkpJbFdJVW9QTXNn?= =?utf-8?B?TDZ3Z21Eem5oTkFCbVhLaStrL01uaXhmK1dTV0JPelRuM2sxWmVoUkxNYUFE?= =?utf-8?B?RUxPN2JGaVg1Y3dTcHlBb0lQUmZZVkZCRWRjRVZWOXYvRVQ4VjBLYjRNSkEx?= =?utf-8?B?SGwyRThOWFYyVDRsYXJ0U1VNdkEzaERsWTM0R3kzajIvdE1uTGQrS055eG1w?= =?utf-8?B?aU8xaFFZTTZNR1FnYUU2Zmo2S3FLWkx3c1lsTDFWQ0tuM0dod3g1aUN4czNZ?= =?utf-8?B?Kzh5QmNZckVzKzVFOHdGMFh4L3lzYkF0c1hJYmcveW43a3lXVUl3b2RhMHhk?= =?utf-8?B?RzFLazRIOW81NGZzd3ZlYzZBektuMGU4c1RPTE9hVXlpN1hYQk1tZHcvTUVQ?= =?utf-8?B?YjdMaFpQVTIzSDBZK2dQU2tXbnlTUDZ4bHVzYW1XL0VvUUVqcjI4d01HRHpV?= =?utf-8?B?a1VUSFU0V2d0V211M2tYSjRWUGprNlVoU1llQU1GL2Vwd2xzRkNjRk8rNzRE?= =?utf-8?B?VzFMbmRzTHNRR3FMd2FuSHNldlVtaHpYWVRUcDBTRFdWQzA2bTNNZkZPZ0c4?= =?utf-8?B?NlZ3QUV4YXJ2YkRacThnMFZ5MHY4eVZ2QmpYQ3BzMVcyTTFmYjROVXBzUEpo?= =?utf-8?B?WmErSUl4alNlbksxWFVDbnNmMHp2UG1zelFiRFdYdVJFb0pMbnc5Z1EydW5M?= =?utf-8?B?MzV1d2JieUR1cVdaRnZQbWVhRGErY0RNUlF2UHdySEwraTlGVkVTTm84bzdj?= =?utf-8?B?KzRTbTkvc3V3N0Fucm5lRG5UOVgrUWp4cmplVnFaUklTYlFXN1VPanVYaWFr?= =?utf-8?B?ZWg2ZWNYQURVNUxKQkVBTE1HMDBZVHBKSHlEVVU4RCtrWllDQjBieHprMWJK?= =?utf-8?B?aEIyL2dZcnNteVRUaVpKWEFmYm52Wll6d09jaVVQTm1RT1BqMVVlQjc1NWpZ?= =?utf-8?B?SHdZVkpnT1BlVTRvWDlBZnRPeDIvUDNXZlFZSitna2k4RjdjMkpNRWl1MUJR?= =?utf-8?B?eWxvNm11ZkFSVjBTZ05LQzZ6LzIrSXMyTTdvUlpzdFZ2Zk9yZGtEdlFCeUpi?= =?utf-8?B?MHUwb3Blb3dKTlp2b2VMSW9HTjVnK20zeVZZNDFoSzBIWml6SVpUZTBBVFY4?= =?utf-8?B?QXY1RVU5QVY2cW9rZVFlSlE0dEZFbmp1enJYMnNySVpJcTcyN3RodlpGSEtL?= =?utf-8?B?a045RFR2S2VYYmxVb2FKbi9sampSNWliSElOUUZJQUtyK0xvRGpFNjBobVFL?= =?utf-8?B?KzdHdFo2VHdVNldXbWZ6TnNiOHExRlJaNysyYzIxY1BSVjFQNXA0ZlhIQ1Vn?= =?utf-8?B?d1F1R3doN2N5U3lzOXQwK2IycXZKWHFyL1Q2OWRyTG5xK3RKaEJuYlVmdlpq?= =?utf-8?B?a2JzbDlUQVR3MThwZ2YyL2VKNjNCelo0dkNPcWthUkxzL1FJajE1NWtGbkJ0?= =?utf-8?B?eWdOVlg1aS8zems5NlRHdEoyZjVDeWw1Q0x6VG94WTFULzAyelBkY29pb1ln?= =?utf-8?B?TWlNZ2thYk5TK3RuRFJ5a1pKVFpCSTZXQWk4Zm9wYUwzMlk2UGtaQm5MOHdU?= =?utf-8?B?VHd2RkZuc0xPSWpCanVVbjE4QVJkSVF2bC9PVm1KYU01a3l2Z2hzbVRadVdI?= =?utf-8?B?SkFhQ0NkVUhtN05GNUNaa2dBNVErcERQQVY0eTJYV0VML1dZdkJlWjdxWWFu?= =?utf-8?B?bzJ6cWxxT3pQdk0wWWkvdm9qVUNPbkd3UWNOeHA3VDUvcmh6dTNpL2NUYzBs?= =?utf-8?B?YTd6cG9acW5PNEV1Y0ZRaTBUc241ZHluRGhjK2s0R1FOT2N3STh6VG9DR0Vl?= =?utf-8?B?aFNVdEZNZ2h3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3dc09a8-49b5-469d-77bf-08da509eb7ad X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2022 20:19:44.6437 (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: PAXPR01MB8439 Subject: Re: [FFmpeg-devel] [PATCH v2 1/2] libavutil/dovi_meta: Add nlq_pivots to AVDOVIDataMapping 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 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: quietvoid: > The NLQ pivots are not documented but should be present > in the header for profile 7 RPU format. > It has been verified using Dolby's verification toolkit. > > Also implemented the parsing in libavcodec/dovi_rpu.c. > And added the info to ffprobe and showinfo. > > Signed-off-by: quietvoid > --- > fftools/ffprobe.c | 4 ++++ > libavcodec/dovi_rpu.c | 7 +++++++ > libavfilter/vf_showinfo.c | 8 ++++++++ > libavutil/dovi_meta.h | 1 + > 4 files changed, 20 insertions(+) > > diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c > index 4e2fdbaec8..bc4f7ec0a1 100644 > --- a/fftools/ffprobe.c > +++ b/fftools/ffprobe.c > @@ -2001,6 +2001,10 @@ static void print_dovi_metadata(WriterContext *w, const AVDOVIMetadata *dovi) > break; > } > > + if (mapping->nlq_method_idc != AV_DOVI_NLQ_NONE) { > + print_list_fmt("nlq_pivots", "%"PRIu16, 2, mapping->nlq_pivots[idx]); > + } > + > print_int("num_x_partitions", mapping->num_x_partitions); > print_int("num_y_partitions", mapping->num_y_partitions); > > diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c > index a87562c8a3..17837eb845 100644 > --- a/libavcodec/dovi_rpu.c > +++ b/libavcodec/dovi_rpu.c > @@ -315,7 +315,14 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size) > } > > if (use_nlq) { > + int nlq_pivot = 0; > vdr->mapping.nlq_method_idc = get_bits(gb, 3); > + > + for (int i = 0; i < 2; i++) { > + nlq_pivot += get_bits(gb, hdr->bl_bit_depth); > + vdr->mapping.nlq_pivots[i] = av_clip_uint16(nlq_pivot); > + } > + > /** > * The patent mentions another legal value, NLQ_MU_LAW, but it's > * not documented anywhere how to parse or apply that type of NLQ. > diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c > index 6efcafce28..f8c04fb2fa 100644 > --- a/libavfilter/vf_showinfo.c > +++ b/libavfilter/vf_showinfo.c > @@ -535,6 +535,14 @@ static void dump_dovi_metadata(AVFilterContext *ctx, const AVFrameSideData *sd) > av_log(ctx, AV_LOG_INFO, "mapping_color_space=%"PRIu8"; ", mapping->mapping_color_space); > av_log(ctx, AV_LOG_INFO, "mapping_chroma_format_idc=%"PRIu8"; ", mapping->mapping_chroma_format_idc); > av_log(ctx, AV_LOG_INFO, "nlq_method_idc=%d; ", (int) mapping->nlq_method_idc); > + > + if (mapping->nlq_method_idc != AV_DOVI_NLQ_NONE) { > + av_log(ctx, AV_LOG_INFO, "nlq_pivots={ "); > + for (int i = 0; i < 2; i++) > + av_log(ctx, AV_LOG_INFO, "%"PRIu16" ", mapping->nlq_pivots[i]); > + av_log(ctx, AV_LOG_INFO, "}; "); Don't use four calls to av_log for something that is so simple. Besides having higher overhead and binary size it also adds the risk that these av_logs are disturbed by another av_log in the middle, breaking the output (at least with the default log callback). (The same btw applies to other av_logs in this very function. Is it actually intended for this to be one big line?) > + } > + > av_log(ctx, AV_LOG_INFO, "num_x_partitions=%"PRIu32"; ", mapping->num_x_partitions); > av_log(ctx, AV_LOG_INFO, "num_y_partitions=%"PRIu32"\n", mapping->num_y_partitions); > > diff --git a/libavutil/dovi_meta.h b/libavutil/dovi_meta.h > index 3d11e02bff..6afc7b055a 100644 > --- a/libavutil/dovi_meta.h > +++ b/libavutil/dovi_meta.h > @@ -147,6 +147,7 @@ typedef struct AVDOVIDataMapping { > uint32_t num_x_partitions; > uint32_t num_y_partitions; > AVDOVINLQParams nlq[3]; /* per component */ > + uint16_t nlq_pivots[2]; /* nlq_pred_pivot_value */ > } AVDOVIDataMapping; > > /** _______________________________________________ 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".