Commit 042e49d8 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 b1720792 cdae2a1f

lib_dec/ivas_cpe_dec.c

+8 −5
Original line number Diff line number Diff line
@@ -498,13 +498,16 @@ ivas_error ivas_cpe_dec( 
        synchro_synthesis( ivas_total_brate, hCPE, output, output_frame, 0 );

    }



    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 ) ) 

    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

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

#endif

    )

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

        {

#endif

            applyDmxMdctStereo( hCPE, output, output_frame );

#ifdef FIX_1518

        }

#endif

    }



#ifndef DEBUG_STEREO_DFT_OUTRESPRED

lib_dec/ivas_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -434,6 +434,7 @@ ivas_error ivas_dec( 
            }

        }



        /*

        {

        	static FILE* f_foa = 0;

        	if (f_foa == 0)
@@ -448,6 +449,7 @@ ivas_error ivas_dec( 
        		}

            }

        }

        */



        if ( st_ivas->sba_dirac_stereo_flag )

        {

lib_enc/ivas_enc.c

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

#endif



        /*

        {

        	static FILE* f_foa = 0;

        	if (f_foa == 0)
@@ -432,6 +433,7 @@ ivas_error ivas_enc( 
        		}

            }

        }

        */



        /* core-coding of transport channels */

        if ( st_ivas->nSCE == 1 )