Commit 0f5a0efe authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 1438-rtpdump-is-not-rtpdump

parents 8d87bebf 24152d66

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -3115,7 +3115,7 @@ static ivas_error printBitstreamInfoVoip( 
{

    bool previewFailed = true;

    ivas_error error = IVAS_ERR_OK;

    IVAS_RTP ivasRtp;

    IVAS_RTP ivasRtp = { 0 };

    uint8_t au[( IVAS_MAX_BITS_PER_FRAME + 7 ) >> 3];

    int16_t auSizeBits;

    uint8_t *auPtr = NULL;

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ int main( 
    /* Set reverb room size if specified */

    if ( args.reverbRoomSize != IVAS_ROOM_SIZE_AUTO )

    {

        if ( ( IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError setting reverb room size\n" );

            goto cleanup;

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,8 @@ 


#define USE_RTPDUMP                                     /* FhG: RTPDUMP format (rtptools standard) instead of custom format */

#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS        /* Nokia: float issue 1569: fix render config checks in renderer */

#define FIX_1571_BFI_COPY_ARRAY_CORRECT_LEN             /* FhG: issue 1571: use correct channel signal length for copying signal to buffer */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_mdct_core_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -551,7 +551,11 @@ void ivas_mdct_core_invQ( 
        L_frameTCX[0] = sts[0]->L_frameTCX_past;

        L_frameTCX[1] = sts[1]->L_frameTCX_past;

        mvr2r( sts[0]->hTonalMDCTConc->lastBlockData.spectralData, tmp_ms_sig[0], L_frameTCX[0] );

#ifdef FIX_1571_BFI_COPY_ARRAY_CORRECT_LEN

        mvr2r( sts[1]->hTonalMDCTConc->lastBlockData.spectralData, tmp_ms_sig[1], L_frameTCX[1] );

#else

        mvr2r( sts[1]->hTonalMDCTConc->lastBlockData.spectralData, tmp_ms_sig[1], L_frameTCX[0] );

#endif

        stereo_decoder_tcx( hCPE->hStereoMdct, ms_mask, x_0[1], &sts[0]->hTonalMDCTConc->lastBlockData.spectralData, &sts[1]->hTonalMDCTConc->lastBlockData.spectralData, &hCPE->hStereoMdct->mdct_stereo_mode[0], sts[0]->core, sts[1]->core, sts[0]->igf, L_frameTCX[0], L_frameTCX[1], 0, sts[0]->last_core, sts[1]->last_core, 1 );

    }

lib_rend/lib_rend.c

+14 −0
Original line number Diff line number Diff line
@@ -4093,13 +4093,27 @@ ivas_error IVAS_REND_AddInput( 
    setMaxGlobalDelayNs( hIvasRend );



    /* select default reverb size after adding an input */

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

    if ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET )

#else

    if ( hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET )

#endif

    {

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, getDefaultReverbSize( hIvasRend->inputsIsm,

                                                                                     hIvasRend->inputsMasa,

                                                                                     hIvasRend->inputsMc,

                                                                                     hIvasRend->inputsSba ) ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#else

        IVAS_REND_SetReverbRoomSize( hIvasRend,

                                     getDefaultReverbSize( hIvasRend->inputsIsm,

                                                           hIvasRend->inputsMasa,

                                                           hIvasRend->inputsMc,

                                                           hIvasRend->inputsSba ) );

#endif

    }



    return IVAS_ERR_OK;