Commit 4692a685 authored by Sumeyra Demir Kanik's avatar Sumeyra Demir Kanik
Browse files

Rename the variable ism_md_subframe_ext to ism_metadata_delay_ms in inputIsm struct

parent 2031da2b

lib_rend/lib_rend.c

+7 −10
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ typedef struct 
    OMASA_ANA_HANDLE hOMasa;

    uint16_t total_num_objects;

#ifdef FIX_488_SYNC_DELAY

    int16_t ism_md_subframe_update_ext;

    int16_t ism_metadata_delay_ms;

#endif

} input_ism;
@@ -5724,7 +5724,7 @@ static ivas_error renderIsmToBinaural( 
    push_wmops( "renderIsmToBinaural" );

#ifdef FIX_488_SYNC_DELAY

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

    ism_md_subframe_update_ext = (int16_t) round( ismInput->ism_md_subframe_update_ext / ( 1000 / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES ) );

    ism_md_subframe_update_ext = (int16_t) round( ismInput->ism_metadata_delay_ms / ( 1000 / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES ) );

#endif

    copyBufferTo2dArray( ismInput->base.inputBuffer, tmpTDRendBuffer );
@@ -5910,7 +5910,7 @@ static ivas_error renderIsmToBinauralReverb( 


#ifdef FIX_488_SYNC_DELAY

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

    ism_md_subframe_update_ext = (int16_t) round( ismInput->ism_md_subframe_update_ext / ( 1000 / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES ) );

    ism_md_subframe_update_ext = (int16_t) round( ismInput->ism_metadata_delay_ms / ( 1000 / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES ) );

#endif

    copyBufferTo2dArray( ismInput->base.inputBuffer, tmpRendBuffer );
@@ -6150,7 +6150,7 @@ static ivas_error renderIsmToSplitBinaural( 
                                                   &ismInput->currentPos,

                                                   NULL,

#ifdef FIX_488_SYNC_DELAY

                                                   ismInput->ism_md_subframe_update_ext, /* ToDo: Ism Audio Metadata Delay Sync in ms for External Renderer */

                                                   ismInput->ism_metadata_delay_ms, /* Ism Audio Metadata Delay Sync in ms for External Renderer */

#endif

                                                   output_frame,

                                                   tmpProcessing );
@@ -6168,7 +6168,7 @@ static ivas_error renderIsmToSplitBinaural( 
                                                   &ismInput->currentPos,

                                                   NULL,

#ifdef FIX_488_SYNC_DELAY

                                                   ismInput->ism_md_subframe_update_ext, /* ToDo: Ism Audio Metadata Delay Sync in ms for External Renderer */

                                                   ismInput->ism_metadata_delay_ms, /* Ism Audio Metadata Delay Sync in ms for External Renderer */

#endif

                                                   output_frame,

                                                   tmpProcessing );
@@ -6296,10 +6296,7 @@ static ivas_error renderActiveInputsIsm( 
            /* Skip inactive inputs */

            continue;

        }

#ifdef FIX_488_SYNC_DELAY

        /* Metadata Delay in subframes to sync with audio delay */

        pCurrentInput->ism_md_subframe_update_ext = hIvasRend->inputsIsm[0].ism_md_subframe_update_ext;

#endif



        if ( ( error = renderInputIsm( pCurrentInput, hIvasRend->outputConfig, outAudio ) ) != IVAS_ERR_OK )



        {
@@ -8346,7 +8343,7 @@ ivas_error IVAS_REND_SetIsmMetadataDelay( 
        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



    hIvasRend->inputsIsm[0].ism_md_subframe_update_ext = sync_md_delay;

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



    return IVAS_ERR_OK;

}