Commit bdb27e45 authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2389 removing return value in readTnsData() and void casts on its return values

parent 13482986

lib_com/prot_fx.h

+6 −6
Original line number Diff line number Diff line
@@ -8389,7 +8389,7 @@ void tcx_hm_modify_envelope( 
    Word16 L_frame    /* i:   number of spectral lines          Q0  */

);

#ifdef HARMONIZE_READ_DECODE_TNS

Word16 ReadTnsData_fx(

void ReadTnsData_fx(

    STnsConfig const* pTnsConfig,

    Decoder_State* st,

    Word16* pnBits,

lib_dec/dec_prm_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ void getTCXparam_fx( 
                {

#ifdef HARMONIZE_READ_DECODE_TNS



                    (void) ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams );

                    ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams );

#else



                    ReadTnsData_ivas_fx( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams );
@@ -1358,7 +1358,7 @@ void dec_prm_fx( 
        {

            SetTnsConfig( st->hTcxCfg, 1, (Word16) EQ_16( st->last_core_from_bs, ACELP_CORE ) );

#ifdef HARMONIZE_READ_DECODE_TNS

            (void) ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams );

            ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams );

#else

            ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams );

#endif //  HARMONIZE_READ_DECODE_TNS
@@ -1686,7 +1686,7 @@ void dec_prm_fx( 
                test();

                SetTnsConfig( st->hTcxCfg, 0, ( st->last_core_from_bs == ACELP_CORE ) && ( k == 0 ) );

#ifdef HARMONIZE_READ_DECODE_TNS

                (void) ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams );

                ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams );

#else

                ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams );

#endif // DEBUG

lib_dec/tns_base_dec_fx.c

+6 −7
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ typedef Word32 ( *TLinearPredictionFilter )( Word16 order, Word16 const parCoeff 
 *

 *

 *---------------------------------------------------------------------*/

Word16 ReadTnsData_fx(

void ReadTnsData_fx(

    STnsConfig const* pTnsConfig,

    Decoder_State* st,

    Word16* pnBits, /*Q0*/
@@ -76,7 +76,6 @@ Word16 ReadTnsData_fx( 
    move16();

    *pnBits = sub( st->next_bit_pos, start_bit_pos );



    return TNS_NO_ERROR;

}

/*---------------------------------------------------------------------*

 * DecodeTnsData()