Commit dcb57b19 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Revert intermediate EVS changes. 

[x] Two JBM issues still present.
parent 2e64de3a

lib_dec/ivas_jbm_dec.c

+1 −5
Original line number Diff line number Diff line
@@ -2791,7 +2791,7 @@ ivas_error ivas_jbm_dec_render( 
    {

#ifdef IVAS_FLOAT_FIXED

        FOR(Word16 ind = 0; ind < st_ivas->hTcBuffer->nchan_transport_jbm; ind++) {

            floatToFixed_arrL(st_ivas->hTcBuffer->tc[ind] + st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hTcBuffer->tc_fx[ind] + st_ivas->hTcBuffer->n_samples_rendered, Q11, st_ivas->hTcBuffer->tc_buffer_len[ind]- st_ivas->hTcBuffer->n_samples_rendered);

            floatToFixed_arrL(st_ivas->hTcBuffer->tc[ind] + st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hTcBuffer->tc_fx[ind] + st_ivas->hTcBuffer->n_samples_rendered, Q11, s_max(*nSamplesRendered, nSamplesAskedLocal));

            p_output_fx[ind] = malloc(sizeof(Word32) * 960);

            floatToFixed_arrL(p_output[ind], p_output_fx[ind], Q11, s_max(*nSamplesRendered, nSamplesAskedLocal));

        }
@@ -5108,7 +5108,6 @@ ivas_error ivas_jbm_dec_tc_buffer_open( 
                {

                    hTcBuffer->tc[ch_idx] = &hTcBuffer->tc_buffer[offset];

#ifdef IVAS_FLOAT_FIXED

                    hTcBuffer->tc_buffer_len[ch_idx] = nsamp_to_allocate-offset;

                    hTcBuffer->tc_fx[ch_idx] = &hTcBuffer->tc_buffer_fx[offset];

#endif

                    offset += n_samp_full;
@@ -5117,7 +5116,6 @@ ivas_error ivas_jbm_dec_tc_buffer_open( 
                {

                    hTcBuffer->tc[ch_idx] = &hTcBuffer->tc_buffer[offset];

#ifdef IVAS_FLOAT_FIXED

                    hTcBuffer->tc_buffer_len[ch_idx] = nsamp_to_allocate - offset;

                    hTcBuffer->tc_fx[ch_idx] = &hTcBuffer->tc_buffer_fx[offset];

#endif

                    offset += n_samp_residual;
@@ -5288,7 +5286,6 @@ ivas_error ivas_jbm_dec_tc_buffer_open_fx( 
#if 1 /* TODO: remove float code */

                    hTcBuffer->tc[ch_idx] = &hTcBuffer->tc_buffer[offset];

#endif

                    hTcBuffer->tc_buffer_len[ch_idx] = nsamp_to_allocate- offset;

                    hTcBuffer->tc_fx[ch_idx] = &hTcBuffer->tc_buffer_fx[offset];

                    offset = L_add( offset, n_samp_full );

                }
@@ -5297,7 +5294,6 @@ ivas_error ivas_jbm_dec_tc_buffer_open_fx( 
#if 1 /* TODO: remove float code */

                    hTcBuffer->tc[ch_idx] = &hTcBuffer->tc_buffer[offset];

#endif

                    hTcBuffer->tc_buffer_len[ch_idx] = nsamp_to_allocate- offset;

                    hTcBuffer->tc_fx[ch_idx] = &hTcBuffer->tc_buffer_fx[offset];

                    offset = L_add( offset, n_samp_residual );

                }

lib_dec/ivas_stat_dec.h

+0 −1
Original line number Diff line number Diff line
@@ -1217,7 +1217,6 @@ typedef struct decoder_tc_buffer_structure 
    float *tc_buffer;                                                                                                                /* the buffer itself                                                        */

    float *tc[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS]; /* pointers into the buffer to the beginning of each tc                     */ // VE2SB: TBV

#ifdef IVAS_FLOAT_FIXED

    Word16 tc_buffer_len[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS];

    Word32 *tc_buffer_fx;                                                                                                           /* the buffer itself                                                        */

    Word32 *tc_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS]; /* pointers into the buffer to the beginning of each tc                    */ // VE2SB: TBV

#endif

lib_dec/jbm_jb4sb.c

+0 −9
Original line number Diff line number Diff line
@@ -862,21 +862,12 @@ static void JB4_adaptActivePlayout( 
        {

            IF ( convertToLateLoss )

            {

#ifdef EVS_FLOAT

                JB4_dropFromBuffer( h );

#else

                JB4_dropFromBuffer( h );

                h->nLostOrStretched = L_add( h->nLostOrStretched, 1 );

#endif // EVS_FLOAT

            }

            ELSE IF ( dropEarly )

            {

#ifdef EVS_FLOAT

                JB4_dropFromBuffer( h );

                ++h->nLostOrStretched;

#else

                JB4_dropFromBuffer( h );

#endif

            }

            ELSE

            {