Commit fdc022c4 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Updates reflecting the discussion on issue #196

parent 305f1331

lib_dec/ivas_ism_dec.c

+0 −10
Original line number Diff line number Diff line
@@ -180,12 +180,7 @@ static ivas_error ivas_ism_bitrate_switching( 
        /* Deallocate the ParamISM struct */

        ivas_param_ism_dec_close( &( st_ivas->hDirAC ), st_ivas->hDecoderConfig->output_config );



#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL ||

             st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL )

#else

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL )

#endif

        {

            /* close the parametric binaural renderer */

            ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );
@@ -257,12 +252,7 @@ static ivas_error ivas_ism_bitrate_switching( 
            return error;

        }



#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL ||

             st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL )

#else

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL )

#endif

        {

            /* open the parametric binaural renderer */

            if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

lib_dec/ivas_output_config.c

+0 −24
Original line number Diff line number Diff line
@@ -97,11 +97,7 @@ void ivas_renderer_select( 
            }

            else /* ISM_MODE_DISC */

            {

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

                if ( output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hRenderConfig->roomAcoustics.use_brir == 0 )

#else

                if ( output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hRenderConfig->roomAcoustics.use_brir == 0 )

#endif

                {

#ifdef DEBUGGING

                    if ( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER )
@@ -135,12 +131,7 @@ void ivas_renderer_select( 
        else if ( st_ivas->ivas_format == MASA_FORMAT || ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->nchan_transport <= 2 ) )

        {

            *internal_config = output_config;

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

            if ( output_config == AUDIO_CONFIG_BINAURAL ||

                 output_config == AUDIO_CONFIG_BINAURAL )

#else

            if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

            {

                *renderer_type = RENDERER_BINAURAL_PARAMETRIC;

            }
@@ -152,12 +143,7 @@ void ivas_renderer_select( 
        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {

            *internal_config = AUDIO_CONFIG_HOA3;

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

            if ( output_config == AUDIO_CONFIG_BINAURAL ||

                 output_config == AUDIO_CONFIG_BINAURAL )

#else

            if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

            {

                *renderer_type = RENDERER_BINAURAL_FASTCONV;

            }
@@ -194,12 +180,7 @@ void ivas_renderer_select( 
            if ( st_ivas->mc_mode == MC_MODE_MCMASA )

            {

                *internal_config = output_config;

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

                if ( output_config == AUDIO_CONFIG_BINAURAL ||

                     output_config == AUDIO_CONFIG_BINAURAL )

#else

                if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

                {

                    *renderer_type = RENDERER_BINAURAL_PARAMETRIC;

                }
@@ -211,12 +192,7 @@ void ivas_renderer_select( 
            else

            {

                *internal_config = transport_config;

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

                if ( output_config == AUDIO_CONFIG_BINAURAL ||

                     output_config == AUDIO_CONFIG_BINAURAL )

#else

                if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

                {

#ifdef DEBUGGING

                    if ( ( ( ( st_ivas->transport_config == AUDIO_CONFIG_5_1 || st_ivas->transport_config == AUDIO_CONFIG_7_1 ) && st_ivas->hDecoderConfig->Opt_Headrotation ) || ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) ) && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) && !( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) )