From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 79EE84C0A9
for <ffmpegdev@gitmailbox.com>; Tue, 1 Apr 2025 17:18:31 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6CC4E687DAD;
Tue, 1 Apr 2025 20:16:52 +0300 (EEST)
Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com
[209.85.214.174])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1D35687D99
for <ffmpeg-devel@ffmpeg.org>; Tue, 1 Apr 2025 20:16:48 +0300 (EEST)
Received: by mail-pl1-f174.google.com with SMTP id
d9443c01a7336-227c7e57da2so87817585ad.0
for <ffmpeg-devel@ffmpeg.org>; Tue, 01 Apr 2025 10:16:48 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1743527807; x=1744132607; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=USQECylrU3yXwYs6EXrxlSS8z6BX6PuFBkQDK2NXBWM=;
b=KjNy/lKjOHvjC7t0WEL0nH+PA2L6cWSFKyCH8ET+5Ts2/Nz0TAsB1VCVMn6fpL+f2h
RFEWAJt35SQ+dui180IzYxZ66BjiJi2HO49MF+fbXIBjDaiko95KA2EPOQ/IH5axx+2c
usq8T8E1IjEFWrAqAZ+UdVRvCEUHbv9RICHbTtW9sPx08S+YTT5VbnY1p/6ih17wqXYR
UBmlTNvz4p6G+vzdujIodLaEZsrjX7o+1WavLjHWUiyRPKhLIWAANpm8jgAHhlgowCqz
WzrYTL8tqt8xa5RhWzT3mXX0/mWPZKsb4iJhhf0GWa6k4St+ZD0MY3C8LDEugwdiKCUt
djVg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743527807; x=1744132607;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=USQECylrU3yXwYs6EXrxlSS8z6BX6PuFBkQDK2NXBWM=;
b=cfM7nJGqm9fTXnD5iJfYk3DaOJGmjbb8JQjeqp0UOIyyz/8w9wVdnrzl3MHy77N1ff
3L9aFXLHZ4waH2STy0X3ZLiBKGR2zgEKo59HbhcfnC2bkc/+kjwGu7OhY8sKPzcdlHrV
4jLOiJmj7BLtBDjDXA6bYK8MQ2/8SEWGwfm6PWXLe0oyo8LJeO2pSkdIWCxEhja8K2tj
zlCFoQm7ub3T7XRAocgAwo6f5gmpnTvBoQC1G0ABmeBES9b9SGI2eFVoGkou6sFdo0/g
jWMQaK1C7OMzt+pJE9XbTPmPr7HsdgD7E+bi+dYaqK4v4nzrMROzK+Wz6JvjyE0bKfp7
jXZQ==
X-Gm-Message-State: AOJu0Yz9gQPrgvRv+pozWaqYaWPR5FJFSn995WzdoDk9tyBLrAIQPFIv
yQvphXc9T4VBBnrdAutJRHT6aDb0tyC6HsMsVtwUI2gaEWl+rHP/GaZEmfYz0hA=
X-Gm-Gg: ASbGncsN5ZmrBdDFsZXiHBi/g3VHgsQjri/RNWwMQPxAFoFsiNl5kywgkX3fnV756vY
vwObdxp5IF5ZA3JIum5B8a/c4/nTBX4s/E2RIx1+Ost/pM56lidzrEYz5kB5/cBlYESNsjRvy5K
a2fM++7Md3JHc4PoKrWyC1JhaZPoBRZ0FRCsjStgb/8Pg2TAHW41dBJeAUgUo82PZZWE1vN46hm
qSX9UvFNrncwqradXCLnzZZMbtn2GllG1IueBWSMROFimwg9PN0RAq2a4F/W8kXy1AVy02OTw5N
TDiNquvBIPGYnRPMVf8/QLD3cr6caAL61AQHc3GpPZ5XYcpzPTypN1/wopheCtM4WQ==
X-Google-Smtp-Source: AGHT+IEATyvQOQaUUwPovISqYPSssDy7D5oRP/Y4s0G7KmqPq65bbMIBCTrq4n1d5KJylvmZBrnSBw==
X-Received: by 2002:a17:902:e887:b0:223:f408:c3f8 with SMTP id
d9443c01a7336-2292f960348mr231847075ad.14.1743527806683;
Tue, 01 Apr 2025 10:16:46 -0700 (PDT)
Received: from localhost.localdomain ([124.79.129.75])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-2291eee0bafsm90902495ad.90.2025.04.01.10.16.45
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 01 Apr 2025 10:16:46 -0700 (PDT)
From: toqsxw@gmail.com
X-Google-Original-From: toqsxw@outlook.com
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 2 Apr 2025 01:16:07 +0800
Message-ID: <20250401171616.1378-10-toqsxw@outlook.com>
X-Mailer: git-send-email 2.44.0.windows.1
In-Reply-To: <20250401171616.1378-1-toqsxw@outlook.com>
References: <20250401171616.1378-1-toqsxw@outlook.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v1 10/19] avcodec/vvcdec: verify picture hash
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Wu Jianhua <toqsxw@outlook.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250401171616.1378-10-toqsxw@outlook.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: Wu Jianhua <toqsxw@outlook.com>
Signed-off-by: Wu Jianhua <toqsxw@outlook.com>
---
libavcodec/vvc/dec.c | 16 +++++++++++++++-
libavcodec/vvc/sei.c | 10 ++++++++++
libavcodec/vvc/sei.h | 3 +++
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c
index 4c0d08440a..6c36eb553e 100644
--- a/libavcodec/vvc/dec.c
+++ b/libavcodec/vvc/dec.c
@@ -1079,7 +1079,21 @@ static int frame_end(VVCContext *s, VVCFrameContext *fc)
}
}
- return ret;
+ if (!s->avctx->hwaccel && s->avctx->err_recognition & AV_EF_CRCCHECK) {
+ VVCSEI *sei = &fc->sei;
+ if (sei->picture_hash.present) {
+ ret = ff_vvc_sei_verify_hash(sei, fc->ref->frame, fc->ps.pps->width, fc->ps.pps->height);
+ if (ret < 0) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Verifying checksum for frame with decoder_order %d: failed\n",
+ (int)fc->decode_order);
+ if (s->avctx->err_recognition & AV_EF_EXPLODE)
+ return ret;
+ }
+ }
+ }
+
+ return 0;
}
static int wait_delayed_frame(VVCContext *s, AVFrame *output, int *got_output)
diff --git a/libavcodec/vvc/sei.c b/libavcodec/vvc/sei.c
index 2d81ae5908..c955d9921f 100644
--- a/libavcodec/vvc/sei.c
+++ b/libavcodec/vvc/sei.c
@@ -136,5 +136,15 @@ int ff_vvc_sei_replace(VVCSEI *dst, const VVCSEI *src)
void ff_vvc_sei_reset(VVCSEI *s)
{
ff_h2645_sei_reset(&s->common);
+ ff_h274_hash_freep(&s->hash_ctx);
s->picture_hash.present = 0;
}
+
+int ff_vvc_sei_verify_hash(VVCSEI *s, const AVFrame *frame, const int coded_width, const int coded_height)
+{
+ const int ret = ff_h274_hash_init(&s->hash_ctx, s->picture_hash.hash_type);
+ if (ret < 0)
+ return ret;
+
+ return ff_h274_hash_verify(s->hash_ctx, &s->picture_hash, frame, coded_width, coded_height);
+}
diff --git a/libavcodec/vvc/sei.h b/libavcodec/vvc/sei.h
index 6e4855bf60..a8aedc2837 100644
--- a/libavcodec/vvc/sei.h
+++ b/libavcodec/vvc/sei.h
@@ -36,6 +36,8 @@
typedef struct VVCSEI {
H2645SEI common;
H274SEIPictureHash picture_hash;
+
+ H274HashContext *hash_ctx;
} VVCSEI;
struct VVCFrameContext;
@@ -43,5 +45,6 @@ struct VVCFrameContext;
int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameContext *fc);
int ff_vvc_sei_replace(VVCSEI *dst, const VVCSEI *src);
void ff_vvc_sei_reset(VVCSEI *s);
+int ff_vvc_sei_verify_hash(VVCSEI *s, const AVFrame *frame, int coded_width, int coded_height);
#endif /* AVCODEC_VVC_SEI_H */
--
2.44.0.windows.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".