virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/vvcdec: verify picture hash

Browse Source 
Signed-off-by: Wu Jianhua <toqsxw@outlook.com>
This commit is contained in:
Wu Jianhua
2025-04-27 19:44:41 +08:00
committed by Nuo Mi
parent 9620c95edb
commit 23e9912315
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/vvc/dec.c
View File

@ -1096,7 +1096,25 @@ static int frame_end(VVCContext *s, VVCFrameContext *fc)
} }
} }
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; 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) 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); frame_context_free(s->fcs + i);
av_free(s->fcs); av_free(s->fcs);
} }
ff_h274_hash_freep(&s->hash_ctx);
ff_vvc_ps_uninit(&s->ps); ff_vvc_ps_uninit(&s->ps);
ff_cbs_close(&s->cbc); ff_cbs_close(&s->cbc);

2
libavcodec/vvc/dec.h
View File

@ -249,6 +249,8 @@ typedef struct VVCContext {
uint64_t nb_frames; ///< processed frames uint64_t nb_frames; ///< processed frames
int nb_delayed; ///< delayed frames int nb_delayed; ///< delayed frames
H274HashContext *hash_ctx;
} VVCContext ; } VVCContext ;
#endif /* AVCODEC_VVC_DEC_H */ #endif /* AVCODEC_VVC_DEC_H */