Commit cf1a0f5a authored by vaclav's avatar vaclav
Browse files

revert some changes

parent 60407004

apps/decoder.c

+2 −2
Original line number Diff line number Diff line
@@ -3299,8 +3299,8 @@ static ivas_error decodeVoIP( 
            else

            {

                auPtr = au; /* might have been set to RTP packet in prev call */

                rtpdumpDepackerError = EVS_RTPDUMP_DEPACKER_readNextFrame( &rtpdumpDepacker, &rtpSequenceNumber, &rtpTimeStamp, &nextPacketRcvTime_ms,

                                                                           &isAMRWB_IOmode, &frameTypeIndex, &qBit, &auPtr, (uint16_t *) &auSize );

                rtpdumpDepackerError = EVS_RTPDUMP_DEPACKER_readNextFrame( &rtpdumpDepacker, &rtpSequenceNumber, &rtpTimeStamp, &nextPacketRcvTime_ms, &isAMRWB_IOmode, &frameTypeIndex, &qBit, &auPtr, (uint16_t *) &auSize );



                /* EVS RTP payload format has timescale 16000, JBM uses 1000 internally */

                rtpTimeStamp = rtpTimeStamp / 16;

            }

apps/renderer.c

+0 −1
Original line number Diff line number Diff line
@@ -3996,7 +3996,6 @@ static void convertInputBuffer( 
    return;

}





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

 * convertOutputBuffer()

 *

lib_com/ivas_cnst.h

+3 −3
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ typedef enum 
#define SPAR_CONFIG_BW                          FB



#define IVAS_SPAR_MAX_CH                        ((( IVAS_MAX_SBA_ORDER ) * ( IVAS_MAX_SBA_ORDER )) + 2) /* HOA2 + pHOA3*/

#define IVAS_HBR_MAX_DECOR_CHS                  2

#define IVAS_HBR_MAX_DECOR_CHS                  (2)



#define IVAS_SPAR_MAX_FB_IN_CHAN                11
@@ -1007,8 +1007,8 @@ typedef enum 
#define IVAS_ACTIVEW_DM_F_SCALE_VLBR            0.25f

#define IVAS_SPAR_FOA_DFLT_FREQ_PER_CHAN        24000



#define IVAS_SPAR_DYN_ACTIVEW_THRESH            0.0039f

#define IVAS_SPAR_SIDE_CH_DYN_ACTIVEW_THRESH    32.0f

#define IVAS_SPAR_DYN_ACTIVEW_THRESH            (0.0039f)

#define IVAS_SPAR_SIDE_CH_DYN_ACTIVEW_THRESH    (32.0f)



#define MAX_QUANT_STRATS                        3

#define MAX_CODING_STRATS                       3

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ ivas_error ivas_jbm_dec_tc( 
    float *data                                                 /* o  : output synthesis signals                                    */

);



ivas_error ivas_dec_render(

ivas_error ivas_jbm_dec_render(

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

    const uint16_t nSamplesAsked,                               /* i  : number of samples requested                                 */

    uint16_t *nSamplesRendered,                                 /* o  : number of samples rendered                                  */

lib_dec/ivas_jbm_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -919,12 +919,12 @@ void ivas_jbm_dec_feed_tc_to_renderer( 




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

 * ivas_dec_render()

 * ivas_jbm_dec_render()

 *

 * Principal IVAS rendering routine

 * Principal IVAS JBM rendering routine

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



ivas_error ivas_dec_render(

ivas_error ivas_jbm_dec_render(

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

    const uint16_t nSamplesAsked,    /* i  : number of samples requested                                 */

    uint16_t *nSamplesRendered,      /* o  : number of samples rendered                                  */
@@ -952,7 +952,7 @@ ivas_error ivas_dec_render( 
    int16_t nchan_out_syn_output;

#endif



    push_wmops( "ivas_dec_render" );

    push_wmops( "ivas_jbm_dec_render" );

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

     * Initialization of local vars after struct has been set

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