From d622ebb1f42e125ebfa19392153d662f83ffb7e3 Mon Sep 17 00:00:00 2001 From: Marko Viitanen Date: Thu, 26 Mar 2020 10:39:35 +0200 Subject: [PATCH] Fix NAL types to match VTM 8.0 --- src/kvazaar.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/kvazaar.h b/src/kvazaar.h index 86484366..d62fb032 100644 --- a/src/kvazaar.h +++ b/src/kvazaar.h @@ -441,23 +441,24 @@ enum kvz_nal_unit_type { KVZ_NAL_RASL = 3, // Intra random access point pictures - KVZ_NAL_IDR_W_RADL = 8, - KVZ_NAL_IDR_N_LP = 9, - KVZ_NAL_CRA_NUT = 10, - KVZ_NAL_GDR_NUT = 11, + KVZ_NAL_IDR_W_RADL = 7, + KVZ_NAL_IDR_N_LP = 8, + KVZ_NAL_CRA_NUT = 9, + KVZ_NAL_GDR_NUT = 10, // non-VCL - KVZ_NAL_SPS_NUT = 16, - KVZ_NAL_PPS_NUT = 17, + KVZ_NAL_VPS_NUT = 14, + KVZ_NAL_SPS_NUT = 15, + KVZ_NAL_PPS_NUT = 16, - KVZ_NAL_AUD_NUT = 19, + KVZ_NAL_AUD_NUT = 20, - KVZ_NAL_EOS_NUT = 20, - KVZ_NAL_EOB_NUT = 21, - KVZ_NAL_PREFIX_SEI_NUT = 22, - KVZ_NAL_SUFFIX_SEI_NUT = 23, - KVZ_NAL_VPS_NUT = 25, + KVZ_NAL_EOS_NUT = 21, + KVZ_NAL_EOB_NUT = 22, + KVZ_NAL_PREFIX_SEI_NUT = 23, + KVZ_NAL_SUFFIX_SEI_NUT = 24, + };