Commit 99787728 authored by vaclav's avatar vaclav
Browse files

formatting, comments

parent 3ecf34f4

apps/decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -3536,8 +3536,6 @@ static ivas_error decodeVoIP( 
                    return error;

                }



                //nSamplesRendered += hIvasDec->nSamplesFlushed;



                /* Placeholder for memory reallocation */

                /* ... */

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ 
#define FIX_587_DEFAULT_REVERB                          /* Philips: issue 587: inconsistent default reverb parameters across renderers */

#define FIX_VOIP_FUNCTIONS                              /* VA: fix data type mismatch in IVAS_DEC_VoIP_SetScale() + add sanity checks to API functions */



#define FIX_HRTF_LOAD   /* VA: fix memory issue when HRTFs are loaded from a binary file */

#define FIX_HRTF_LOAD                                   /* VA: issue 1187: fix memory issue when HRTFs are loaded from a binary file */

#define FIX_HRTF_LOAD_JBM



/* #################### End BE switches ################################## */

lib_dec/lib_dec.c

+2 −3
Original line number Diff line number Diff line
@@ -926,8 +926,8 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
    hIvasDec->nSamplesAvailableNext = hIvasDec->nSamplesFrame;



#ifdef OBJ_EDITING_API

#ifndef FIX_HRTF_LOAD_JBM

#ifdef FIX_HRTF_LOAD // VE: TODO - JBM decoder path to be addressed

#ifndef FIX_HRTF_LOAD_JBM

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

    {

        if ( ( error = IVAS_DEC_GetSamplesDecoder( hIvasDec, isSplitRend, splitRendBits ) ) != IVAS_ERR_OK )
@@ -936,7 +936,6 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
        }

    }

#endif

#endif

#else

    /* Decode TCs, do TSM and feed to renderer.

           If TSM is generally enabled, we have to wait for the first good frame.
@@ -1059,7 +1058,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
        }

    }

#endif



#endif

    return IVAS_ERR_OK;

}

lib_dec/ivas_masa_dec.c

+1 −1

File changed.

Contains only whitespace changes.

lib_dec/ivas_omasa_dec.c

+1 −1

File changed.

Contains only whitespace changes.