Commit cb5c4503 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/ivas-float-update' into... 

- Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 2051-ref-PortMr2059-from-float-renderer-granularity-revision
parents 222e5f5e c841d5d2

.gitlab-ci-custom.yml

0 → 100644
+4 −0
Original line number Diff line number Diff line 
include:

  - project: $CUSTOM_CI_PROJECT

    ref: $CUSTOM_CI_REF

    file: $CUSTOM_CI_FILE
 
 No newline at end of file

apps/decoder.c

+38 −4
Original line number Diff line number Diff line
@@ -2597,6 +2597,23 @@ static ivas_error decodeG192( 
                    }

                }

#endif



#ifdef FIX_HRTF_LOAD_API

                /* decode transport channels, do TSM and feed to renderer */

                if ( ( error = IVAS_DEC_GetSamplesDecoder( hIvasDec, isSplitRend, splitRendBits ) ) != IVAS_ERR_OK )

                {

                    return error;

                }



#endif

#ifdef OBJ_EDITING_API

                /* Do the final preparations needed for rendering */

                if ( ( error = IVAS_DEC_PrepareRenderer( hIvasDec ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError: could not prepare the renderer: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;

                }

#endif

            }



            if ( isSplitRend )
@@ -3153,6 +3170,9 @@ static ivas_error decodeVoIP( 
    int16_t nOutSamples = 0;

#ifdef FIX_CREND_SIMPLIFY_CODE

    bool bitstreamReadDone = false;

#ifdef OBJ_EDITING_API

    bool parameterAvailableForEditing = false;

#endif

    uint16_t nSamplesRendered;

#endif
@@ -3444,13 +3464,21 @@ static ivas_error decodeVoIP( 
#endif

#ifdef SUPPORT_JBM_TRACEFILE

#ifdef FIX_CREND_SIMPLIFY_CODE

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered ) ) != IVAS_ERR_OK )

#ifdef OBJ_EDITING_API

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

#else

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

#else

#ifdef FIX_CREND_SIMPLIFY_CODE

        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms, &bitstreamReadDone ) ) != IVAS_ERR_OK )

#ifdef OBJ_EDITING_API

        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

#else

        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms ) ) != IVAS_ERR_OK )

#endif
@@ -3485,9 +3513,15 @@ static ivas_error decodeVoIP( 
                }

            }

#endif

#ifdef FIX_HRTF_LOAD

#ifdef OBJ_EDITING_API

            if ( parameterAvailableForEditing == true )

            {

                /* do the object editing here */

            }

#endif

#ifdef FIX_HRTF_LOAD

        } /* while ( nSamplesRendered < nOutSamples ) */

#endif



        /* write JBM Offset file entry */

        if ( jbmOffsetWriter != NULL )

apps/renderer.c

+8 −0
Original line number Diff line number Diff line
@@ -1250,7 +1250,15 @@ int main( 
        masaIds[i] = 0u;

    }

#ifdef NONBE_1377_REND_DIRATT_CONF

#ifdef FIX_1377_HANDLE_ERROR_CODE

    if ( ( error = IVAS_REND_SetObjectIDs( hIvasRend ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_REND_SetObjectIDs: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }

#else

    IVAS_REND_SetObjectIDs( hIvasRend );

#endif

#endif



    for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )

lib_com/common_api_types.h

+12 −0
Original line number Diff line number Diff line
@@ -128,9 +128,21 @@ typedef struct _IVAS_ISM_METADATA 
    float yaw;

    float pitch;

    int16_t non_diegetic_flag;

#ifdef OBJ_EDITING_API

    float gain;

#endif



} IVAS_ISM_METADATA;



#ifdef OBJ_EDITING_API

typedef struct _IVAS_EDITABLE_PARAMETERS

{

    int16_t num_obj;

    IVAS_ISM_METADATA ism_metadata[IVAS_MAX_NUM_OBJECTS];

    float gain_bed;

} IVAS_EDITABLE_PARAMETERS;

#endif



typedef struct

{

    float w, x, y, z;

lib_com/ivas_ism_com.c

+11 −0
Original line number Diff line number Diff line
@@ -418,6 +418,17 @@ void ivas_ism_reset_metadata( 
    hIsmMeta->ism_metadata_flag = 0;

    hIsmMeta->non_diegetic_flag = 0;



#ifdef OBJ_EDITING_API

    hIsmMeta->edited_gain = 1.0f;

    hIsmMeta->edited_azimuth = 0.0f;

    hIsmMeta->edited_elevation = 0.0f;

    hIsmMeta->edited_pitch = 0.0f;

    hIsmMeta->edited_yaw = 0.0f;

    hIsmMeta->edited_radius = 1.0f;

    hIsmMeta->gain = 1.0f;

    hIsmMeta->non_diegetic_flag = 0;

#endif



    return;

}