Commit 7e298182 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '573-fix_dirac_ls_synthesis_config-leftover-in-the-code' into 'main' 

Resolve "FIX_DIRAC_LS_SYNTHESIS_CONFIG leftover in the code"

See merge request !779
parents 81460fd9 0ecb70c2

lib_dec/ivas_dirac_dec.c

+1 −5
Original line number Diff line number Diff line
@@ -422,11 +422,7 @@ ivas_error ivas_dirac_dec_config( 
    }





    if ( nchan_transport_orig > 2 && hDirAC->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC

#ifdef FIX_DIRAC_LS_SYNTHESIS_CONFIG

         && !hodirac_flag

#endif

    )

    if ( nchan_transport_orig > 2 && hDirAC->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC && !hodirac_flag )

    {

        hDirAC->synthesisConf = DIRAC_SYNTHESIS_PSD_LS;

        hDirAC->panningConf = DIRAC_PANNING_VBAP;