Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avcodec/vvc: Add support for output_corrupt/showall flags

Browse source
This commit is contained in:
Zhao Zhili 2025-01-19 00:35:06 +08:00 • committed by Nuo Mi
parent a328b219ed
commit ea381285e7
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libavcodec/vvc/refs.c
View file

@ -48,6 +48,8 @@ void ff_vvc_unref_frame(VVCFrameContext *fc, VVCFrame *frame, int flags)
return; return;
frame->flags &= ~flags; frame->flags &= ~flags;
if (!(frame->flags & ~VVC_FRAME_FLAG_CORRUPT))
frame->flags = 0;
if (!frame->flags) { if (!frame->flags) {
av_frame_unref(frame->frame); av_frame_unref(frame->frame);
av_refstruct_unref(&frame->sps); av_refstruct_unref(&frame->sps);
@ -280,6 +282,9 @@ int ff_vvc_output_frame(VVCContext *s, VVCFrameContext *fc, AVFrame *out, const
if (nb_output) { if (nb_output) {
VVCFrame *frame = &fc->DPB[min_idx]; VVCFrame *frame = &fc->DPB[min_idx];
if (frame->flags & VVC_FRAME_FLAG_CORRUPT)
frame->frame->flags |= AV_FRAME_FLAG_CORRUPT;
ret = av_frame_ref(out, frame->frame); ret = av_frame_ref(out, frame->frame);
if (frame->flags & VVC_FRAME_FLAG_BUMPING) if (frame->flags & VVC_FRAME_FLAG_BUMPING)
ff_vvc_unref_frame(fc, frame, VVC_FRAME_FLAG_OUTPUT | VVC_FRAME_FLAG_BUMPING); ff_vvc_unref_frame(fc, frame, VVC_FRAME_FLAG_OUTPUT | VVC_FRAME_FLAG_BUMPING);
@ -389,7 +394,7 @@ static VVCFrame *generate_missing_ref(VVCContext *s, VVCFrameContext *fc, int po
frame->poc = poc; frame->poc = poc;
frame->sequence = s->seq_decode; frame->sequence = s->seq_decode;
frame->flags = 0; frame->flags = VVC_FRAME_FLAG_CORRUPT;
ff_vvc_report_frame_finished(frame); ff_vvc_report_frame_finished(frame);
@ -424,6 +429,19 @@ static int add_candidate_ref(VVCContext *s, VVCFrameContext *fc, RefPicList *lis
if (ref == fc->ref || list->nb_refs >= VVC_MAX_REF_ENTRIES) if (ref == fc->ref || list->nb_refs >= VVC_MAX_REF_ENTRIES)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (!IS_CVSS(s)) {
const bool ref_corrupt = !ref || (ref->flags & VVC_FRAME_FLAG_CORRUPT);
const bool recovering = s->no_output_before_recovery_flag && !GDR_IS_RECOVERED(s);
if (ref_corrupt && !recovering) {
if (!(s->avctx->flags & AV_CODEC_FLAG_OUTPUT_CORRUPT) &&
!(s->avctx->flags2 & AV_CODEC_FLAG2_SHOW_ALL))
return AVERROR_INVALIDDATA;
fc->ref->flags |= VVC_FRAME_FLAG_CORRUPT;
}
}
if (!ref) { if (!ref) {
ref = generate_missing_ref(s, fc, poc); ref = generate_missing_ref(s, fc, poc);
if (!ref) if (!ref)

1
libavcodec/vvc/refs.h
View file

@ -29,6 +29,7 @@
#define VVC_FRAME_FLAG_SHORT_REF (1 << 1) #define VVC_FRAME_FLAG_SHORT_REF (1 << 1)
#define VVC_FRAME_FLAG_LONG_REF (1 << 2) #define VVC_FRAME_FLAG_LONG_REF (1 << 2)
#define VVC_FRAME_FLAG_BUMPING (1 << 3) #define VVC_FRAME_FLAG_BUMPING (1 << 3)
#define VVC_FRAME_FLAG_CORRUPT (1 << 4)
int ff_vvc_output_frame(VVCContext *s, VVCFrameContext *fc, struct AVFrame *out, int no_output_of_prior_pics_flag, int flush); int ff_vvc_output_frame(VVCContext *s, VVCFrameContext *fc, struct AVFrame *out, int no_output_of_prior_pics_flag, int flush);
void ff_vvc_bump_frame(VVCContext *s, VVCFrameContext *fc); void ff_vvc_bump_frame(VVCContext *s, VVCFrameContext *fc);