From b24d2290c53096b6a6d224e522905b3170c2266b Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 26 Jul 2023 10:03:15 +0200 Subject: [PATCH 1/2] removed outdated todos in ivas_qmetadata_dec_sid_decode() --- lib_dec/ivas_qmetadata_dec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c index e4c69cd288..25c3d417b4 100644 --- a/lib_dec/ivas_qmetadata_dec.c +++ b/lib_dec/ivas_qmetadata_dec.c @@ -1265,7 +1265,7 @@ int16_t ivas_qmetadata_dec_sid_decode( start_index = *index; /* read MASA SID descriptor */ - if ( ivas_format == MASA_FORMAT && nchan_transport == 2 ) /* corresponding to SID_MASA case; Todo: needs to be checked for SBA */ + if ( ivas_format == MASA_FORMAT && nchan_transport == 2 ) { b = bitstream[( *index )--]; if ( b ) @@ -1455,12 +1455,14 @@ int16_t ivas_qmetadata_dec_sid_decode( } } } + +#if !( #defined FIX_137_SID_MD_BITS && #defined FIX_QMETA_SID_5k2 ) /* TODO: temporary hack to keep BE */ if ( ivas_format != SBA_FORMAT ) { metadata_sid_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; } - +#endif /*Read filling bits*/ while ( start_index - *index < metadata_sid_bits ) { @@ -2372,7 +2374,7 @@ static uint16_t ivas_qmetadata_DecodeQuasiUniform( uint16_t tresh, value; #ifdef DEBUGGING - assert( ( alphabet_size >= 1 ) ); /* ToDo: fcs: to check if this additional conditon is really needed: && (alphabet_size <= (1U << 31) - 1));*/ + assert( ( alphabet_size >= 1 ) ); #endif bits = 30 - norm_l( alphabet_size ); /* bits = floor(log2(alphabet_size)) */ -- GitLab From 6cc20862d4681f98641bd3e1163219d42de16654 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 26 Jul 2023 10:15:54 +0200 Subject: [PATCH 2/2] removed outdated todos in ivas_qmetadata_enc_sid_decode() --- lib_dec/ivas_qmetadata_dec.c | 2 +- lib_enc/ivas_qmetadata_enc.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c index 25c3d417b4..d1ccc4a321 100644 --- a/lib_dec/ivas_qmetadata_dec.c +++ b/lib_dec/ivas_qmetadata_dec.c @@ -1456,7 +1456,7 @@ int16_t ivas_qmetadata_dec_sid_decode( } } -#if !( #defined FIX_137_SID_MD_BITS && #defined FIX_QMETA_SID_5k2 ) +#if !( defined FIX_137_SID_MD_BITS && defined FIX_QMETA_SID_5k2 ) /* TODO: temporary hack to keep BE */ if ( ivas_format != SBA_FORMAT ) { diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc.c index 7cf68d677d..b955581d11 100644 --- a/lib_enc/ivas_qmetadata_enc.c +++ b/lib_enc/ivas_qmetadata_enc.c @@ -988,9 +988,9 @@ void ivas_qmetadata_enc_sid_encode( else { #ifdef FIX_QMETA_SID_5k2 - /* TODO: still use old sid frame size to keep bitexactness */ metadata_sid_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; #else + /* TODO: still use old sid frame size to keep bitexactness */ metadata_sid_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; #endif } @@ -1231,12 +1231,13 @@ void ivas_qmetadata_enc_sid_encode( } #endif +#if !( defined FIX_137_SID_MD_BITS && defined FIX_QMETA_SID_5k2 ) /* TODO: temporary to keep BE */ if ( ivas_format != SBA_FORMAT ) { metadata_sid_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; } - +#endif /* fill bits*/ assert( ( hMetaData->nb_bits_tot - bit_pos_start ) <= metadata_sid_bits && "Too many written bits!" ); while ( ( hMetaData->nb_bits_tot - bit_pos_start ) < metadata_sid_bits ) @@ -2273,7 +2274,7 @@ static void ivas_qmetadata_encode_quasi_uniform( int16_t bits; uint16_t tresh; #ifdef DEBUGGING - assert( ( alphabet_size >= 1 ) ); /* ToDo: fcs: to check if this additional conditon is really needed: && (alphabet_size <= (1U << 31) - 1));*/ + assert( ( alphabet_size >= 1 ) ); assert( value < alphabet_size ); #endif @@ -2512,7 +2513,7 @@ static int16_t ivas_qmetadata_encode_quasi_uniform_length( int16_t bits; uint16_t tresh; #ifdef DEBUGGING - assert( ( alphabet_size >= 1 ) ); /* ToDo: fcs: to check if this additional conditon is really needed: && (alphabet_size <= (1U << 31) - 1));*/ + assert( ( alphabet_size >= 1 ) ); assert( value < alphabet_size ); #endif -- GitLab