Commit 27771584 authored by Jan Kiene's avatar Jan Kiene
Browse files

make sure to store delay in ms and not already in subframe indexes

parent 37abee01

lib_rend/lib_rend.c

+15 −5
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ static ivas_error alignInputDelay( 
            if ( getAudioConfigType( inputBase->inConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED )

            {

                inputIsm = (input_ism *) inputBase;

                inputIsm->ism_metadata_delay_ms = (int16_t) roundf( inputIsm->ism_metadata_delay_ms + maxGlobalDelayNs / 1e6f / ( 1000.f / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES ) );

                inputIsm->ism_metadata_delay_ms = (int16_t) roundf( inputIsm->ism_metadata_delay_ms + maxGlobalDelayNs / 1e6f );

            }

        }

    }
@@ -5474,12 +5474,15 @@ static ivas_error renderIsmToBinaural( 
{

    float tmpTDRendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];

    ivas_error error;

    int16_t ism_md_subframe_update_ext;



    push_wmops( "renderIsmToBinaural" );



    /* Metadata Delay to sync with audio delay converted from ms to 5ms (1000/50/4) subframe index */

    ism_md_subframe_update_ext = (int16_t) roundf( ismInput->ism_metadata_delay_ms / ( 1000.f / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES ) );

    copyBufferTo2dArray( ismInput->base.inputBuffer, tmpTDRendBuffer );



    if ( ( error = ivas_td_binaural_renderer_ext( &ismInput->tdRendWrapper, ismInput->base.inConfig, NULL, ismInput->base.ctx.pCombinedOrientationData, &ismInput->currentPos, ismInput->hReverb, ismInput->ism_metadata_delay_ms,

    if ( ( error = ivas_td_binaural_renderer_ext( &ismInput->tdRendWrapper, ismInput->base.inConfig, NULL, ismInput->base.ctx.pCombinedOrientationData, &ismInput->currentPos, ismInput->hReverb, ism_md_subframe_update_ext,

                                                  *ismInput->base.ctx.pOutSampleRate, outAudio.config.numSamplesPerChannel, tmpTDRendBuffer ) ) != IVAS_ERR_OK )

    {

        return error;
@@ -5674,13 +5677,16 @@ static ivas_error renderIsmToBinauralReverb( 
{

    float tmpRendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];

    ivas_error error;

    int16_t ism_md_subframe_update_ext;



    push_wmops( "renderIsmToBinauralRoom" );



    /* Metadata Delay to sync with audio delay converted from ms to 5ms (1000/50/4) subframe index */

    ism_md_subframe_update_ext = (int16_t) roundf( ismInput->ism_metadata_delay_ms / ( 1000.f / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES ) );

    copyBufferTo2dArray( ismInput->base.inputBuffer, tmpRendBuffer );



    if ( ( error = ivas_td_binaural_renderer_ext( &ismInput->tdRendWrapper, ismInput->base.inConfig, NULL, ismInput->base.ctx.pCombinedOrientationData, &ismInput->currentPos, ismInput->hReverb,

                                                  ismInput->ism_metadata_delay_ms, *ismInput->base.ctx.pOutSampleRate, outAudio.config.numSamplesPerChannel, tmpRendBuffer ) ) != IVAS_ERR_OK )

                                                  ism_md_subframe_update_ext, *ismInput->base.ctx.pOutSampleRate, outAudio.config.numSamplesPerChannel, tmpRendBuffer ) ) != IVAS_ERR_OK )

    {

        return error;

    }
@@ -5847,12 +5853,16 @@ static ivas_error renderIsmToSplitBinaural( 
    float tmpBinaural_CldfbIm[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

    int16_t output_frame = ismInput->base.inputBuffer.config.numSamplesPerChannel;

    COMBINED_ORIENTATION_HANDLE pCombinedOrientationData;

    int16_t ism_md_subframe_update_ext;



    push_wmops( "renderIsmToSplitBinaural" );



    pSplitRendWrapper = ismInput->base.ctx.pSplitRendWrapper;

    pMultiBinPoseData = &pSplitRendWrapper->multiBinPoseData;



    /* Metadata Delay to sync with audio delay converted from ms to 5ms (1000/50/4) subframe index */

    ism_md_subframe_update_ext = (int16_t) roundf( ismInput->ism_metadata_delay_ms / ( 1000.f / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES ) );



    pCombinedOrientationData = *ismInput->base.ctx.pCombinedOrientationData;



    if ( pMultiBinPoseData->poseCorrectionMode == ISAR_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB )
@@ -5902,7 +5912,7 @@ static ivas_error renderIsmToSplitBinaural( 


        /* Render */

        if ( ( error = ivas_td_binaural_renderer_ext( ( pos_idx == 0 ) ? &ismInput->tdRendWrapper : &ismInput->splitTdRendWrappers[pos_idx - 1], ismInput->base.inConfig, NULL, ismInput->base.ctx.pCombinedOrientationData, &ismInput->currentPos,

                                                      NULL, ismInput->ism_metadata_delay_ms, *ismInput->base.ctx.pOutSampleRate, output_frame, tmpProcessing ) ) != IVAS_ERR_OK )

                                                      NULL, ism_md_subframe_update_ext, *ismInput->base.ctx.pOutSampleRate, output_frame, tmpProcessing ) ) != IVAS_ERR_OK )

        {

            return error;

        }
@@ -7686,7 +7696,7 @@ ivas_error IVAS_REND_SetIsmMetadataDelay( 


    for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )

    {

        hIvasRend->inputsIsm[i].ism_metadata_delay_ms = (int16_t) roundf( sync_md_delay / ( 1000.f / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES ) );

        hIvasRend->inputsIsm[i].ism_metadata_delay_ms = sync_md_delay;

    }



    return IVAS_ERR_OK;