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 0D5BC43027 for ; Fri, 17 Jun 2022 19:34:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB65068B8CF; Fri, 17 Jun 2022 22:34:49 +0300 (EEST) Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA32468B8C7 for ; Fri, 17 Jun 2022 22:34:43 +0300 (EEST) Received: by mail-qv1-f53.google.com with SMTP id q104so7837852qvq.8 for ; Fri, 17 Jun 2022 12:34:43 -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=fIC+8RR+cFeeSzzHZH7luXyuRpozxHVhdjXozNdjSXM=; b=h1Qb0m54WpySyGv3F+iJegGm+QTb0mmK4PERBsinEAehUwOT2ee1rlkNLTQDSnAHb/ fyDoP89zCRxSq8cnYRBpt/P56zCo0YcLOPnrW5wJWnPU6rkcrGKMDVxinQw6u10Y6Bd7 Xjm37FHsCue/dSg125LWZaE1qj9NzWTtXu5ulPQBngjCp5ta45kDUdoA4BoIk67/qjTi 16s27kG+7+PRoIkNkMQ5nv++H3s4J1TOCk7kub4PKVkGL/sBAGmgfh2Wm0upQXgi9Jmv ZCZUVF/P6C4iD2pF207mFKhrRp/NzBccxGGPqyH4qVfegw2wnnxhZM3V7pxrtfh21gDG pF4w== 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=fIC+8RR+cFeeSzzHZH7luXyuRpozxHVhdjXozNdjSXM=; b=elq7WoA2vw9w9plz+gstNA7a/UHE4mSS5k2EnXzlLoacf+Gw5C9l+JAKOeFNN4sQc+ Mx2KUjkT6RSqFlnn9FHVeMXf4QJPdOpnZXQvv1sqmVE/1OBi2eYq/8sZ6te/rS5/8jpc jgBvmKgKblwlTOEd+kmmjjYmMbQbXZ9jwOf3aAkdEEGaN1WKSyNMIoT4qCv2CwzkIcMX fyOQoaEcT5G1z+6qGauKPc+LA68IhADDLy05oanet8jZoKslcxJWKvVT6o1heZFStU/J ZAO90zaDAZWhVKB0xMOHM0T9+bw4E7Hw2Pn8QaKosLxd6rwqDhmZyCiNb4ObGOxrqED1 m8ug== X-Gm-Message-State: AJIora/M6n4GDQihFDuywR5g0+LigNcynI2ESJgZWDEVYGh0ZIvf2MY7 hjpBXrAQUHVGFBK57md0RCYGfuqWIdQ= X-Google-Smtp-Source: AGRyM1vtUzYp+XQuKcgjxzG1VInJ2HfStkI3ba6cenWtHi3APssJrrz6+PElxWIMHsDyXg6AI2l8HQ== X-Received: by 2002:a05:622a:190b:b0:304:ee86:59f1 with SMTP id w11-20020a05622a190b00b00304ee8659f1mr10199482qtc.632.1655494482007; Fri, 17 Jun 2022 12:34:42 -0700 (PDT) Received: from nark.. ([89.36.78.10]) by smtp.gmail.com with ESMTPSA id q13-20020a37f70d000000b006a91da2fc8dsm4968477qkj.0.2022.06.17.12.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 12:34:41 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jun 2022 15:34:35 -0400 Message-Id: <20220617193436.78-2-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220617193436.78-1-tcChlisop0@gmail.com> References: <20220617193436.78-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [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 Cc: quietvoid 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: 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, "}; "); + } + 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; /** -- 2.36.1 _______________________________________________ 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".