Commit 06866c1f authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into... 

- Merge remote-tracking branch 'remotes/origin/main' into basop-2347-remove-various-duplicated-code-in-core-decoder
parents 371c0e80 fbcb3376

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ 
#define FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT             /* Nokia/FhG: basop issue 2323: Use correct init size */

#define FIX_BASOP_2324_MISSING_SET_TO_ZERO              /* Nokia: basop issue 2324: Fix issue by setting the exponent to zero where it should be */

#define FIX_BASOP_2326_WRONG_SIG_LENGTH                 /* Nokia: basop issue 2326: Fix issue by using correct signal length in multiple places */

#define FIX_BASOP_2327_WRONG_LOOP_END                   /* Nokia: basop inssue 2327: Correct loop end to solve MSAN error */

#define HARM_COREDECODER_FUNCTIONS                      /* VA: basop issue 2347: Remove various duplicated code in core-decoder  */



/* #################### End BE switches ################################## */

lib_rend/ivas_omasa_ana_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -719,7 +719,11 @@ static void ivas_omasa_dmx_fx( 
                    }

                    max_e = in_e[0];

                    move16();

#ifdef FIX_BASOP_2327_WRONG_LOOP_END

                    FOR( l = 1; l < input_frame; l++ )

#else

                    FOR( l = 1; l < L_FRAME48k; l++ )

#endif

                    {

                        IF( LT_16( max_e, in_e[l] ) )

                        {
@@ -728,7 +732,11 @@ static void ivas_omasa_dmx_fx( 
                        }

                    }



#ifdef FIX_BASOP_2327_WRONG_LOOP_END

                    FOR( l = 0; l < input_frame; l++ )

#else

                    FOR( l = 0; l < L_FRAME48k; l++ )

#endif

                    {

                        data_out_f_fx[j][l] = L_shr( data_out_f_fx[j][l], sub( max_e, in_e[l] ) ); // exponent: max_e, Q: ( 15 - max_e )

                        move32();