Commit 00f85cfe authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch... 

Merge branch 'float-1518-osba-rendering-to-mono-and-stereo-for-96kbps-is-significantly-quieter' into tmp-loundness-1518_1
parents 042e49d8 9d341077

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ 
#define FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE    /* Nokia: float issue 1493: Improves float decision stability in MASA encoding by adjusting reduction code */



#define FIX_2432_ISM_SPIKES_16KHZ                       /* VA: basop issue 2432: fix spikes in ISM decoding at 16kHz output sampling rate */

#define FIX_1518

#define FIX_FLOAT_1518                                  /* FhG: fix issue 1518: loudness differences in OSBA decoding to mono or stereo output */



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

lib_dec/ivas_cpe_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -500,12 +500,12 @@ ivas_error ivas_cpe_dec( 


    if ( hCPE->element_mode == IVAS_CPE_MDCT && hCPE->nchan_out == 1 && ( is_DTXrate( ivas_total_brate ) == 0 || ( is_DTXrate( ivas_total_brate ) == 1 && is_DTXrate( st_ivas->hDecoderConfig->last_ivas_total_brate ) == 0 ) ) )

    {

#ifdef FIX_1518

#ifdef FIX_FLOAT_1518

        if ( !( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_NONE ) )

        {

#endif

            applyDmxMdctStereo( hCPE, output, output_frame );

#ifdef FIX_1518

#ifdef FIX_FLOAT_1518

        }

#endif

    }

lib_dec/ivas_dec.c

+2 −19
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ ivas_error ivas_dec( 
    {

        int16_t nchan_ism, sba_ch_idx;



#ifdef FIX_1518

#ifdef FIX_FLOAT_1518

        int16_t sba_mono_flag = ( st_ivas->hDecoderConfig->nchan_out == 1 ) ? 1 : 0;

#endif
@@ -434,23 +434,6 @@ ivas_error ivas_dec( 
            }

        }



        /*

        {

        	static FILE* f_foa = 0;

        	if (f_foa == 0)

        		f_foa = fopen("chans.raw","wb");

        

        	for (int16_t  j=0; j < 960;j++)

        	{

        		for ( int n = 0; n < 1; n++)

        		{

                    int16_t s1 = p_output[n][j];

        			fwrite(&s1,sizeof(int16_t),1,f_foa);

        		}

            }

        }

        */



        if ( st_ivas->sba_dirac_stereo_flag )

        {

            ivas_agc_dec_process( st_ivas->hSpar->hAgcDec, &p_output[sba_ch_idx], &p_output[sba_ch_idx], st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, output_frame );
@@ -464,7 +447,7 @@ ivas_error ivas_dec( 


            ivas_sba_dirac_stereo_dec( st_ivas, &p_output[sba_ch_idx], output_frame );

        }

#ifdef FIX_1518

#ifdef FIX_FLOAT_1518

        else if ( sba_mono_flag && st_ivas->ism_mode == ISM_MODE_NONE )

        {

            v_multc( p_output[0], 2.0f, p_output[0], output_frame );

lib_dec/ivas_sba_dirac_stereo_dec.c

+7 −10
Original line number Diff line number Diff line
@@ -910,18 +910,15 @@ void ivas_sba_dirac_stereo_dec( 
    synchro_synthesis( st_ivas->hDecoderConfig->ivas_total_brate, hCPE, output, output_frame, 1 /*st_ivas->sba_dirac_stereo_flag*/ );



    /* output scaling */

#ifdef FIX_1518

    if ( !( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_NONE ) )

    {

#endif

#ifdef FIX_FLOAT_1518

    if ( !sba_mono_flag && !( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_NONE ) )

#else

    if ( !sba_mono_flag )

#endif

    {

        v_multc( output[0], 0.5f, output[0], output_frame );

        v_multc( output[1], 0.5f, output[1], output_frame );

    }

#ifdef FIX_1518

    }

#endif



    /* delay HB synth */

    if ( st_ivas->nchan_transport == 1 )

lib_enc/ivas_enc.c

+0 −17
Original line number Diff line number Diff line
@@ -418,23 +418,6 @@ ivas_error ivas_enc( 
        }

#endif



        /*

        {

        	static FILE* f_foa = 0;

        	if (f_foa == 0)

        		f_foa = fopen("chans_in.raw","wb");

        

        	for (int16_t  j=0; j < 960;j++)

        	{

        		for ( int n = 0; n < 1; n++)

        		{

                    int16_t s1 = data_f[n][j];

        			fwrite(&s1,sizeof(int16_t),1,f_foa);

        		}

            }

        }

        */



        /* core-coding of transport channels */

        if ( st_ivas->nSCE == 1 )

        {