Commit 310ce0b9 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Fix for 3GPP issue 1374: Duplicate functions... 

Fix for 3GPP issue 1374: Duplicate functions param_mc_get_num_cldfb_syntheses_fx() and param_mc_get_num_cldfb_syntheses_ivas_fx()

Link #1374
parent 7f488e0a

lib_com/ivas_prot_fx.h

+0 −5
Original line number Diff line number Diff line
@@ -669,11 +669,6 @@ Word16 read_flag_EC_DFT( 
    Word16 *flag               /* o  : flag value           */

);



/*file : ivas_mc_param_dec_fx.c*/

Word16 param_mc_get_num_cldfb_syntheses_ivas_fx(

    Decoder_Struct *st_ivas /* i  : Parametric MC handle */

);



void ivas_init_dec_get_num_cldfb_instances(

    Decoder_Struct *st_ivas,  /* i  : IVAS decoder structure                  */

    Word16 *numCldfbAnalyses, /* o  : number of CLDFB analysis instances      */

lib_dec/ivas_init_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ void ivas_init_dec_get_num_cldfb_instances_ivas_fx( 
            }

            ELSE

            {

                *numCldfbSyntheses = param_mc_get_num_cldfb_syntheses_ivas_fx( st_ivas );

                *numCldfbSyntheses = param_mc_get_num_cldfb_syntheses_fx( st_ivas );

                move16();

            }

            BREAK;
@@ -210,7 +210,7 @@ void ivas_init_dec_get_num_cldfb_instances_ivas_fx( 
        case RENDERER_SBA_LINEAR_ENC:

            IF( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMMC ) )

            {

                *numCldfbSyntheses = param_mc_get_num_cldfb_syntheses_ivas_fx( st_ivas );

                *numCldfbSyntheses = param_mc_get_num_cldfb_syntheses_fx( st_ivas );

                move16();

            }

            ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) )

lib_dec/ivas_mc_param_dec_fx.c

+0 −33
Original line number Diff line number Diff line
@@ -3789,36 +3789,3 @@ static void ivas_param_mc_bs_decode_parameter_values_fx( 


    return;

}
 


Word16 param_mc_get_num_cldfb_syntheses_ivas_fx(

    Decoder_Struct *st_ivas /* i  : Parametric MC handle */

)

{

    Word16 num_cldfb_syntheses;



    num_cldfb_syntheses = 0;

    move16();



    /* sanity check*/

    IF( st_ivas->hParamMC == NULL )

    {

        assert( 0 && "ParamMC handle does not exist!\n" );

    }



    test();

    IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )

    {

        num_cldfb_syntheses = 2;

        move16();

    }

    ELSE IF( EQ_16( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )

    {

        num_cldfb_syntheses = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );

    }

    ELSE IF( EQ_16( st_ivas->renderer_type, RENDERER_MC_PARAMMC ) )

    {

        num_cldfb_syntheses = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );

    }



    return num_cldfb_syntheses;

}