Commit 9cdaf697 authored by vaclav's avatar vaclav
Browse files

fix

parent 571a5a88

lib_com/ivas_prot_fx.h

+2 −2
Original line number Diff line number Diff line
@@ -5163,7 +5163,7 @@ void ivas_param_mc_dec_close_fx( 
void ivas_param_mc_dec_digest_tc_fx(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                             */

    const UWord8 nCldfbSlots,                                   /* i  : number of CLFBS slots in the transport channels */

    Word32 *transport_channels_f_fx[],                          /* i  : synthesized core-coder transport channels/DirAC output */

    Word32 *p_data_fx[],                                        /* i/o: synthesized core-coder transport channels/DirAC output */

    const Word16 transport_f_e

);

lib_dec/ivas_mc_param_dec_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -1524,7 +1524,7 @@ void ivas_param_mc_dec_read_BS_fx( 
void ivas_param_mc_dec_digest_tc_fx(

    Decoder_Struct *st_ivas,  /* i/o: IVAS decoder handle                                      */

    const UWord8 nCldfbSlots, /* i  : number of CLDFB slots in transport channels              */

    Word32 *transport_channels_f_fx[], /* i  : synthesized core-coder transport channels/DirAC output   */

    Word32 *p_data_fx[],      /* i/o: synthesized core-coder transport channels/DirAC output   */

    const Word16 transport_f_e )

{

    PARAM_MC_DEC_HANDLE hParamMC;
@@ -1671,7 +1671,7 @@ void ivas_param_mc_dec_digest_tc_fx( 
                    {

                        qout = transport_f_e;

                        move16();

                        cldfbAnalysis_ts_fx_fixed_q( &( transport_channels_f_fx[ch][hParamMC->num_freq_bands * slot_idx] ), RealBuffer_fx, ImagBuffer_fx, hParamMC->num_freq_bands, st_ivas->cldfbAnaDec[ch], &qout );

                        cldfbAnalysis_ts_fx_fixed_q( &( p_data_fx[ch][hParamMC->num_freq_bands * slot_idx] ), RealBuffer_fx, ImagBuffer_fx, hParamMC->num_freq_bands, st_ivas->cldfbAnaDec[ch], &qout );



                        Copy32( RealBuffer_fx, &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );

                        Copy32( ImagBuffer_fx, &hParamMC->Cldfb_ImagBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );

lib_dec/lib_dec_fx.c

+1 −3
Original line number Diff line number Diff line
@@ -4528,7 +4528,6 @@ ivas_error IVAS_DEC_SetEditableParameters( 
        test();

        IF( EQ_32( ism_mode, ISM_MODE_DISC ) || EQ_32( ism_mode, ISM_SBA_MODE_DISC ) )

        {



#ifdef DEBUGGING

            assert( hIvasEditableParameters.num_obj == st_ivas->nchan_ism );

#endif
@@ -4558,7 +4557,6 @@ ivas_error IVAS_DEC_SetEditableParameters( 
        }

        ELSE IF( EQ_32( ism_mode, ISM_MODE_PARAM ) )

        {



#ifdef DEBUGGING

            assert( hIvasEditableParameters.num_obj == st_ivas->nchan_ism );

#endif
@@ -4605,7 +4603,7 @@ ivas_error IVAS_DEC_SetEditableParameters( 
        }

        ELSE IF( EQ_32( ism_mode, ISM_MODE_NONE ) )

        {

            IF( hIvasEditableParameters.num_obj != 0 )

            IF( NE_16( hIvasEditableParameters.num_obj, 0 ) )

            {

                return IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED;

            }