Commit f88052ca authored by sagnowski's avatar sagnowski
Browse files

Fix formatting

parent c050055e

apps/decoder.c

+49 −49
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS 
#ifdef FIX_1119_SPLIT_RENDERING_VOIP

                              ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

#endif

        IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

                              IVAS_DEC_HANDLE hIvasDec,

                              int16_t *pcmBuf );

static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );

#ifdef DEBUGGING

static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );
@@ -3387,8 +3388,7 @@ static ivas_error decodeVoIP( 
                                                                        &bitstreamReadDone,

                                                                        &nSamplesRendered,

                                                                        &parametersAvailableForEditing,

                                                                    systemTime_ms

                                                                   ) ) != IVAS_ERR_OK )

                                                                        systemTime_ms ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSplitBinauralBitstream: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;

lib_dec/cldfb_ring_buffer.c

+8 −7
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ 


#ifdef FIX_1119_SPLIT_RENDERING_VOIP



struct CldfbRingBuf {

struct CldfbRingBuf

{

    float *real;

    float *imag;

    uint32_t capacity;

lib_dec/ivas_dirac_dec.c

+2 −3
Original line number Diff line number Diff line
@@ -1672,8 +1672,7 @@ static void binRenderer_split( 
                    hSplitBinRend->hMultiBinCldfbData[pos_idx * BINAURAL_CHANNELS + ch],

                    Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx],

                    Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx],

                    num_freq_bands

                );

                    num_freq_bands );

#else

                mvr2r( Cldfb_RealBuffer_Binaural_loc[pos_idx][ch][slot_idx], hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], num_freq_bands );

                mvr2r( Cldfb_ImagBuffer_Binaural_loc[pos_idx][ch][slot_idx], hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], num_freq_bands );

lib_dec/ivas_mc_param_dec.c

+2 −3
Original line number Diff line number Diff line
@@ -1791,8 +1791,7 @@ void ivas_param_mc_dec_render( 
                                st_ivas->hSplitBinRend->hMultiBinCldfbData[pos_idx * BINAURAL_CHANNELS + ch],

                                Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx],

                                Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx],

                                hParamMC->num_freq_bands

                            );

                                hParamMC->num_freq_bands );

#else

                            mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], hParamMC->num_freq_bands );

                            mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], hParamMC->num_freq_bands );

lib_dec/ivas_mc_paramupmix_dec.c

+2 −3
Original line number Diff line number Diff line
@@ -795,8 +795,7 @@ static void ivas_mc_paramupmix_dec_sf( 
                            st_ivas->hSplitBinRend->hMultiBinCldfbData[pos_idx * BINAURAL_CHANNELS + ch],

                            Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx],

                            Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx],

                            maxBand

                        );

                            maxBand );

#else

                        mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_index_start + slot_idx], maxBand );