From 7e8b9c43b3318a60409475878ca790de4afe40dd Mon Sep 17 00:00:00 2001 From: Fredrik Jansson Date: Fri, 21 Apr 2023 10:13:18 +0200 Subject: [PATCH 1/2] Fix 418 added in separate define --- lib_com/options.h | 2 +- lib_dec/ivas_stereo_cng_dec.c | 6 ++++++ lib_enc/ivas_stereo_cng_enc.c | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 5b8ab37e69..36c368a932 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -171,7 +171,7 @@ #define FIX_406_IVAS_POSITION /* Eri: Issue 406: Unify IVAS_POSITION to use IVAS_VECTOR3 instead */ #define REND_DEBUGGING_REVISION /* VA: encapsulate rendering debugging options with DEBUGGING */ - +#define FIX_418_SID_BITRATE /* Eri: Issue 418: Using the correct bitrate for unified stereo SID */ /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ diff --git a/lib_dec/ivas_stereo_cng_dec.c b/lib_dec/ivas_stereo_cng_dec.c index b55cf4cfbd..112ecea807 100644 --- a/lib_dec/ivas_stereo_cng_dec.c +++ b/lib_dec/ivas_stereo_cng_dec.c @@ -90,8 +90,12 @@ void stereo_dft_dec_sid_coh( int16_t bits_tmp; int16_t b; +#ifdef FIX_418_SID_BITRATE + nr_of_sid_stereo_bits = (IVAS_SID_5k2 - SID_2k40) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#else /* TODO: still use old number of bits to keep bitexactness in output */ nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#endif /* If the coherence is not encoded due to lack of bits set alpha to zero which leads to that the coherence */ /* from the previous frame is used. */ @@ -174,7 +178,9 @@ void stereo_dft_dec_sid_coh( ( *nb_bits )++; } +#ifndef FIX_418_SID_BITRATE dtx_read_padding_bits( st, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC ); +#endif return; } diff --git a/lib_enc/ivas_stereo_cng_enc.c b/lib_enc/ivas_stereo_cng_enc.c index 784ec10807..72167e3166 100644 --- a/lib_enc/ivas_stereo_cng_enc.c +++ b/lib_enc/ivas_stereo_cng_enc.c @@ -173,8 +173,12 @@ void stereo_dft_enc_sid_coh( int16_t alpha_level; int16_t n; +#ifdef FIX_418_SID_BITRATE + nr_of_sid_stereo_bits = (IVAS_SID_5k2 - SID_2k40) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#else /* TODO: still use old number of bits to keep bitexactness in output */ nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#endif zeropad = 0; /* Encode coherence vector. Find best fixed predictor by minimizing prediction error on input vector. @@ -329,7 +333,9 @@ void stereo_dft_enc_sid_coh( ( *nb_bits )++; } +#ifndef FIX_418_SID_BITRATE push_next_indice( hBstr, zeropad, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC ); +#endif return; } -- GitLab From 9a41bbc4049a6bd3c29bc942685379e545693d98 Mon Sep 17 00:00:00 2001 From: Fredrik Jansson Date: Tue, 25 Apr 2023 15:04:19 +0200 Subject: [PATCH 2/2] Clang format --- lib_dec/ivas_stereo_cng_dec.c | 2 +- lib_enc/ivas_stereo_cng_enc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_dec/ivas_stereo_cng_dec.c b/lib_dec/ivas_stereo_cng_dec.c index 112ecea807..2e31375996 100644 --- a/lib_dec/ivas_stereo_cng_dec.c +++ b/lib_dec/ivas_stereo_cng_dec.c @@ -91,7 +91,7 @@ void stereo_dft_dec_sid_coh( int16_t b; #ifdef FIX_418_SID_BITRATE - nr_of_sid_stereo_bits = (IVAS_SID_5k2 - SID_2k40) / FRAMES_PER_SEC - SID_FORMAT_NBITS; + nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; #else /* TODO: still use old number of bits to keep bitexactness in output */ nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; diff --git a/lib_enc/ivas_stereo_cng_enc.c b/lib_enc/ivas_stereo_cng_enc.c index 72167e3166..2eb838bf5c 100644 --- a/lib_enc/ivas_stereo_cng_enc.c +++ b/lib_enc/ivas_stereo_cng_enc.c @@ -174,7 +174,7 @@ void stereo_dft_enc_sid_coh( int16_t n; #ifdef FIX_418_SID_BITRATE - nr_of_sid_stereo_bits = (IVAS_SID_5k2 - SID_2k40) / FRAMES_PER_SEC - SID_FORMAT_NBITS; + nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; #else /* TODO: still use old number of bits to keep bitexactness in output */ nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; -- GitLab