From patchwork Sun Feb 25 11:44:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 46518 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp835835pzb; Sun, 25 Feb 2024 03:45:17 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXYRcKCDLg1A/1uva8Wuhu9O4+LaZdTX3+RkDHbUYIe/NRamPlDOec1oPYXCNtSkCYD06VniAEwBvFG5mo8wWrbiC2A1aZC+zBPqg== X-Google-Smtp-Source: AGHT+IFBxq8t4nMMeCwBln7AKkOe3EkNQk8CqDhA1+3SRsG5S6xazUueXREh6fsuu4yde1QPAypE X-Received: by 2002:a50:d492:0:b0:565:a4dc:b288 with SMTP id s18-20020a50d492000000b00565a4dcb288mr2002162edi.4.1708861516801; Sun, 25 Feb 2024 03:45:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708861516; cv=none; d=google.com; s=arc-20160816; b=S9wbQa1YgqQgtK/+RZMLCNEQXZLbAK9hPlzSbLYYtfxcyemktenXnHLkSh6nelHHZF z6m9TX+quu7cQYoRyMVHndfUkES+lgJSazcey2rtHxunmfsFV+74pO9HvhWXmjt/ykF6 IxkVrt63xlY3n/o96bg9AR+nOn1zn4I4MxJ5Vdl9fKo0xGZywR10Dc9h0HtOUGLSyhW0 pRJGUmzjTBbOTKSjjcc9xL6xhy6pVc7CvpoEahXsYwHHaLmDQ0kDfUkx6HrBoLmbE1bN Pyb2FruT7e+5sbrhPLNirV/JLJ7hPnyYyWJFFTDU+BZh3pX2AzVCCqnUxjgt6S6IMQRj wfNg== 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=h2v7LFofIInDDU3oBKfdw8gTs/KK14+/KUopDujYTLw=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=njFZfKZch3YHtFHt1nTb7iFJrf4G08nUYN59MFsqXBqekW/0fEPeaDTjtkuDuulxkb UGSfAOqjHEBJuX/NMnl9XZ30XO2bha3uUxZlHzbLd8mNaXSVeAJu6ZCmvPxl6oBsXUDy z1dq7UpTDcakuqtZFhDXup5fvPYRGnYVbi4eH/d7wsb1DMom/2hXlOadMg7543UYDZvt U44To7PJwieMkoskdJZP7v3UHeDQLqR1wy+N/VWLhGibZXsRoxsltXfJaen9IDccuHrh rteMFJR9ny5htNBU6Su3EoaQNMWDczofdkzQrTYkDoo8donjlgCcTrbnhoe0WhVfmqpM u9yg==; 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="AG/iHUYr"; 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 a19-20020a05640213d300b00565aec519f8si1058165edx.191.2024.02.25.03.45.16; Sun, 25 Feb 2024 03:45:16 -0800 (PST) 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="AG/iHUYr"; 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 9AD7268C6D3; Sun, 25 Feb 2024 13:45:04 +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 E479E68C69F for ; Sun, 25 Feb 2024 13:44:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1708861495; bh=iLkfkvfB5KD1Yy/5WOkrxf1LtXtVoqpKduf/4gCs87w=; h=From:To:Cc:Subject:Date:From; b=AG/iHUYrQchsYfdmTXQJSjRq+MJu8gF5MUNl1IZHbtrdKf/EVNG7+XzgUzj+UFN2S a19QU9TM1MiSzb5d9np/1LATQTPBvHET5sEbM/QGfWzUhekFjHqGfAkULSZmsYJnj4 PWAswJXbduPdBnJtaiPYVf4tF+J9ddv1YTdPaKq4= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 240B540E23; Sun, 25 Feb 2024 12:44:55 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Feb 2024 12:44:49 +0100 Message-ID: <20240225114451.27645-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.43.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/dovi_rpu: implement support for profile 10 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: LzLdaFyMxHV5 From: Niklas Haas Instead of the nal_prefix, this profile inside wraps the RPU inside an EMDF header, as specified in ETSI TS 102 366. This particular usage is supposedly specified in ETSI TS 103 572, at least according to European Patent EP 3 588 964 A1, but I could not find any references to DV RPUs in the former. It's worth pointing out that the EMDF container is not byte-aligned, meaning that payloads are delivered at arbitrary byte boundaries. Hence the reason for doing it inside ff_dovi_rpu_parse, which already uses a bitstream reader, rather than splitting off the container in a separate stage. (Plus, we hard-code the DV-specific payload ID) Magic values were taken from a combination of the sources below, all of which agree about what the specific EMDF header should look like. In fact, they all hard-code a very *specific* header sequence, but I wanted to go the extra mile and at least properly skip the variable fields - even though the non-existent Dolby Vision specification probably specifies that they all must be 0. This is probably overkill. Validated and tested using sample files from the merge request linked below. Relevant links: - https://www.etsi.org/deliver/etsi_ts/102300_102399/102366/01.04.01_60/ts_102366v010401p.pdf - https://patentimages.storage.googleapis.com/8a/0b/da/28294acaed2182/EP3588964A1.pdf - https://www.etsi.org/deliver/etsi_ts/103500_103599/103572/01.03.01_60/ts_103572v010301p.pdf - https://github.com/rockchip-linux/mpp/blob/fdeb8c378b79d4b4ef80457e4431815de89dc417/mpp/codec/dec/av1/av1d_cbs.c#L2378 - https://github.com/elginsk8r/android_kernel_amlogic_linux-4.9/blob/23a4c38bf06ef34821e476a8edddbf9213712c8a/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c#L5638 - https://gitlab.com/mbunkus/mkvtoolnix/-/merge_requests/2254 --- libavcodec/dovi_rpu.c | 68 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c index a6b23f4dd11..c7cdd65a2f2 100644 --- a/libavcodec/dovi_rpu.c +++ b/libavcodec/dovi_rpu.c @@ -174,6 +174,18 @@ static inline int64_t get_se_coef(GetBitContext *gb, const AVDOVIRpuDataHeader * return 0; /* unreachable */ } +static inline unsigned get_variable_bits(GetBitContext *gb, int n) +{ + unsigned int value = get_bits(gb, n); + int read_more = get_bits1(gb); + while (read_more) { + value = (value + 1) << n; + value += get_bits(gb, n); + read_more = get_bits1(gb); + }; + return value; +} + #define VALIDATE(VAR, MIN, MAX) \ do { \ if (VAR < MIN || VAR > MAX) { \ @@ -200,9 +212,59 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size) if ((ret = init_get_bits8(gb, rpu, rpu_size)) < 0) return ret; - /* RPU header, common values */ - nal_prefix = get_bits(gb, 8); - VALIDATE(nal_prefix, 25, 25); + /* Container header */ + if (s->dv_profile == 10 /* dav1.10 */) { + /* DV inside AV1 re-uses EMDF container, parse header */ + int emdf_version, key_id, emdf_payload_id, emdf_payload_size, smploffste; + emdf_version = get_bits(gb, 2); + if (emdf_version == 3) + emdf_version += get_variable_bits(gb, 2); + key_id = get_bits(gb, 3); + if (key_id == 7) + key_id += get_variable_bits(gb, 3); + emdf_payload_id = get_bits(gb, 5); + if (emdf_payload_id == 0x1F) + emdf_payload_id += get_variable_bits(gb, 5); + + /* Magic values taken from amlogic and rockchip drivers, and also + * match values found in practice (and validated in hardware) */ + VALIDATE(key_id, 6, 6); + VALIDATE(emdf_payload_id, 256, 256); + + /* Note: In theory, there could be multiple payloads, and we should + * skip over the unused payloads until we find the one we're interested + * in. But this capability does not seem to be used in practice, so + * the DV-specific usage of EMDF probably requires only one payload + * per T.35 OBU */ + + /* Skip emdf_payload_config() */ + if ((smploffste = get_bits1(gb))) + skip_bits(gb, 11 + 1); + if (get_bits1(gb)) /* duratione */ + get_variable_bits(gb, 11); + if (get_bits1(gb)) /* groupide */ + get_variable_bits(gb, 2); + if (get_bits1(gb)) /* codecdatae */ + skip_bits(gb, 8); + if (!get_bits1(gb)) { /* discard_unknown_payload */ + int payload_frame_aligned; + if (!smploffste) { + if ((payload_frame_aligned = get_bits1(gb))) + skip_bits(gb, 1 + 1); + } + if (smploffste || payload_frame_aligned) + skip_bits(gb, 5 + 2); + } + + emdf_payload_size = get_variable_bits(gb, 8); + if (emdf_payload_size * 8 > get_bits_left(gb)) + return AVERROR_INVALIDDATA; + } else { + nal_prefix = get_bits(gb, 8); + VALIDATE(nal_prefix, 25, 25); + } + + /* RPU header */ rpu_type = get_bits(gb, 6); if (rpu_type != 2) { av_log(s->logctx, AV_LOG_WARNING, "Unrecognized RPU type "