Commit 1841d349 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_1521_SBA_LOUDNESS_STEREO

parent 5e008193

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ 


#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549       /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */

#define FIX_1521_SBA_LOUDNESS_STEREO                    /* FhG: issue 1521: Fix loudness for SBA to stereo rendering */

#define FIX_1559                                        /* Eri/FhG: fix for Issue 1559 in FD CNG with bitrate/bw switching */

#define FIX_BASOP_2571_MASA_EXT_RENDER_FIXES            /* Nokia: BASOP issue 2571: Fix MASA EXT DirAC renderer by unifying it with decoder */

#define NONBE_FIX_2575                                  /* Fhg: Fix issue 2575, precision loss in FD CNG */

lib_dec/ivas_sba_dirac_stereo_dec_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -1519,14 +1519,8 @@ void ivas_sba_dirac_stereo_dec_fx( 
    synchro_synthesis_fx( st_ivas->hDecoderConfig->ivas_total_brate, hCPE, output, output_frame, 1 /*st_ivas->sba_dirac_stereo_flag*/, q_dft[0] );



    /* output scaling */

#ifdef FIX_1521_SBA_LOUDNESS_STEREO

    IF( !sba_mono_flag )

#else

    test();

    IF( !sba_mono_flag && !( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_16( st_ivas->ism_mode, ISM_MODE_NONE ) ) )

#endif

    {

#ifdef FIX_1521_SBA_LOUDNESS_STEREO

        test();

        IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_16( st_ivas->ism_mode, ISM_MODE_NONE ) )

        {
@@ -1542,10 +1536,6 @@ void ivas_sba_dirac_stereo_dec_fx( 
            v_multc_fx( output[0], INV_SQRT2_FX, output[0], output_frame );

            v_multc_fx( output[1], INV_SQRT2_FX, output[1], output_frame );

        }

#else

        v_shr( output[0], 1, output[0], output_frame ); /*0.5f*/

        v_shr( output[1], 1, output[1], output_frame ); /*0.5f*/

#endif

    }



    /* delay HB synth */

lib_rend/ivas_allrad_dec_fx.c

+0 −7
Original line number Diff line number Diff line
@@ -98,17 +98,10 @@ ivas_error ivas_sba_get_hoa_dec_matrix_fx( 
    }

    ELSE IF( EQ_32( hOutSetup.output_config, IVAS_AUDIO_CONFIG_STEREO ) )

    {

#ifdef FIX_1521_SBA_LOUDNESS_STEREO

        ( *hoa_dec_mtx )[0] = INV_SQRT2_FX >> 2;

        ( *hoa_dec_mtx )[1] = INV_SQRT2_FX >> 2;

        ( *hoa_dec_mtx )[SBA_NHARM_HOA3] = INV_SQRT2_FX >> 2;

        ( *hoa_dec_mtx )[SBA_NHARM_HOA3 + 1] = -( INV_SQRT2_FX >> 2 );

#else

        ( *hoa_dec_mtx )[0] = ONE_IN_Q28;                   // 0.5f in Q29

        ( *hoa_dec_mtx )[1] = ONE_IN_Q28;                   // 0.5f in Q29

        ( *hoa_dec_mtx )[SBA_NHARM_HOA3] = ONE_IN_Q28;      // 0.5f in Q29

        ( *hoa_dec_mtx )[SBA_NHARM_HOA3 + 1] = -ONE_IN_Q28; // 0.5f in Q29

#endif

        move32();

        move32();

        move32();