Commit f55a663f authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into fhg/fix-tcx5-grouping-interleaving-with-in_fs-uneq-out_fs

parents 202c215e d176c83d

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ 
#define NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND /* Eri: issue 1337: Missing directivity setting and distance attenuation in external renderer IVAS_rend */

#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/

#define NONBE_FIX_TCX5_INTERLEAVING_FOR_FS_IN_UNEQUAL_FS_OUT /* FhG: apply correct TCX5 grouping/interleaving when input_fs != output_fs */

#define NONBE_1339_FIXOSBA_EXT_LOUDNESS                 /* FhG: issue 1339: apply scaling with EXT output in OSBA high-BR mode */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_jbm_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -1110,6 +1110,12 @@ ivas_error ivas_jbm_dec_render( 
                {

                    mvr2r( p_tc[n], p_output[n], *nSamplesRendered );

                }

#ifdef NONBE_1339_FIXOSBA_EXT_LOUDNESS

                for ( n = 0; n < st_ivas->hDecoderConfig->nchan_out; n++ )

                {

                    v_multc( p_output[n], 0.5f, p_output[n], *nSamplesRendered );

                }

#endif

            }

            else

            {