Commit 7c54e695 authored by malenovsky's avatar malenovsky
Browse files

Merge branch... 

Merge branch '1027-usan-implicit-conversion-from-type-int-to-type-int16_t-changes-value-in-gs_enc-c-for-omasa' into 'main'

Resolve "USAN: implicit conversion from type 'int' to type 'int16_t' changes value in gs_enc.c for OMASA"

See merge request !1446
parents c1b7289d 4f89cb4e

lib_com/options.h

100755 → 100644
+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 
#define FIX_993_REMOVE_SBA_GET_ORDER                    /* VA: issue 993: remove unused function ivas_sba_get_order() */

#define FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE            /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions   */

#define FIX_960_SYN_OUTPUT                              /* VA: issue 960: unused function syn_output() is removed */

#define FIX_1027_GSC_INT_OVERFLOW                       /* VA: issue 2207: overflow in GSC */



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

lib_dec/gs_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -643,7 +643,11 @@ void gsc_dec( 
                }

                if ( concat_out[j] < 0 )

                {

#ifdef FIX_1027_GSC_INT_OVERFLOW

                    seed_init = (int16_t) ( (int32_t) seed_init + 3 );

#else

                    seed_init += 3;

#endif

                }

            }

lib_enc/gs_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -545,7 +545,11 @@ void gsc_enc( 
            }

            if ( concat_out[j] < 0 )

            {

#ifdef FIX_1027_GSC_INT_OVERFLOW

                seed_init = (int16_t) ( (int32_t) seed_init + 3 );

#else

                seed_init += 3;

#endif

            }

        }