From patchwork Sat Jun 11 16:45:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 36161 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp402741pzj; Sat, 11 Jun 2022 09:45:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxo/HI9Js+rwEGuGWCgZV0H7QKV2hpzZuyhlQjtlqE0ZXIOW5vaw6H/cwqdDKGk/1RNtdKz X-Received: by 2002:a17:907:3ea0:b0:6ff:7d7a:480d with SMTP id hs32-20020a1709073ea000b006ff7d7a480dmr45899868ejc.750.1654965958697; Sat, 11 Jun 2022 09:45:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654965958; cv=none; d=google.com; s=arc-20160816; b=ok4ksg/FrAbkXtrMORYkMQxlY7pgaqRV11NNYvEtd0t+xBMC1GrUVzU45VujFkBa1m iMod0OKXgR64jKCJ26KeAPqDS81HDLG0uTdhdDhpI/L3Lo2IMXgvHwOk6snpzQ3NxpZQ 4ki5eZoOT5T8BqdgUoYhgxM2Q7sM5ukiq7En/o7/PCn1OFXlfz6CvQK/8yIjmFF3i7c9 J4Oi9//a8EXOL2Gvd2OMYDwKcSKJKBdqDtEGPbSGeJKdz7QoEF2ycrndyWbdzCuaJmJv ZD4LSWQBf5uzkFoeyV1kEWez7C0fRW/ntD0BFisj28Cm5ZCF3t/wIuk68xnbBui6LOSr ejPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=y99+Gu8RQNeFkieoapfPQ2FV3WzbtFevTMrs+q5y3/E=; b=VAWAhG9Jnem5wlzNozNh9ZxJzDD6xMqL3dY1jkEWZJgAIIvENeGN6aR3CEULsDm28e HDsfRI6QpCYYb/SDsqeAGoQOANSQ+1Wg0jhXpfG5Ws/VguhbYsFO2QZc/3pKKjiNmPcs of5vI8+ETOx4vDOQE17JunRNSdz50W6K9vzl1XS52NwqwRmsqDCwj2l81RgmkSsSYSZn Z0KOLcKkZLvZBVS2knEkVVh3JCc3BxIuJD8/xRL7EyFgAvygg98paY5E58zAsSSsOtnc b+sGzwQ57hakOhWtw5ZIKNUFt6n+7QqE/PYUbjisrM2dZgp1av43NMDPjppGfjIu3qH3 rhfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dm94PW2B; 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 di11-20020a170906730b00b00712163df510si2364829ejc.236.2022.06.11.09.45.58; Sat, 11 Jun 2022 09:45:58 -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=20210112 header.b=dm94PW2B; 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 8FD8B68B4BC; Sat, 11 Jun 2022 19:45:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3098F68B366 for ; Sat, 11 Jun 2022 19:45:39 +0300 (EEST) Received: by mail-qk1-f170.google.com with SMTP id c144so1302187qkg.11 for ; Sat, 11 Jun 2022 09:45:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RuUAmABfGmyjVkFfj2f4EUotBnPLNRZVlPydc3haW4w=; b=dm94PW2BIFon45LqaTYCGLl9mb04mp5oYQFft3QX5nErcMBQO8azTm2SjyeYhbQVIg S6+PgIomM/6jpB3JKyrCvxparM+blYE+rKpK6fiSGBH/zVsnyLW2UjT6QCWUczgEVeT9 S0+peFegMkbY/8zPRogU4lBkZ9sl806ubWxlSjyOK2LMtOgKQ4f8L4nClBxHz7Wz4vn2 i9EPVi2wx5mB4S6iDKKMcVc8U8fP9iXVrTXhM8fpq7vPjsbMj7MQE7CsAq+6VFlrdXNw BijC+WFHqm4vNyVnKBiGTGjj5T40lL+HWAVz8h5u+0lkM9zt4upU34J8f3GwVpEZwQbX mp1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RuUAmABfGmyjVkFfj2f4EUotBnPLNRZVlPydc3haW4w=; b=4QWXRM3IOATkDCFE41nmgvRXkYr22mLjDH/QqDn2jYzzSwFd+7P9FRlyBtV7xYwaCc 4ja50G+DATUAWQo7BBhf0ungFO8Io/CZrRtHWT1EEYAJ3x6RR6m+w+6RhnvpIoeuuqxz 2fl1PxtrCOD/PmV1Blvx65jONPL3yDG0HpDTT+THGhrufY0bvZs3S5ghlqvcNCbvNxvL 5dEIDhRF4EYmQ/DjI3LrmoSwCrL56fho3lu3+dnKsixDWgsCKLyV86WC5G9EJuHd3T0M vl9VboKxCPJJq92TYEHBQtnvSwubPW/RQAnDerqGmuZVeie3k2N5QzB2cs+wqfQA37+l rULA== X-Gm-Message-State: AOAM530pBqiZ4mHueVBykdafv+siOOLMAXKDdPrLz6cv2DpCE8/PGIjr 04YPztx+n0emxu5GqYH95xRUkjffOG1DyQ== X-Received: by 2002:a05:620a:850:b0:6a6:a496:872 with SMTP id u16-20020a05620a085000b006a6a4960872mr28322223qku.540.1654965937593; Sat, 11 Jun 2022 09:45:37 -0700 (PDT) Received: from nark.. ([89.36.78.10]) by smtp.gmail.com with ESMTPSA id br8-20020a05620a460800b006a6af4b40b1sm2323544qkb.73.2022.06.11.09.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jun 2022 09:45:36 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Jun 2022 12:45:29 -0400 Message-Id: <20220611164530.157-2-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220611164530.157-1-tcChlisop0@gmail.com> References: <20220611164530.157-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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 Cc: quietvoid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /fCqZQKAv/Ak 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. --- 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 c44297c1fa..63eb9b32ae 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -1934,6 +1934,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 12d39310ef..2148d202b1 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -543,6 +543,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, "}; "); + } + 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..c7c5ba721f 100644 --- a/libavutil/dovi_meta.h +++ b/libavutil/dovi_meta.h @@ -144,6 +144,7 @@ typedef struct AVDOVIDataMapping { /* Non-linear inverse quantization */ enum AVDOVINLQMethod nlq_method_idc; + uint16_t nlq_pivots[2]; /* nlq_pred_pivot_value */ uint32_t num_x_partitions; uint32_t num_y_partitions; AVDOVINLQParams nlq[3]; /* per component */