From patchwork Sat Mar 23 17:37:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47379 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp328616pzb; Sat, 23 Mar 2024 10:38:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWknfoI5DzZN7lF/859IPdKjo8QuEqR/5Fy6NZ77FboJIcXPNs3MtDBVIiQR53j0Cy7GPKSW5+lO56p6pUpRKZ04G4A2FbonVZY8Q== X-Google-Smtp-Source: AGHT+IFP3E1EXt48ufdIC7wOsZPEGbmrtLbAjpkS6SGiCZDSL+/l89EHXEuIWtpQ4LJskmNVFsRo X-Received: by 2002:a2e:b16e:0:b0:2d6:c04b:599f with SMTP id a14-20020a2eb16e000000b002d6c04b599fmr2005265ljm.42.1711215500833; Sat, 23 Mar 2024 10:38:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711215500; cv=none; d=google.com; s=arc-20160816; b=N7RWnig1+CJw6HPU2jYDRoUksGsFbSfpfVfV40nD3PS2OXvN7UvAVrmvmKbH6vwDHH VTip+PN/oDmtW1VXuGku0l6ETD6Ctv7jJ4SfWd+UnQpzXGH6sp8xZ7h0WhCZ03oS19jo IBomMXbhEMieTfuIpWM1rp9TX42eJJJ6gyt/QSdIUlbUcJmYum8A+ydBI0wu9HAJb+7b TH5Oi4SKcBTXZkA/Ba92kZNxtb233H/4LM4QSC39nO7r5zwkwaNBmwgZWq+ZyzCYLy1C l+wlcB/BK/4jeJ2ZXJOQ20Gv/AzjEVdiWmLWPHqtzvCsd9h3gWsFhvrAk2AnCdy4MU/I cSqA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=pU03Z2XxKpWP23J52fyJCzZsc4I4praA+7C8EtctMTU=; fh=C56SNERGsx7JRMjLZiHmpTAKnRl/jfaA+FIG9zHupRY=; b=GyFKQJqajSzSA8aAaGyN5fQdeluTxpa4P6ofEdDCtDtJ8KiCIMwJM9kPwhG1iCs6ZZ fOnHnwPjydvKIpD6h6IGyKMTFGGHCS0sZ3skvgUAokAY+tlfn4OCujOFT3h4QUc5KODz ERSHXFZHRPjVggzTjD/Bb0o4KYu5izfDXjjwl1jXiKK1so0T8M0UIyqyvz47MlMufXSG jmslaHEkwCHr0zXRdzt8uAlQPT8XZe7zXHsrkf9KQ4/AHlUmQDnnsWMYyfmO1XppdBQv m1caay2sU7/W9PZbRa6VhgSp3v7n1kIUw6MCADS5kAI7oE/I922UDYVSwVR2YFKrXNPE OP9w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=CqXvsKeB; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qk25-20020a170906d9d900b00a4735d92ef5si1019078ejb.193.2024.03.23.10.38.20; Sat, 23 Mar 2024 10:38:20 -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=@haasn.xyz header.s=mail header.b=CqXvsKeB; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 563CE68D316; Sat, 23 Mar 2024 19:37:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A6EB68D329 for ; Sat, 23 Mar 2024 19:37:42 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1711215461; bh=UV+7GcBmwo5wgEs7bcHEIr2C4JP7DiZE/POvPBQVutg=; h=From:To:Cc:Subject:Date:From; b=CqXvsKeBz/lzDebaVVCu+WmLiPFlPkgKzTXHBGqzBOxOfznnPvqb/8DzYyTOaU6+Z LgHkJwTtsLIQPkkYdBOX/aqJ95D+dRFpoSvfrwyJr1amPLNgVallqSfpQyrg66bMQ/ y6mHcgYpUl3GoSiKche+z4kBzmj/1GuRbpCtWeOQ= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 168E640015; Sat, 23 Mar 2024 18:37:41 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 18:37:30 +0100 Message-ID: <20240323173735.26224-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] avutil/dovi_meta: add AVDOVIDataMapping.nlq_pivots 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 , Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5AiOe300/GDW From: 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. Signed-off-by: quietvoid Signed-off-by: Niklas Haas --- doc/APIchanges | 3 +++ libavcodec/dovi_rpu.c | 9 ++++++++- libavutil/dovi_meta.h | 1 + libavutil/version.h | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 2796b4d0c25..739f33501e9 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2024-03-xx - xxxxxxxxxx - lavu 59.5.100 - dovi_meta.h + Add AVDOVIDataMapping.nlq_pivots. + 2024-03-xx - xxxxxxxxxx - lavc 61.3.100 - jni.h Add av_jni_set_android_app_ctx() and av_jni_get_android_app_ctx(). diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c index 31c64fb0602..c84a942f476 100644 --- a/libavcodec/dovi_rpu.c +++ b/libavcodec/dovi_rpu.c @@ -109,7 +109,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); COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal); return 0; } @@ -346,7 +346,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 3d11e02bffc..6afc7b055a7 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; /** diff --git a/libavutil/version.h b/libavutil/version.h index 882003f7199..8a1ecd44516 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 59 -#define LIBAVUTIL_VERSION_MINOR 4 +#define LIBAVUTIL_VERSION_MINOR 5 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \