From patchwork Sat Aug 6 14:02:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 37157 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp805454pzg; Sat, 6 Aug 2022 07:03:02 -0700 (PDT) X-Google-Smtp-Source: AA6agR5L5g9/yfBPLLynAfq0k6OUSv8BY+wpPyvsSYDEgbybnq9icWmT/2hwIRIhhkM9rcP3JNns X-Received: by 2002:a17:907:7637:b0:730:6a9b:148f with SMTP id jy23-20020a170907763700b007306a9b148fmr8696733ejc.273.1659794582521; Sat, 06 Aug 2022 07:03:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659794582; cv=none; d=google.com; s=arc-20160816; b=O0g+/uL8ruy8NbUmYvHpxYsUbxOg6IelOa/bMZeUsrtE86TNhN00ZuT11rBPBH0ozd cYOOYUJsZe1FL/C0KCgnuMbt0c19RXSA948JKT163k9lVC7daFcfEJ4QK+ScLEmJ3wXy wbQuF/D+73sFy7KXwa7uQ+dCSDmbLwROodoZS2LLMwf3Pm0uyzHBe2XUxAWS4nxry4ZL wi8FdtjTequsXEqrA1KwHBWcAEKzR0UNNrR7wMz7U7vNXrZiGQcgN+NEwGPHWhkEgOUd iWux1kvB4Bbi1VqSxCG/LPm1CJItTTsHTJuASnjg9uc+ApLizry1Uc4PhrOLt7Hvbawc GnAw== 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=CUfydiwUal05804LUKWSYSUrYPfO5lhCabvHlN016n0=; b=guWIEQeSohWnfoK4Y1ya+C3KL3Pk/aV+vE+6WConSPw3BHO4U3HNW/nguqSuLrwKZ3 cmiAByLpX7J4MNDU+CEyjqsV1iSI+Qk2RXy2p7HNBFh+he9JMyzs9nMsa6vlm4A8hC0O FDVbRo1ameJWEsF/bY5pkRqmbL2Ja5wPzmFAve0pd+a+1FSRuUJ2bieAQbIsOZ/83nBP X7BhLklmHW26+Ws3I1UVDARKzYCUB5BwviQ01PkrHUADuyxdkC3uq8XGrtnJFGzqRQ2E oac5WU59eMo/v9S6bid+hyqW3Oc1lnTt1fQj9sEHtYxNHPUt4ZKs0EaUsSniKZYG3qag r/9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=kOkULLrI; 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 qf5-20020a1709077f0500b00730b5a8b357si2354564ejc.752.2022.08.06.07.03.01; Sat, 06 Aug 2022 07:03:02 -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=kOkULLrI; 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 8F8C368B7A7; Sat, 6 Aug 2022 17:02:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CAE368B730 for ; Sat, 6 Aug 2022 17:02:43 +0300 (EEST) Received: by mail-qk1-f178.google.com with SMTP id r11so3674506qkm.7 for ; Sat, 06 Aug 2022 07:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=SdcrE/boIGTlox4oGy0wv0opdXuv55WE8eixBgvE9Ew=; b=kOkULLrIqABmWX8itb/ttbFiTpog3ARzeOUs76oTYag73kxV24AAO+DEwdnR6+O8br 49rwtvRtspFOwZ8KOsdWt4RbDWbOUVkWPHap+Ztxar7Pyv9mF/qbSFebkxtk9t/MKAxU pfD/3jqO2laSZeNK3JMoNtGd3bb1rBOuUg2ZrcVfYzJ+yEDUa6lSCTs4N+WUVbHKzmlc 1PT8vpC/QCCLUzbyzhi9jSOMUrx30xTkY3xpcwAmG0k1BuDSaXnYS0TPjUmbeNha0nN8 FZcOysW4EyrKOlIK/p8G2lT12P+rQAA3/o/6rj17rt1/7FDuNdoOcfpPlNedImDjNGJA ubXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=SdcrE/boIGTlox4oGy0wv0opdXuv55WE8eixBgvE9Ew=; b=h7uPnpSAOnHLuj7vcTCQkizVrBWUSCq9W6SfL+FT2F9qDJ/eqKkB8wr0WMSbq0rLmq i+6TpV2nxwca8M/7NhuLPamSAw5Tlht2yj7WiayzFMjnyuYhB9jSxJW4p/sqrT4RX5y5 6ZKOez0WR4z1KtrVmTy8hzkMZNIbjky6mirC4yZ/nPpwh5M6Jb1bg8TLsnb8LAUlPVJ0 YzfnHsziG+2GIT/29y4m7WIGlduF+cP1e99M8wF+OoVU1N1KobWXNXGEX+/8IwM8geOG SIIVi5B8WjcsHhbNW2OSv0PIpzgFk2c9g6TYkFzg/rCwQ3Y9R/LPKT1/Su0TzVOrPimL h2dg== X-Gm-Message-State: ACgBeo3v+7KcNO+Nmv4xsNLQPzPizdddZFCddfaYjkiNe5VRqz37LyqW DIdIXCRqMRGAL84By1VRwI5Pnjrh45I= X-Received: by 2002:a05:620a:284c:b0:6b8:6e70:cd95 with SMTP id h12-20020a05620a284c00b006b86e70cd95mr8399863qkp.247.1659794561258; Sat, 06 Aug 2022 07:02:41 -0700 (PDT) Received: from nark.. ([89.36.78.10]) by smtp.gmail.com with ESMTPSA id s65-20020a372c44000000b006b5cc25535fsm5066495qkh.99.2022.08.06.07.02.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 07:02:40 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Aug 2022 10:02:32 -0400 Message-Id: <20220806140235.144-2-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220806140235.144-1-tcChlisop0@gmail.com> References: <20220806140235.144-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: 12KcoNFCy116 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 dd38936552..44fb76492d 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); 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; /**