Commit 89843a5f authored by sagnowski's avatar sagnowski
Browse files

Whitespace changes to minimise diff wrt original changes

parent 572c9813

lib_dec/lib_dec.c

+4 −6
Original line number Diff line number Diff line
@@ -80,10 +80,10 @@ struct IVAS_DEC 
    int16_t bitstreamformat; /* Bitstream format flag (G.192/MIME/VOIP_G192_RTP/VOIP_RTPDUMP) */

    bool Opt_VOIP;           /* flag indicating VOIP mode with JBM */

    int16_t tsm_scale;       /* scale for TSM operation */

    int16_t tsm_max_scaling;

#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE

    int16_t timeScalingDone; /* have we done already one TSM in a 20ms frame? */

#endif

    int16_t tsm_max_scaling;

    float tsm_quality;

    float *apaExecBuffer; /* Buffer for APA scaling */

    PCMDSP_APA_HANDLE hTimeScaler;
@@ -122,7 +122,6 @@ static int16_t get_render_frame_size_ms( IVAS_RENDER_FRAMESIZE render_framesize 
static void update_voip_rendered20ms( IVAS_DEC_HANDLE hIvasDec, const int16_t nSamplesRendered );

#endif





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

 * IVAS_DEC_Open()

 *
@@ -910,19 +909,19 @@ ivas_error IVAS_DEC_GetSamples( 
                {

                    nSamplesTcsScaled = hIvasDec->nSamplesFrame;

                }



#ifdef DEBUG_MODE_JBM

                dbgwrite( &nTimeScalerOutSamples, sizeof( uint16_t ), 1, 1, "./res/JBM_nTimeScaleOutSamples.dat" );

#endif



                /* Feed decoded transport channels samples to the renderer */

                if ( ( error = IVAS_DEC_RendererFeedTcSamples( hIvasDec, nSamplesTcsScaled, &nResidualSamples, hIvasDec->apaExecBuffer ) ) != IVAS_ERR_OK )

                {

                    return error;

                }



#ifdef DEBUG_MODE_JBM

                dbgwrite( &nResidualSamples, sizeof( int16_t ), 1, 1, "./res/JBM_nResidualSamples.dat" );

#endif



                if ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )

                {

                    /* feed residual samples to TSM for the next call */
@@ -2189,6 +2188,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
            extBufferedTime_ms = extBufferedSamples * 1000 / hDecoderConfig->output_Fs;

            dataUnit = NULL;





            /* pop one access unit from the jitter buffer */

            result = JB4_PopDataUnit( hVoIP->hJBM, systemTimestamp_ms, extBufferedTime_ms, &dataUnit, &scale, &maxScaling );

            if ( result != 0 )
@@ -2332,7 +2332,6 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
}



#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE



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

 * update_voip_rendered20ms( )

 *
@@ -2390,7 +2389,6 @@ ivas_error IVAS_DEC_Flush( 
        *nSamplesFlushed = 0;

    }

#endif



    return error;

}