From patchwork Sat Mar 23 17:37:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47378 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp328572pzb; Sat, 23 Mar 2024 10:38:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUi6YSQq5AXhxRZ7uI63y7PY3CH1gk+THPJkmunzCEgkz2SJufBddvzj4PNfr4TqFK4Y2hXLZRiWooLTrEe+qu50VDiTeVveWUFMg== X-Google-Smtp-Source: AGHT+IHeO4v0y3WMjMpbTZB+wq0t4ekvuVq9m2kb46miQqJp1M97FFTYCRWLAX/OeYKaZBqYzMdR X-Received: by 2002:a17:907:970a:b0:a47:4750:32bf with SMTP id jg10-20020a170907970a00b00a47475032bfmr1491134ejc.2.1711215473915; Sat, 23 Mar 2024 10:37:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711215473; cv=none; d=google.com; s=arc-20160816; b=JAqHmpM98jLK3TYlOoL6q0KGxlx+5+myK+qZgBVu6PdRHVGTfO5obuSM7BOAtYXJIC D0pciICi2O/7Bma+cWAPPD2cKeQKhudUmOrTxuBcrNajItaws+SPhbIDdW2eUYwnJXZd ff/K2iHN3K1Hhj0iYrmainsh0p5Ho3MjJeqiFt6iY8wSdSogU4jZbhKaPKbDvMIluu6S GoiaXdpH5+1EIWJOcvWZUty4sddGPXqoqcr7HRAAig8guym3N7c34PztsjCykv6b0AV5 nsUtJH8hyhUSR8a6IdAaYe2RHdvFpwEjtcu0M8JDCqv21x8TvM+rPtI2jBIoIoMH20hu 4/Nw== 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=VXNkekXfBGYKp0uSisL6zdZ2Daf0Cl6+R+gnZcQLosE=; fh=C56SNERGsx7JRMjLZiHmpTAKnRl/jfaA+FIG9zHupRY=; b=hncbtNJJ6bKtLdMJHA7d03Wy2a1ikx+E8vbzipVKqEo+bLJ8xhDyiVm9d+ILCkZaNV I2/LfZ3eZB6OVQ6v2uKE6WgFg+G8FrIsh24eEHYT55AEULSnsvytKqZCrCe4sykvHXTW BzUEHEEDFctIUWUFeZuSseVsR46IiiRuV9dXYoiTIK1w4TKJbd+G9qU7xcZcYw782xm8 fA+LWn5lceq12lw+26rnm7C/vYd2UE8HsZKe7aV+67SgOAWnL5/8MZenGm+nUaxXUjJP Ur4FtfzT3g+2+Aj3LcQFXI7FAskyvlWXNxwdcGrRErDp1Kyuki3Aas4qGIk2BoGPsi83 Hapw==; 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=KHbY1YaM; 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 v24-20020a1709064e9800b00a473a9525a8si908418eju.83.2024.03.23.10.37.53; Sat, 23 Mar 2024 10:37:53 -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=KHbY1YaM; 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 E0E9868D3BA; Sat, 23 Mar 2024 19:37:48 +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 1541F68D316 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=MXsJoaPbcoJS8laj3T/eCHtsE1/le0QYVLof2JQULXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KHbY1YaM8Y8cZKtU6SpN7XSgRXmHhScCMzoUHnYY1/OQa8D11KB7gJragWlkGv6Y9 74MIBbQdKejDvKlxj9lkCBIDuQyw8/7WA7JAMsUhYlTl6IuTTC0YMiTf5VO67hcne/ Bv+//yWIn48q/lXAhjyF+a53ty/TWumqWZcsCVtI= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id B6724429D1; Sat, 23 Mar 2024 18:37:41 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 18:37:33 +0100 Message-ID: <20240323173735.26224-4-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240323173735.26224-1-ffmpeg@haasn.xyz> References: <20240323173735.26224-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/dovi_rpu: verify RPU data CRC32 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: SjThsB7Xkzki From: Niklas Haas The Dolby Vision RPU contains a CRC32 to validate the payload against. The implementation is CRC32/MPEG-2. The CRC is only verified with the AV_EF_CRCCHECK flag. Co-authored-by: quietvoid --- libavcodec/av1dec.c | 3 ++- libavcodec/dovi_rpu.c | 18 ++++++++++++++++-- libavcodec/dovi_rpu.h | 3 ++- libavcodec/hevcdec.c | 3 ++- libavcodec/libdav1d.c | 3 ++- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 4d074c39087..bff921a12b2 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -1001,7 +1001,8 @@ static int export_itut_t35(AVCodecContext *avctx, AVFrame *frame, provider_oriented_code != 0x800) break; - ret = ff_dovi_rpu_parse(&s->dovi, gb.buffer, gb.buffer_end - gb.buffer); + ret = ff_dovi_rpu_parse(&s->dovi, gb.buffer, gb.buffer_end - gb.buffer, + avctx->err_recognition); if (ret < 0) { av_log(avctx, AV_LOG_WARNING, "Error parsing DOVI OBU.\n"); break; // ignore diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c index 24a1cdf39a8..cd54c8716dc 100644 --- a/libavcodec/dovi_rpu.c +++ b/libavcodec/dovi_rpu.c @@ -22,6 +22,7 @@ */ #include "libavutil/buffer.h" +#include "libavutil/crc.h" #include "avcodec.h" #include "dovi_rpu.h" @@ -197,7 +198,8 @@ static inline unsigned get_variable_bits(GetBitContext *gb, int n) } \ } while (0) -int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size) +int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, + int err_recognition) { AVDOVIRpuDataHeader *hdr = &s->header; GetBitContext *gb = &(GetBitContext){0}; @@ -268,6 +270,19 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size) rpu_size--; } + if (!rpu_size || rpu[rpu_size - 1] != 0x80) + goto fail; + + if (err_recognition & AV_EF_CRCCHECK) { + uint32_t crc = av_bswap32(av_crc(av_crc_get_table(AV_CRC_32_IEEE), + -1, rpu, rpu_size - 1)); /* exclude 0x80 */ + if (crc) { + av_log(s->logctx, AV_LOG_ERROR, "RPU CRC mismatch: %X\n", crc); + if (err_recognition & AV_EF_EXPLODE) + goto fail; + } + } + if ((ret = init_get_bits8(gb, rpu, rpu_size)) < 0) return ret; @@ -508,7 +523,6 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size) color->source_diagonal = get_bits(gb, 10); } - /* FIXME: verify CRC32, requires implementation of AV_CRC_32_MPEG_2 */ return 0; fail: diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index 506974a74bf..f88fbf9b558 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -79,7 +79,8 @@ void ff_dovi_update_cfg(DOVIContext *s, const AVDOVIDecoderConfigurationRecord * * * Returns 0 or an error code. */ -int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size); +int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, + int err_recognition); /** * Attach the decoded AVDOVIMetadata as side data to an AVFrame. diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 76aa6b45882..ebd70eda234 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3193,7 +3193,8 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) return AVERROR(ENOMEM); memcpy(s->rpu_buf->data, nal->raw_data + 2, nal->raw_size - 2); - ret = ff_dovi_rpu_parse(&s->dovi_ctx, nal->data + 2, nal->size - 2); + ret = ff_dovi_rpu_parse(&s->dovi_ctx, nal->data + 2, nal->size - 2, + s->avctx->err_recognition); if (ret < 0) { av_buffer_unref(&s->rpu_buf); av_log(s->avctx, AV_LOG_WARNING, "Error parsing DOVI NAL unit.\n"); diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 17b0743cf0c..af95e46c343 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -567,7 +567,8 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) provider_oriented_code != 0x800) break; - res = ff_dovi_rpu_parse(&dav1d->dovi, gb.buffer, gb.buffer_end - gb.buffer); + res = ff_dovi_rpu_parse(&dav1d->dovi, gb.buffer, gb.buffer_end - gb.buffer, + c->err_recognition); if (res < 0) { av_log(c, AV_LOG_WARNING, "Error parsing DOVI OBU.\n"); break; // ignore