Commit 234f13f5 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Change function name ivas_init_dec_get_num_cldfb_instances to...

Change function name ivas_init_dec_get_num_cldfb_instances to ivas_init_dec_get_num_cldfb_instances_fx
parent b591e5a6
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ Word16 read_flag_EC_DFT(
    Word16 *flag               /* o  : flag value           */
);

void ivas_init_dec_get_num_cldfb_instances(
void ivas_init_dec_get_num_cldfb_instances_fx(
    Decoder_Struct *st_ivas,  /* i  : IVAS decoder structure                  */
    Word16 *numCldfbAnalyses, /* o  : number of CLDFB analysis instances      */
    Word16 *numCldfbSyntheses /* o  : number of CLDFB synthesis instances     */
+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ ivas_error ivas_cldfb_dec_reconfig_fx(

    hDecoderConfig = st_ivas->hDecoderConfig;

    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses, &numCldfbSyntheses );
    ivas_init_dec_get_num_cldfb_instances_fx( st_ivas, &numCldfbAnalyses, &numCldfbSyntheses );

    /* special case, if there was one transport channel in the previous frame and more than one in the current frame,
       remove the second CLDFB here, it was for CNA/CNG */
+2 −2
Original line number Diff line number Diff line
@@ -2658,7 +2658,7 @@ ivas_error ivas_init_decoder_fx(
     * CLDFB handles for rendering
     *-----------------------------------------------------------------*/

    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses, &numCldfbSyntheses );
    ivas_init_dec_get_num_cldfb_instances_fx( st_ivas, &numCldfbAnalyses, &numCldfbSyntheses );

    FOR( i = 0; i < numCldfbAnalyses; i++ )
    {
@@ -3270,7 +3270,7 @@ void ivas_destroy_dec_fx(
 *-------------------------------------------------------------------*/

/*! r: number of cldfb instances */
void ivas_init_dec_get_num_cldfb_instances(
void ivas_init_dec_get_num_cldfb_instances_fx(
    Decoder_Struct *st_ivas,  /* i  : IVAS decoder structure                     */
    Word16 *numCldfbAnalyses, /* o  : number of needed CLDFB analysis instances  */
    Word16 *numCldfbSyntheses /* o  : number of needed CLDFB synthesis instances */
+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
    move16();
    st_ivas->ism_mode = last_ism_mode;
    move16();
    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );
    ivas_init_dec_get_num_cldfb_instances_fx( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );
    st_ivas->ism_mode = ism_mode;
    move16();
    nchan_out_buff_old = ivas_get_nchan_buffers_dec_ivas_fx( st_ivas, -1, -1 );
+1 −1
Original line number Diff line number Diff line
@@ -1702,7 +1702,7 @@ ivas_error ivas_masa_dec_reconfigure_fx(
        move16();
    }

    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );
    ivas_init_dec_get_num_cldfb_instances_fx( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

    /* renderer might have changed, reselect */
    ivas_renderer_select( st_ivas );
Loading