From patchwork Fri Apr 12 11:35:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 48026 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp203321pzb; Fri, 12 Apr 2024 04:38:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXRSvlHd9ciXXUQRRDUh5PE8DVhfzIshBkj9l1LQ9n0zvDxw0Ntfcy6fEAiTRZjnSHDN1/cUj9OGSJ7lsDkWF704FWpW2AV+8AwGw== X-Google-Smtp-Source: AGHT+IGKzw+R2rBAJ+1mQ6TGC/fjc1Zy8wmyQ6U9uydwja+elmYLbhxPS14cyhd5En0MyMJV9YkN X-Received: by 2002:a50:d553:0:b0:56e:2c34:cfec with SMTP id f19-20020a50d553000000b0056e2c34cfecmr1585145edj.7.1712921902093; Fri, 12 Apr 2024 04:38:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712921902; cv=none; d=google.com; s=arc-20160816; b=0XKRJmgLsYTYZe+uBbMbxTUaVraZI7FXmBrgXNDf7lUU0I+M2X3Vh09F6KcMBN27Yx N+vE5L9v1ozgXug8xpKsVmyb85hCZ1lPWaHgzlYCOSb5jI7LpWtzZvPefLGlkO8O7dlg agZh2a5D4voG+Q99ssIAKA1Lz2Oh6xIBrzveJwNe1gICh8jC4TLDeEALZ1xIxQD+1xB4 Jz7hfXdngl70dq/egyeJawVLpJgHakbi4iIOrQIJaPvCFJcQcOUHLU4LV9L8Kv9pRGMo RHNr9s7rJc/SpwFscZTmJMtmgKVQPbUE5k/TeC6yRKbkmEPZV9KGJViRIJGQH/udn0h9 t+cw== 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=wESPbSV6AFR8qOACHOM/C3osy2jMEGY66wgsCiH49i8=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=Wf8tuu3zSO0PH8A4fWn5Ht8otqN5APwEeH9+G3696HwP7QJ/tdUxcnTV/+TNoW+tQR SYAZBblD8rN360X4UHok1jCiIT3NnAvISlIiaIVdkKK3678iAXRilU53wa4Vra3ddO58 MI2jJH5rsmMj2kuAf2PyQOgHvqA6J310MQf9UxMF63HBsZ8bV6j6z8WE2EmU+zsW/hxf Kb0cVy9g9G81IqpbqLod3RV396suK+gD+Mxqt2UtdwbhMwPU/50hp4yPvkIdejXinDBC yU8tVJHcljpsPJr6I7AG0XBKr2tGGDuq3Gkl14mBYwhu1SJoECai7iwQBLSmhTsajOuD y/Hg==; 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=UyNFlIur; 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 v3-20020a056402348300b0056e6a034b34si1699462edc.86.2024.04.12.04.38.21; Fri, 12 Apr 2024 04:38:22 -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=UyNFlIur; 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 39E5E68D2E6; Fri, 12 Apr 2024 14:36:42 +0300 (EEST) 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 88E2068D287 for ; Fri, 12 Apr 2024 14:36:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712921784; bh=OF5K2+MnCdQNVC5/EpA/tzLhL5o6SxYeNjxqB/D2xyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UyNFlIur6mg/mGwDR0bxy13UaFB0VeoG4b/EsAN7omCn/btTb4QHibOTbo6GV+CZ8 /V28NSW75O9yVaSIHRa62XTvSy6XyXN0fyJf52Hz61+arfji7o3jFNhxc5dt+QRtnr WGQisWv6KLbNp2LPVFM21M4lGDMpmh3O9poB83FQ= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id B56DB43462; Fri, 12 Apr 2024 13:36:24 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Apr 2024 13:35:22 +0200 Message-ID: <20240412113620.84013-9-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240412113620.84013-1-ffmpeg@haasn.xyz> References: <20240412113620.84013-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 08/13] avcodec/dovi_rpudec: make `enable` also affect decoding 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qOzR0sBGYKpQ From: Niklas Haas This could be used by codecs to selectively disable parsing Dolby Vision RPUs, and is cheap to support. --- libavcodec/av1dec.c | 1 + libavcodec/dovi_rpu.h | 2 ++ libavcodec/dovi_rpudec.c | 6 ++++++ libavcodec/hevcdec.c | 1 + libavcodec/libdav1d.c | 1 + 5 files changed, 11 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 4c1405df77..20865b4f12 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -1551,6 +1551,7 @@ static void av1_decode_flush(AVCodecContext *avctx) static const AVOption av1_options[] = { { "operating_point", "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, AV1_MAX_OPERATING_POINTS - 1, VD }, + { "dolbyvision", "Decode Dolby Vision RPUs", OFFSET(dovi.enable), AV_OPT_TYPE_BOOL, {.i64 = 1 }, 0, 1, VD }, { NULL } }; diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index 3e80647422..8f8905b96b 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -37,6 +37,8 @@ typedef struct DOVIContext { * * For encoding, FF_DOVI_AUTOMATIC enables Dolby Vision only if * avctx->decoded_side_data contains an AVDOVIMetadata. + * + * For decoding, FF_DOVI_AUTOMATIC has the same meaning as 1. */ #define FF_DOVI_AUTOMATIC -1 int enable; diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c index 7c7eda9d09..978d5dfc2b 100644 --- a/libavcodec/dovi_rpudec.c +++ b/libavcodec/dovi_rpudec.c @@ -37,6 +37,9 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame) AVDOVIMetadata *dovi; size_t dovi_size, ext_sz; + if (!s->enable) + return 0; + if (!s->mapping || !s->color) return 0; /* incomplete dovi metadata */ @@ -306,6 +309,9 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, uint8_t use_nlq; uint8_t profile; + if (!s->enable) + return 0; + if (rpu_size < 5) goto fail; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 7825efe2e6..c622a48b94 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3694,6 +3694,7 @@ static const AVOption options[] = { AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR }, { "strict-displaywin", "stricly apply default display window size", OFFSET(apply_defdispwin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR }, + { "dolbyvision", "Decode Dolby Vision RPUs", OFFSET(dovi_ctx.enable), AV_OPT_TYPE_BOOL, {.i64 = 1 }, 0, 1, PAR }, { NULL }, }; diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 09fe767fb8..f9e1a181fc 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -674,6 +674,7 @@ static const AVOption libdav1d_options[] = { { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD | AV_OPT_FLAG_DEPRECATED }, { "oppoint", "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 31, VD }, { "alllayers", "Output all spatial layers", OFFSET(all_layers), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, + { "dolbyvision", "Decode Dolby Vision RPUs", OFFSET(dovi.enable), AV_OPT_TYPE_BOOL, {.i64 = 1 }, 0, 1, VD }, { NULL } };