mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-04-18 16:40:23 +00:00
c49f6bec20
The VVC probe only checked forbidden_zero_bit but not nuh_layer_id range in the NAL unit header. This allowed certain MP3 files to be misdetected as VVC streams because their frame data coincidentally contained 00 00 01 start code patterns that looked like valid NAL units. Add a check for nuh_layer_id (must be <= 55). The existing check_temporal_id() already validates nuh_temporal_id_plus1 is in [1, 7]. Together these two checks reject the bogus NAL units produced by MP3 frame data. Note: nuh_reserved_zero_bit is intentionally not checked here, as it is reserved for future use by the spec and may become non-zero in a later revision. Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
93 lines
2.8 KiB
C
93 lines
2.8 KiB
C
/*
|
|
* RAW H.266 / VVC video demuxer
|
|
* Copyright (c) 2020 Nuo Mi <nuomi2021@gmail.com>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "libavcodec/vvc.h"
|
|
|
|
#include "avformat.h"
|
|
#include "rawdec.h"
|
|
|
|
static int check_temporal_id(uint8_t nuh_temporal_id_plus1, int type)
|
|
{
|
|
if (nuh_temporal_id_plus1 == 0)
|
|
return 0;
|
|
|
|
if (nuh_temporal_id_plus1 != 1) {
|
|
if (type >= VVC_IDR_W_RADL && type <= VVC_RSV_IRAP_11
|
|
|| type == VVC_DCI_NUT || type == VVC_OPI_NUT
|
|
|| type == VVC_VPS_NUT || type == VVC_SPS_NUT
|
|
|| type == VVC_EOS_NUT || type == VVC_EOB_NUT)
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
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++) {
|
|
code = (code << 8) + p->buf[i];
|
|
if ((code & 0xffffff00) == 0x100) {
|
|
uint8_t nal2 = p->buf[i + 1];
|
|
int type = (nal2 & 0xF8) >> 3;
|
|
|
|
if (code & 0x80) // forbidden_zero_bit
|
|
return 0;
|
|
|
|
if ((code & 0x3F) > 55) // nuh_layer_id must be in [0, 55]
|
|
return 0;
|
|
|
|
if (!check_temporal_id(nal2 & 0x7, type))
|
|
return 0;
|
|
|
|
switch (type) {
|
|
case VVC_SPS_NUT: sps++; 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++;
|
|
if (valid_pps)
|
|
valid_irap++;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
FF_DEF_RAWVIDEO_DEMUXER(vvc, "raw H.266/VVC video", vvc_probe, "h266,266,vvc", AV_CODEC_ID_VVC)
|