[FFmpeg-cvslog] avcodec/vvcdec: verify picture hash

[Wu Jianhua]

ffmpeg | branch: master | Wu Jianhua <toqsxw at outlook.com> | Sun Apr 27 19:44:41 2025 +0800| [23e991231599352fa76135eef6f9212ccb9f6ec6] | committer: Nuo Mi

avcodec/vvcdec: verify picture hash

Signed-off-by: Wu Jianhua <toqsxw at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23e991231599352fa76135eef6f9212ccb9f6ec6
---

 libavcodec/vvc/dec.c | 21 ++++++++++++++++++++-
 libavcodec/vvc/dec.h |  2 ++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c
index f66dc74b6c..381b42c421 100644
--- a/libavcodec/vvc/dec.c
+++ b/libavcodec/vvc/dec.c
@@ -1096,7 +1096,25 @@ 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) {
+            int ret = ff_h274_hash_init(&s->hash_ctx, sei->picture_hash.hash_type);
+            if (ret < 0)
+                return ret;
+
+            ret = ff_h274_hash_verify(s->hash_ctx, &sei->picture_hash, 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)
@@ -1224,6 +1242,7 @@ static av_cold int vvc_decode_free(AVCodecContext *avctx)
             frame_context_free(s->fcs + i);
         av_free(s->fcs);
     }
+    ff_h274_hash_freep(&s->hash_ctx);
     ff_vvc_ps_uninit(&s->ps);
     ff_cbs_close(&s->cbc);
 
diff --git a/libavcodec/vvc/dec.h b/libavcodec/vvc/dec.h
index b159863b31..5f8065b38b 100644
--- a/libavcodec/vvc/dec.h
+++ b/libavcodec/vvc/dec.h
@@ -249,6 +249,8 @@ typedef struct VVCContext {
 
     uint64_t nb_frames;     ///< processed frames
     int nb_delayed;         ///< delayed frames
+
+    H274HashContext *hash_ctx;
 }  VVCContext ;
 
 #endif /* AVCODEC_VVC_DEC_H */