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

fix compilation errors

parent 5d914a56

apps/renderer.c

+2 −3
Original line number Diff line number Diff line
@@ -1278,8 +1278,7 @@ int main( 
            fprintf( stderr, "\nError in IVAS_REND_SetTotalNumberOfObjects(): %s\n", ivas_error_to_string( error ) );

            goto cleanup;

        }

        Word16 var1 = (Word16) ( args.syncMdDelay );

        IF( ( error = IVAS_REND_SetIsmMetadataDelay( hIvasRend, var1 ) ) != IVAS_ERR_OK )

        IF( ( error = IVAS_REND_SetIsmMetadataDelay( hIvasRend, args.syncMdDelay ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in IVAS_REND_SetIsmMetadataDelay(): %s\n", ivas_error_to_string( error ) );

            goto cleanup;
@@ -2123,7 +2122,7 @@ int main( 
    if ( args.inConfig.numAudioObjects != 0 &&

         ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL || args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    {

        fprintf( stdout, "\n\nMetadata delayed %d subframes\n\n", (int16_t) round( args.syncMdDelay / ( float BINAURAL_RENDERING_FRAME_SIZE_MS ) ) );

        fprintf( stdout, "\n\nMetadata delayed %d subframes\n\n", (int16_t) round( args.syncMdDelay / ( (float) BINAURAL_RENDERING_FRAME_SIZE_MS ) ) );

    }



    if ( !args.quietModeEnabled && args.delayCompensationEnabled )

lib_rend/lib_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ ivas_error IVAS_REND_SetTotalNumberOfObjects( 


ivas_error IVAS_REND_SetIsmMetadataDelay(

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: IVAS renderer handle                                */

    const Word32 sync_md_delay                      /* i  :   Metadata Delay in ms to sync with audio delay     */

    const Word16 sync_md_delay                      /* i  :   Metadata Delay in ms to sync with audio delay     */

);



ivas_error IVAS_REND_GetNumAllObjects(

lib_rend/lib_rend_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -1678,7 +1678,7 @@ static ivas_error alignInputDelay( 
                Word64 tmp;

                inputIsm = (input_ism *) inputBase;



                tmp = W_mult0_32_32( L_add( maxGlobalDelayNs, 500000 ) /* + 0.5ms for rounding */, /* Q0 */, 2147 /* (1 / 1e6f) in Q31 */ ); // Q31

                tmp = W_mult0_32_32( L_add( maxGlobalDelayNs, 500000 /* + 0.5ms for rounding */ ) /* Q0 */, 2147 /* (1 / 1e6f) in Q31 */ ); // Q31

                inputIsm->ism_metadata_delay_ms_fx = add( inputIsm->ism_metadata_delay_ms_fx, extract_h( W_extract_h( tmp ) ) );

            }

        }
@@ -4486,7 +4486,7 @@ ivas_error IVAS_REND_AddInput_fx( 
    }



#ifdef CODE_IMPROVEMENTS

    setInputDelay( getInputByIndex( inputsArray, inputIndex, inputType ), splitPreRendCldfb );

    setInputDelay( getInputByIndex_fx( inputsArray, inputIndex, inputType ), splitPreRendCldfb );

#else

    setInputDelay( (Word8 *) inputsArray + inputStructSize * inputIndex, splitPreRendCldfb );

#endif