Commit 52b6caa7 authored by PLAINSI's avatar PLAINSI
Browse files

Remove unnecessary renderer type

parent e70fe695

lib_com/ivas_cnst.h

+0 −3
Original line number Diff line number Diff line
@@ -157,9 +157,6 @@ typedef enum 
    RENDERER_PARAM_ISM,

    RENDERER_BINAURAL_MIXER_CONV,

    RENDERER_BINAURAL_MIXER_CONV_ROOM

#ifdef MC_PARAMUPMIX_MODE

    ,RENDERER_MC_PARAMUPMIX

#endif



} RENDERER_TYPE;

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ ivas_error ivas_dec( 


                ivas_binaural_add_LFE( st_ivas, output_frame, output );

            }

            else if ( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_MC_PARAMUPMIX )

            else if ( st_ivas->renderer_type == RENDERER_MC )

            {

                ivas_ls_setup_conversion( st_ivas, MC_PARAMUPMIX_MAX_INPUT_CHANS, output_frame, output );

            }

lib_dec/ivas_init_dec.c

+0 −7
Original line number Diff line number Diff line
@@ -1294,11 +1294,7 @@ ivas_error ivas_init_decoder( 
            }

        }

    }

#ifdef MC_PARAMUPMIX_MODE

    else if ( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_MC_PARAMUPMIX )

#else

    else if ( st_ivas->renderer_type == RENDERER_MC )

#endif

    {

        if ( ( error = ivas_ls_setup_conversion_open( st_ivas ) ) != IVAS_ERR_OK )

        {
@@ -1947,9 +1943,6 @@ void ivas_init_dec_get_num_cldfb_instances( 
        case RENDERER_BINAURAL_MIXER_CONV_ROOM:

        case RENDERER_BINAURAL_FASTCONV:

        case RENDERER_BINAURAL_FASTCONV_ROOM:

#ifdef MC_PARAMUPMIX_MODE

        case RENDERER_MC_PARAMUPMIX:

#endif

            if ( st_ivas->sba_mode == SBA_MODE_SPAR )

            {

                if ( st_ivas->sba_dirac_stereo_flag )

lib_dec/ivas_mct_dec.c

+2 −13
Original line number Diff line number Diff line
@@ -190,19 +190,12 @@ ivas_error ivas_mct_dec( 
                               fUseTns[cpe_id], tnsData[cpe_id], x, Aq[cpe_id], 1 );

    }



#ifdef MC_PARAMUPMIX_MODE

    if ( ( st_ivas->renderer_type == RENDERER_MC ) || ( st_ivas->renderer_type == RENDERER_MC_PARAMUPMIX ) )

    {

        /* Equalization in MDCT Domain */

        ivas_ls_setup_conversion_process_mdct( st_ivas, output );

    }

#else

    if ( st_ivas->renderer_type == RENDERER_MC )

    {

        /* Equalization in MDCT Domain */

        ivas_ls_setup_conversion_process_mdct( st_ivas, output );

    }

#endif



    else if ( st_ivas->renderer_type == RENDERER_MC_PARAMMC && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) )

    {

        float *x_all[MAX_CICP_CHANNELS][NB_DIV];
@@ -787,7 +780,7 @@ static ivas_error ivas_mc_dec_reconfig( 
            ivas_qmetadata_close( &st_ivas->hQMetaData );



            /* init LS conversion if the renderer type asks for it */

            if ( ( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_MC_PARAMUPMIX ) && st_ivas->hLsSetUpConversion == NULL )

            if ( ( st_ivas->renderer_type == RENDERER_MC ) && st_ivas->hLsSetUpConversion == NULL )

            {

                if ( ( error = ivas_ls_setup_conversion_open( st_ivas ) ) != IVAS_ERR_OK )

                {
@@ -1192,11 +1185,7 @@ static ivas_error ivas_mc_dec_reconfig( 
        else if ( output_config == AUDIO_CONFIG_5_1 || output_config == AUDIO_CONFIG_5_1_2 || output_config == AUDIO_CONFIG_5_1_4 || output_config == AUDIO_CONFIG_7_1 || output_config == AUDIO_CONFIG_7_1_4 || output_config == AUDIO_CONFIG_LS_CUSTOM )

        {

#ifdef DEBUGGING

#ifdef MC_PARAMUPMIX_MODE

            assert( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_MC_PARAMMC || st_ivas->renderer_type == RENDERER_MC_PARAMUPMIX || st_ivas->renderer_type == RENDERER_DIRAC || st_ivas->renderer_type == RENDERER_DISABLE );

#else

            assert( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_MC_PARAMMC || st_ivas->renderer_type == RENDERER_DIRAC || st_ivas->renderer_type == RENDERER_DISABLE );

#endif

#endif

        }

#ifdef DEBUGGING

lib_dec/ivas_out_setup_conversion.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ ivas_error ivas_ls_setup_conversion_open( 
    else

    {

#ifdef MC_PARAMUPMIX_MODE

        if ( st_ivas->renderer_type == RENDERER_MC_PARAMUPMIX )

        if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMUPMIX )

        {

            inChannels = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe;

        }