Commit b42e4d79 authored by Archit Tamarapu's avatar Archit Tamarapu Committed by Sandesh Venkatesh
Browse files

conflict resolution for options.h

parent 78e83a96

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ 
#define FIX_907_MEM_UPDATE_ISSUE                /* VA: fix for 907, multiples issues surrounding mem_syn_r and update of mem_syn2 when FS is changing */

#define FIX_918_WRONG_SCALING_ON_MODE_SWITCHING   /* VA: Fix wrong scaling of secondary channel when switching from stereo DFT to TD */

#define FIX_924_IGF_ROUNDFX_SAT

#define FIX_930_JBM_BUFSIZE_MULT                /* FhG: Fix 930, Word16 too small for apa_buffer_size */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/lib_dec_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -3637,7 +3637,11 @@ static ivas_error IVAS_DEC_VoIP_reconfigure( 
    const UWord16 nTransportChannels,

    const UWord16 l_ts )

{

#ifdef FIX_930_JBM_BUFSIZE_MULT

    Word32 apa_buffer_size;

#else

    Word16 apa_buffer_size;

#endif



    apa_buffer_size = hIvasDec->nSamplesFrame;

    move16();
@@ -3706,12 +3710,20 @@ static ivas_error IVAS_DEC_VoIP_reconfigure( 
                }

            }



#ifdef FIX_930_JBM_BUFSIZE_MULT

            IF( ( hIvasDec->apaExecBuffer_fx = malloc( sizeof( Word32 ) * L_mult( apa_buffer_size, (Word16) nTransportChannels ) ) ) == NULL )

#else

            IF( ( hIvasDec->apaExecBuffer_fx = malloc( sizeof( Word32 ) * imult1616( apa_buffer_size, (Word16) nTransportChannels ) ) ) == NULL )

#endif

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate VoIP handle" );

            }



#ifdef FIX_930_JBM_BUFSIZE_MULT

            set_zero_fx( hIvasDec->apaExecBuffer_fx, L_mult( apa_buffer_size, (Word16) nTransportChannels ) );

#else

            set_zero_fx( hIvasDec->apaExecBuffer_fx, imult1616( apa_buffer_size, (Word16) nTransportChannels ) );

#endif

        }

    }

    ELSE