From patchwork Sat Mar 23 19:19:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp369131pzb; Sat, 23 Mar 2024 12:25:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW7sYUQ2qJ8ZcCeAfdVZr+W4r5YCKpMt/RuVbsIR5J4rr/HcdkZ60cURM6hbQgWS6sVbmBX/SqVpxYJi4lD/jef4yqCBiAq4UlOQA== X-Google-Smtp-Source: AGHT+IHqpfLv2hjXisVSO7Xn4PI73L64BznGHvCy2q3rD7gChP6Y/T7QkfohZoFRGV/0XemVnp8S X-Received: by 2002:a17:906:36d9:b0:a46:ddba:56ee with SMTP id b25-20020a17090636d900b00a46ddba56eemr1938816ejc.4.1711221931287; Sat, 23 Mar 2024 12:25:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711221931; cv=none; d=google.com; s=arc-20160816; b=Ror2TNHI7N6v6msvc85C+HTCEVR9QqwLdvzsYEFsmHfSoemCVOnnbINGVXOzrw6Sj/ ReaZEuZGJydv0SEoK64kM6vuNf33Wxl3yyOI9gOIXk1YIfdOjWFieh+y3vytvpboeL+t HijU4XOO0f/qUN3UtMckD4LxfL3FJJnk2P2oPA9+SsNkZ7W7DHgifa0jqiTtMfbx2NTI iUkFsHxiPHp4tbBYlRRJ6B8AkrQ3pqvs20O78NfXY1pfgXC91Sxet3Jv1fqqkx2DK54w teqck1dsZAccmyP6hEzyRSWFrkEUyAGX7a3I1O3cPhpRuQUIr2a3nPC49kfvyb240FmC wpQQ== 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=4u2n6M7/weDo6VBahWyLELGKnNXMI7zPVmXVoyHI4/o=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=0G19d79vQbbqvmEnbuo6c4wdebdqX72hauSRmLgGB3bZYQUl+kig76A5B4NZ8iUd1C tNjGY2Wvmv9gbP9lIa0atLbfcVF+OmJJyd+gFSvg2zmM4dUEQ1EXwUwZm9yU2KcYwhVb /1GkDmwW284xX/xEjqYjUs5OQqBHpLatQL0eSl4tiOXI2JmwpfN/BZgGT/yE6RJmm6w9 Mt3Dj7cTiBkFl6nvRWOGO/a/V3jlQLnM9D6LY+x6W2fRliOxYYSMEGpvQmcmVd7FtJti 7Y78/mjl9QRRrhZwfSAbsRgVFFqFQU/TMEWWUWyCSgKf146XS21EneKr6nLYxROaiWSG mtmA==; 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=vnJcucbN; 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 u20-20020a170906409400b00a470e13d19fsi1037662ejj.872.2024.03.23.12.25.30; Sat, 23 Mar 2024 12:25:31 -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=vnJcucbN; 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 8EAD768D592; Sat, 23 Mar 2024 21:24:55 +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 A50B668D10E for ; Sat, 23 Mar 2024 21:24:44 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1711221884; bh=UXUPVNHSyClfzORZ7X33BzdoW+/XEx9N8DW/hyHozkE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vnJcucbNzkWBjh5ZtU5sHFup6VckTap85CMTUvt2HMJZs+BdcPzsNG9k1qW2GUMKe rFm5iDzF3lbf9YZILnW7sUfRb8xTKQBHC0dyT3357g0r/0xwpnBxDwHASfi9Th6ffP cm//cUjPIqlfNLt1zBQDR1y//m+Wmj+qSTh45Bjw= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 77D53429E8; Sat, 23 Mar 2024 20:24:44 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 20:19:53 +0100 Message-ID: <20240323192440.38264-5-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240323192440.38264-1-ffmpeg@haasn.xyz> References: <20240323192440.38264-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/8] avcodec/dovi_rpu: strip container in separate step 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: y95EBrHnpbvB From: Niklas Haas This ensures that `gb` in the following section is fully byte-aligned, points at the start of the actual RPU, and ends on the CRC terminator. This is important for both calculation of the CRC, as well as dovi extension block parsing (which aligns to byte boundaries in various places). --- libavcodec/dovi_rpu.c | 48 +++++++++++++++++++++++++++++++++++-------- libavcodec/dovi_rpu.h | 2 ++ 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c index 53f8c288db0..d792a429217 100644 --- a/libavcodec/dovi_rpu.c +++ b/libavcodec/dovi_rpu.c @@ -23,6 +23,7 @@ #include "libavutil/buffer.h" +#include "avcodec.h" #include "dovi_rpu.h" #include "golomb.h" #include "get_bits.h" @@ -45,6 +46,7 @@ void ff_dovi_ctx_unref(DOVIContext *s) { for (int i = 0; i < FF_ARRAY_ELEMS(s->vdr); i++) ff_refstruct_unref(&s->vdr[i]); + av_free(s->rpu_buf); *s = (DOVIContext) { .logctx = s->logctx, @@ -59,6 +61,9 @@ void ff_dovi_ctx_flush(DOVIContext *s) *s = (DOVIContext) { .logctx = s->logctx, .dv_profile = s->dv_profile, + /* preserve temporary buffer */ + .rpu_buf = s->rpu_buf, + .rpu_buf_sz = s->rpu_buf_sz, }; } @@ -202,17 +207,17 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size) DOVIVdr *vdr; int ret; - uint8_t nal_prefix; uint8_t rpu_type; uint8_t vdr_seq_info_present; uint8_t vdr_dm_metadata_present; uint8_t use_prev_vdr_rpu; uint8_t use_nlq; uint8_t profile; - if ((ret = init_get_bits8(gb, rpu, rpu_size)) < 0) - return ret; - /* Container header */ + if (rpu_size < 5) + goto fail; + + /* Container */ if (s->dv_profile == 10 /* dav1.10 */) { /* DV inside AV1 re-uses an EMDF container skeleton, but with fixed * values - so we can effectively treat this as a magic byte sequence. @@ -229,18 +234,43 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size) * discard_unknown_payload : f(1) = 1 */ const unsigned header_magic = 0x01be6841u; - unsigned header, emdf_payload_size; - header = get_bits_long(gb, 27); - VALIDATE(header, header_magic, header_magic); + unsigned emdf_header, emdf_payload_size, emdf_protection; + if ((ret = init_get_bits8(gb, rpu, rpu_size)) < 0) + return ret; + emdf_header = get_bits_long(gb, 27); + VALIDATE(emdf_header, header_magic, header_magic); emdf_payload_size = get_variable_bits(gb, 8); VALIDATE(emdf_payload_size, 6, 512); if (emdf_payload_size * 8 > get_bits_left(gb)) return AVERROR_INVALIDDATA; + + /* The payload is not byte-aligned (off by *one* bit, curse Dolby), + * so copy into a fresh buffer to preserve byte alignment of the + * RPU struct */ + av_fast_padded_malloc(&s->rpu_buf, &s->rpu_buf_sz, emdf_payload_size); + if (!s->rpu_buf) + return AVERROR(ENOMEM); + for (int i = 0; i < emdf_payload_size; i++) + s->rpu_buf[i] = get_bits(gb, 8); + rpu = s->rpu_buf; + rpu_size = emdf_payload_size; + + /* Validate EMDF footer */ + emdf_protection = get_bits(gb, 5 + 12); + VALIDATE(emdf_protection, 0x400, 0x400); } else { - nal_prefix = get_bits(gb, 8); - VALIDATE(nal_prefix, 25, 25); + /* NAL RBSP with prefix and trailing zeroes */ + VALIDATE(rpu[0], 25, 25); /* NAL prefix */ + rpu++; + rpu_size--; + /* Strip trailing padding bytes */ + while (rpu_size && rpu[rpu_size - 1] == 0) + rpu_size--; } + if ((ret = init_get_bits8(gb, rpu, rpu_size)) < 0) + return ret; + /* RPU header */ rpu_type = get_bits(gb, 6); if (rpu_type != 2) { diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index 51c5fdbb879..755171c9237 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -48,6 +48,8 @@ typedef struct DOVIContext { * Private fields internal to dovi_rpu.c */ struct DOVIVdr *vdr[DOVI_MAX_DM_ID+1]; ///< RefStruct references + uint8_t *rpu_buf; ///< temporary buffer + unsigned rpu_buf_sz; uint8_t dv_profile; } DOVIContext;