From patchwork Fri Jun 17 20:35:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 36313 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp337820pzb; Fri, 17 Jun 2022 13:36:14 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uVWC/I7uceanBeexQUZqF3MjfukSeOluZGB/UrdfDqTJeqVkdHp/46EcelDHtm6eM4f27+ X-Received: by 2002:a17:907:7810:b0:6e7:ef73:8326 with SMTP id la16-20020a170907781000b006e7ef738326mr10525524ejc.429.1655498174165; Fri, 17 Jun 2022 13:36:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655498174; cv=none; d=google.com; s=arc-20160816; b=ii+7VVvQ0gxblQDTmE1lnmhYo2uqcakXj/VeG5KBgYnorC8SsBY529yAOkDOXt+qwY wHcRG4joXfdBZdmwUlodSN80XONF2kTEZeR/zhzv5G56E/zNOptKIYPttDvF/9PWezRW +V/wjJzH+s4aloZDNDaTgXKz5zzy4TWHLhoXwl2O/4zqZ/uzb2NvMPDxFJxlEbCg+KTY ejfw2RQzRBHLv0HycFK3WuJIN4jzwGZdzln9pMKrryaFJDcN1QTVm2uSyFcVEso97LMt Ar2b+QSGlvUjTJVqXgPfUAqgrxi0lR7UJ5WVDBpNr0EzFhZqc5DOGwfm8ps319bM4BmV GBtg== 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=fCA+BIZWPlx1bdAejVr6wzD3qN3SV0CYf17p60nNNlA=; b=VrbSOMlJvIWuT+p+0LvBjg4DkUMp16Yu52dWL2dwQ13tgd2x9WvLgydhYQ4oBGGQm7 4QBgHYmAkAc9sdQXsYEFTp7OHh3NWeQd7ZsTV9ip2Az8QHD89bjij2RJjgaWUot38GIH 51L6nk4bY68C6oKS/JB4wCSxoiIhkxNh3V68TZovJpQvxlEbUNLplTfGQcjXcnUG/w5k Y7JE5JC9yctb9b0Tf/0y3t8Hnu5B3mHLhB7Ai4nW/w17Ijv1o7zBCtD4ITjsiv89o32j k2Ju0a4Z1AhYfQzihB0U4OrjXn353LG8LP+UOpXdhL6ojIHNIiJivwgjcMoE+dbeZpfg 1u9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Ty8wYUIb; 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 bt11-20020a0564020a4b00b00431388396b9si5740682edb.392.2022.06.17.13.36.13; Fri, 17 Jun 2022 13:36:14 -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=Ty8wYUIb; 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 07C4368B610; Fri, 17 Jun 2022 23:36:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 345C068B289 for ; Fri, 17 Jun 2022 23:35:56 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id 43so8067746qvb.3 for ; Fri, 17 Jun 2022 13:35:56 -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=NIrVI0BfGnTRlEVuUNBTDiFy5Hqcy5Dk6486My2qYN4=; b=Ty8wYUIb45iWYwjdiY6ZmCsUYI2bV6zCsjy7RpNORlsSwAxu/BJnoVfMJBp3NJp1X2 xnytNBLX7PZm2DdqQhK5Ww+oQmeFLcIpVwRFuty5YqnlPw3PRMTk+cp+tVMcI7Vi8mca 8baEU3MIKsJHJ1p2aSubTLazc8JKRfgCCf0Wdj52Z3HMIMXj2m8ZpE1u8geU2/cb84OW b6sK5d2ymYjj7u5F7iCuCAq60oAZXeeE3HrBbJ8Ek66GmOVkZvTb35Oxqug9BBf24WQZ YFYM+fw+Pso1qtFXEEzLOWFIdcWApPiwlJ3gKVejgH74f7gUOQ8K1+rRbEtv5JOd5Siv cscg== 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=NIrVI0BfGnTRlEVuUNBTDiFy5Hqcy5Dk6486My2qYN4=; b=263fzJjESrD01SH7u/Hk/X8gQMPoy5o2fjVreeuVuOy2ArT8Op7uKIZ+tM/xEXFEDD 97xfysfKg4ql/onL0KJomDniUHErn39SGJ0IrOGZ1+FI2XeFR95Ywk+qZotIYZvRAeIZ wwmPCHD9xc0FIrfftrgGPthkiN7tZsMOo5RsuE8rIFreKF9GXmwhQ2DOWATUHUovb+5a wDIg1r/NV+VNglNR52aOiRaOfEKyCH2iT+K0G6qHlrhjeH3sTG3AK5vZX7c+9+hbCso3 Vs2DHO6UJJAjpt40Lj+dcWF/r14Dh7Fp5OIBhh+QCKu2KhTi21PlWBOVMY6i0idzR9zv DCHQ== X-Gm-Message-State: AJIora850O+6W/ok5pmg/OkXMmtlXkTGppjJg6vucpWjcKUTZKy/EWz1 pWEpS3Fo0E/Mj7dIzikz/LKIO0zekpI= X-Received: by 2002:a05:622a:547:b0:305:3186:1fd6 with SMTP id m7-20020a05622a054700b0030531861fd6mr10376288qtx.100.1655498154562; Fri, 17 Jun 2022 13:35:54 -0700 (PDT) Received: from nark.. (modemcable017.92-130-66.mc.videotron.ca. [66.130.92.17]) by smtp.gmail.com with ESMTPSA id w13-20020a05620a444d00b006a9901130b2sm5939313qkp.86.2022.06.17.13.35.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 13:35:53 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jun 2022 16:35:16 -0400 Message-Id: <20220617203519.74426-2-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220617203519.74426-1-tcChlisop0@gmail.com> References: <20220617203519.74426-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/4] 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: rM6pcMI618Rz 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. Signed-off-by: quietvoid --- libavcodec/dovi_rpu.c | 9 ++++++++- libavutil/dovi_meta.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c index a87562c8a3..31e87cfbcc 100644 --- a/libavcodec/dovi_rpu.c +++ b/libavcodec/dovi_rpu.c @@ -117,7 +117,7 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame) /* Copy only the parts of these structs known to us at compiler-time. */ #define COPY(t, a, b, last) memcpy(a, b, offsetof(t, last) + sizeof((b)->last)) COPY(AVDOVIRpuDataHeader, av_dovi_get_header(dovi), &s->header, disable_residual_flag); - COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq[2].linear_deadzone_threshold); + COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq_pivots[1]); COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal); return 0; } @@ -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/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; /**