Commit a9413a89 authored by Sumeyra Demir Kanik's avatar Sumeyra Demir Kanik
Browse files

Code cleanup, always update subframe 2

parent 0e6b46c0

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -354,11 +354,7 @@ int main( 
    /*------------------------------------------------------------------------------------------*

     * Configure the decoder

     *------------------------------------------------------------------------------------------*/

#ifdef FIX_356_ISM_METADATA_SYNC

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK )

#endif

    {

        fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

lib_com/ivas_ism_com.c

+0 −8
Original line number Diff line number Diff line
@@ -337,14 +337,6 @@ void ivas_ism_reset_metadata( 
    hIsmMeta->yaw = 0.0f;

    hIsmMeta->pitch = 0.0f;

    hIsmMeta->radius = 1.0f;

#ifdef FIX_356_ISM_METADATA_SYNC

    // st_ivas->hIsmMetaData[ch]->last_true_radius = 1.0f;

    hIsmMeta->prev_azimuth = 0.0f;

    hIsmMeta->prev_elevation = 0.0f;

    hIsmMeta->prev_radius = 1.0f;

    hIsmMeta->prev_yaw = 0.0f;

    hIsmMeta->prev_pitch = 0.0f;

#endif



    return;

}

lib_com/ivas_stat_com.h

+0 −7
Original line number Diff line number Diff line
@@ -78,13 +78,6 @@ typedef struct 
#ifdef FIX_435_ISM_MERGE_BUG

    float last_true_radius; /* last true Q radius value */

#endif

#ifdef FIX_356_ISM_METADATA_SYNC

    float prev_azimuth;

    float prev_elevation;

    float prev_radius;

    float prev_yaw;

    float prev_pitch;

#endif

} ISM_METADATA_FRAME, *ISM_METADATA_HANDLE;

lib_dec/ivas_dec.c

+0 −3
Original line number Diff line number Diff line
@@ -227,9 +227,6 @@ ivas_error ivas_dec( 
            /* Binaural rendering */

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )

            {

#ifdef FIX_356_ISM_METADATA_SYNC

                dbgwrite( &output[0], sizeof( float ), L_FRAME48k, 1, "out.float" );

#endif

                if ( ( ivas_td_binaural_renderer( st_ivas, output, output_frame ) ) != IVAS_ERR_OK )

                {

                    return error;

lib_dec/ivas_ism_metadata_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -244,14 +244,6 @@ ivas_error ivas_ism_metadata_dec( 
        /* Read ISM present flags (one per object) */

        for ( ch = 0; ch < *nchan_transport; ch++ )

        {

#ifdef FIX_356_ISM_METADATA_SYNC

            hIsmMeta[ch]->prev_azimuth = hIsmMeta[ch]->azimuth;

            hIsmMeta[ch]->prev_elevation = hIsmMeta[ch]->elevation;

            hIsmMeta[ch]->prev_radius = hIsmMeta[ch]->radius;

            hIsmMeta[ch]->prev_yaw = hIsmMeta[ch]->yaw;

            hIsmMeta[ch]->prev_pitch = hIsmMeta[ch]->pitch;



#endif

            ism_imp[ch] = get_next_indice( st0, ISM_METADATA_FLAG_BITS );



            if ( ism_imp[ch] > ISM_NO_META )