Commit dce38c53 authored by vaclav's avatar vaclav
Browse files

fix merge issue

parent bb9d0c38

lib_dec/ivas_dirac_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -1840,6 +1840,7 @@ void ivas_dirac_dec_render_sf( 
                set_zero( surCohRatio, hSpatParamRendCom->num_freq_bands );

            }

        }



        ivas_dirac_dec_compute_directional_responses( hSpatParamRendCom,

                                                      hDirACRend,

                                                      st_ivas->hVBAPdata,

lib_dec/ivas_sba_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -195,9 +195,9 @@ ivas_error ivas_sba_dec_reconfigure( 
        else

        {

#ifdef SPLIT_REND_WITH_HEAD_ROT

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#else

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL )

#endif

            {

                renderer_type_new = RENDERER_BINAURAL_FASTCONV;