opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 15:49:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

lavf: vvc_probe: lower probe score for invalid SPS/PPS/IRAP order to avoid misdetection of mp3 as VVC

Browse Source 
The current vvc_probe function checks for SPS, PPS, and IRAP NAL units but does not enforce their detection order. This can lead to false positives when PPS or IRAP appear before SPS, causing malformed or non-compliant bitstreams to be incorrectly identified as valid VVC streams.

This commit modifies the logic to use boolean flags and enforces the correct detection sequence: SPS must be detected before PPS, and PPS before IRAP. This ensures more accurate probing and prevents invalid bitstreams from being misidentified.

For streams with wrong ordering a lower score is returned

This change addresses issues reported in:
- https://trac.ffmpeg.org/ticket/11496
- https://trac.ffmpeg.org/ticket/11087

Signed-off-by: xiongweixiao <xiongweixiaoxxw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
xiongweixiao
2025-05-12 07:36:35 +08:00
committed by Michael Niedermayer
parent 1cda5fe3fd
commit 8ce32a7cbb
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/vvcdec.c
View File

@ -44,6 +44,7 @@ static int vvc_probe(const AVProbeData *p)
{
uint32_t code = -1;
int sps = 0, pps = 0, irap = 0;
int valid_pps = 0, valid_irap = 0;
int i;
for (i = 0; i < p->buf_size - 1; i++) {
@ -60,17 +61,29 @@ static int vvc_probe(const AVProbeData *p)
switch (type) {
case VVC_SPS_NUT: sps++; break;
case VVC_PPS_NUT: pps++; break;
case VVC_PPS_NUT:
pps++;
if (sps)
valid_pps++;
break;
case VVC_IDR_N_LP:
case VVC_IDR_W_RADL:
case VVC_CRA_NUT:
case VVC_GDR_NUT: irap++; break;
case VVC_GDR_NUT:
irap++;
if (valid_pps)
valid_irap++;
break;
}
}
}
if (sps && pps && irap)
if (valid_irap)
return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg
if (sps && pps && irap)
return AVPROBE_SCORE_EXTENSION / 2;
if (sps || pps || irap)
return AVPROBE_SCORE_EXTENSION / 4;
return 0;
}