From patchwork Wed Aug 9 17:05:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 43192 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b1b:b0:130:ccc6:6c4b with SMTP id l27csp100583pzh; Wed, 9 Aug 2023 10:05:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJ0fYmftS73GKJ0k6uQyyYwExYI0crKc91lIPXK3Lxi2CCuL3+BkMcB+E/qJoN9NbhZ/C7 X-Received: by 2002:a05:6512:3705:b0:4f8:5696:6bbc with SMTP id z5-20020a056512370500b004f856966bbcmr2053546lfr.29.1691600721029; Wed, 09 Aug 2023 10:05:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691600721; cv=none; d=google.com; s=arc-20160816; b=CDnG4V8uM2cqZHOk08mXljZlozcsmm3f4YTmLXUxnIoG2GuwMTH2OuZXpVdcQ2B1HF SEm17ED/bgGe7dUwq8EVH8x+26aV/Dd+/lzBx49tvrlklppVFA38Psl4DB6XWKoi+VoG q4sf+kOsQ333YIubHSqEc6HVcYMoagzeavjRdSrNd5S7qj8p23DUPYGyt31mFUx/zxJ5 JnzcbsiA8SyVMg8RPIKi3ZBYwrMh11FajveVxbmR0oK2/ToVXmKiORB+kf6XHMykLktX GZc7ip/KCkv2FEdA9PvXZDLK494yqIuk6O8QQ1ckk71OYohlumpc7A1h1oqtAr6VAfWk p3/A== 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=JK/9Q2a3wVhAGz6hu/uIqAVAnCMp231J9iytJNklw2w=; fh=Qwk25RKKSExhNuycMMj7kTYC1eti1Y95kg0/fk1yEig=; b=G4UA/+fjl7iHs5wCy9OCDOfQfX7UN+P125EclCJEzWl4PNiLu+BFXLy7tqKAMKvufw DrS6EBEYNmUSd6FcSmD0z8wBc6Ydmzxzs0jT3xhkFaNQyR4IZOEWRUEq29/g+bVv9Mdf A9z7nfC9hiG5ru8Dy1DY2I+4A0IYcW/XAkevv9p1zamjw3JdIDYlKXOIGr26D2XGkPOR UPMCZXABJULYoFAEcLdY12+/PK186b1vTUz7/gvPuqaB+3gLjO6ezP6u6YiviDicPlFE vtcOTLcv+hSNkcbt4JfAOChRCeHFN6SZdRx8PxDFzLu3kpXo8tIHu1bZmx0m7fIFCYRb aN/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=os+ml9CM; 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 u24-20020aa7d898000000b0052338778fd6si4701482edq.478.2023.08.09.10.05.15; Wed, 09 Aug 2023 10:05:20 -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=20221208 header.b=os+ml9CM; 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 6739F68C80A; Wed, 9 Aug 2023 20:05:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f173.google.com (mail-yb1-f173.google.com [209.85.219.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DAC568C5AD for ; Wed, 9 Aug 2023 20:05:05 +0300 (EEST) Received: by mail-yb1-f173.google.com with SMTP id 3f1490d57ef6-d45caf42d73so5506045276.2 for ; Wed, 09 Aug 2023 10:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691600703; x=1692205503; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pBM30t2L+73C8YzW41xV0+WZFjY4GZXBM8GMKOhYhDg=; b=os+ml9CMznymkrzrb0Wt+gNLMhuJf6au1jGEQ/gFzKLkKpqlxFBp3WuHaMDvWgTaks esHTu2m7AckKfwYaOufRJOE2tCTntONsVU5e6uKKtSAUYCfsRqOnDP9ZBGMQhXaLWtrt pclOgJwgNsHHdPZ8NgEZrHZSR1ZNkKUWGPmpM0321DrqlluLEabFBiLa79EWH114cjW/ YbTnZ2LgsSHLmsE7Vjok7O+judsrE22GWWyXqnOnY6UvI/5Uv+/12tExThr1nnyCYtTr 07naIZ9yhra93MH4XcyyIum5+ncwHSo+0UdKyJ2LBXvJuyj4vIq+mCK5K1P8oU8ZmDXf PzGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691600703; x=1692205503; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pBM30t2L+73C8YzW41xV0+WZFjY4GZXBM8GMKOhYhDg=; b=ebIoCKt0YsVEvpQbBsf1SZwSgu/O2uUg40rA1fUhJ0OPLsqHwQaO4kz8BHg7gl3qFd AJiqu2wYFaOhl7y+UQdo1YS3cAQV+/eCgTVnuPPGJBvFbjm4vWdj87BWnbx66hr7BKeC oVnWg+SDGFHUKfKo4X1H3WFpNOLeHwHZP3tbq7zL3+7dGH3ElasOxpBSd+yztXV2paAk pmE5AkMh6DydSkFFpqp+U3PCwRb9mXdSOYAuEov9OKpWKTQs3j2tZrtkogQIl5F71ixr AKORwBzLY3R5h5Z/+XLpKgMf42iRDVoHyOY4ip7VT7iRmF+HC2qxJhr3Eu50JQcOouPN oQOw== X-Gm-Message-State: AOJu0YyacyAWwZM/gQ/rrUDsYxvCYeMRx52QgYMpQk4FrSDniP9pyPeI h8LfWWgkYJFvzNj89QmXqNcNMkCDrHE= X-Received: by 2002:a25:cc0d:0:b0:ced:974a:1aae with SMTP id l13-20020a25cc0d000000b00ced974a1aaemr3316702ybf.58.1691600703455; Wed, 09 Aug 2023 10:05:03 -0700 (PDT) Received: from nark.. ([146.70.198.174]) by smtp.gmail.com with ESMTPSA id p9-20020a0ccb89000000b006365b23b5dfsm4530395qvk.23.2023.08.09.10.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 10:05:03 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Aug 2023 13:05:00 -0400 Message-ID: <20230809170500.24407-1-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4UNGsapv53T3 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. Signed-off-by: quietvoid --- libavcodec/dovi_rpu.c | 45 ++++++++++++++++++++++++++++++++++++++++--- libavcodec/dovi_rpu.h | 3 ++- libavcodec/hevcdec.c | 3 ++- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c index dd38936552..9ada0aceec 100644 --- a/libavcodec/dovi_rpu.c +++ b/libavcodec/dovi_rpu.c @@ -22,6 +22,7 @@ */ #include "libavutil/buffer.h" +#include "libavutil/crc.h" #include "dovi_rpu.h" #include "golomb.h" @@ -191,13 +192,17 @@ static inline int64_t get_se_coef(GetBitContext *gb, const AVDOVIRpuDataHeader * } \ } 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}; DOVIVdrRef *vdr; int ret; + size_t actual_rpu_size; + uint8_t trailing_zeroes = 0; + uint8_t nal_prefix; uint8_t rpu_type; uint8_t vdr_seq_info_present; @@ -205,7 +210,22 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size) uint8_t use_prev_vdr_rpu; uint8_t use_nlq; uint8_t profile; - if ((ret = init_get_bits8(gb, rpu, rpu_size)) < 0) + + uint32_t rpu_data_crc32; + uint32_t computed_crc32; + + for (int i = rpu_size - 1; i > 0; i--) { + if (!rpu[i]) { + trailing_zeroes++; + } else { + break; + } + } + + actual_rpu_size = rpu_size - trailing_zeroes; + + /* Exclude trailing byte (0x80) from reader */ + if ((ret = init_get_bits8(gb, rpu, actual_rpu_size - 1)) < 0) return ret; /* RPU header, common values */ @@ -440,7 +460,26 @@ 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 */ + /* Skip unsupported until CRC32 */ + skip_bits_long(gb, get_bits_left(gb) - 32); + + if (err_recognition & AV_EF_CRCCHECK) { + rpu_data_crc32 = get_bits_long(gb, 32); + + /* Verify CRC32, buffer excludes the prefix, CRC32 and trailing byte */ + computed_crc32 = av_bswap32(av_crc(av_crc_get_table(AV_CRC_32_IEEE), + -1, rpu + 1, actual_rpu_size - 6)); + + if (rpu_data_crc32 != computed_crc32) { + av_log(s->logctx, AV_LOG_ERROR, + "RPU CRC mismatch! Expected %"PRIu32", received %"PRIu32"\n", + rpu_data_crc32, computed_crc32); + + if (err_recognition & AV_EF_EXPLODE) + goto fail; + } + } + return 0; fail: diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index f6ca5bbbc5..2b993a72c6 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -77,7 +77,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 df40c91ba6..81b1a84625 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3182,7 +3182,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");