Commit 48a30a51 authored by vaclav's avatar vaclav
Browse files

Merge branch 'FhG/external-renderer' of... 

Merge branch 'FhG/external-renderer' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into FhG/external-renderer
parents ff02f5d0 8d4bc482

apps/renderer.c

+15 −17
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ extern int16_t *ptr_max_stack; 
extern int32_t wc_frame;

extern char location_max_stack[256];



/* clang-format off */

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

 * Function to print complexity & memory estimates

 *------------------------------------------------------------------------------------------*/
@@ -126,7 +125,6 @@ static void print_mem_renderer(size_t SRAM_size) 
    fprintf( stdout, "      32 bits of memory and may therefore be represented by 1 word.\n" );

    fprintf( stdout, "      The following formula is used: sizeof('memory array')/sizeof(float)\n\n" );

}

/* clang-format on */

#endif



typedef struct
@@ -1000,7 +998,7 @@ int main( 
#endif

#ifdef WMOPS

    print_wmops();

    /* print_mem_renderer( SRAM_size ); */

    print_mem_renderer( SRAM_size );

#endif



    return 0;

lib_rend/ivas_crend.c

+3 −1
Original line number Diff line number Diff line
@@ -1779,7 +1779,7 @@ ivas_error ivas_rend_crendProcess( 
    IVAS_REND_AudioConfigType inConfigType;

    ivas_error error;



    wmops_sub_start( "ivas_crend_process" );

    wmops_sub_start( "ivas_rend_crendProcess" );



    in_config = getIvasAudioConfigFromRendAudioConfig( inConfig );

    inConfigType = getAudioConfigType( inConfig );
@@ -1815,6 +1815,8 @@ ivas_error ivas_rend_crendProcess( 
        mvr2r( pcm_tmp[i], output[i], output_frame );

    }



    wmops_sub_end();



    return IVAS_ERR_OK;

}

lib_rend/ivas_objectRenderer.c

+5 −0
Original line number Diff line number Diff line
@@ -677,6 +677,8 @@ ivas_error ivas_rend_TDObjRenderFrame( 
    IVAS_FORMAT ivas_format;

    IVAS_REND_AudioConfigType inConfigType;



    wmops_sub_start( "ivas_rend_TDObjRenderFrame" );



    inConfigType = getAudioConfigType( inConfig );

    lfe_idx = LFE_CHANNEL;

    if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED )
@@ -746,6 +748,9 @@ ivas_error ivas_rend_TDObjRenderFrame( 
    //         v_add( reverb_signal[1], output[1], output[1], output_frame );

    //     }

    // }



    wmops_sub_end();



    return IVAS_ERR_OK;

}

#endif

lib_util/ism_file_reader.c

+6 −0
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ 
struct IsmFileReader

{

    FILE *file;

#ifndef FIX_I173_I174

    int32_t frameCounter;

#endif

    char *file_path;

};
@@ -75,7 +77,9 @@ IsmFileReader *IsmFileReader_open( 


    self = calloc( sizeof( IsmFileReader ), 1 );

    self->file = file;

#ifndef FIX_I173_I174

    self->frameCounter = 0;

#endif

    self->file_path = calloc( sizeof( char ), strlen( filePath ) + 1 );

    strcpy( self->file_path, filePath );
@@ -145,7 +149,9 @@ ivas_error IsmFileReader_readNextFrame( 
    ismMetadata->spread = meta_prm[3];

    ismMetadata->gainFactor = meta_prm[4];



#ifndef FIX_I173_I174

    ++self->frameCounter;

#endif



    return IVAS_ERR_OK;

}

lib_util/ism_file_writer.c

+10 −1
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ 
struct IsmFileWriter

{

    FILE *file;

#ifndef FIX_I173_I174

    int32_t frameCounter;

#endif

    char *file_path;

};
@@ -86,7 +88,9 @@ ivas_error IsmFileWriter_open( 


    self = calloc( sizeof( IsmFileWriter ), 1 );

    self->file = file;

#ifndef FIX_I173_I174

    self->frameCounter = 0;

#endif

    self->file_path = calloc( sizeof( char ), strlen( filePath ) + 1 );

    strcpy( self->file_path, filePath );
@@ -118,7 +122,11 @@ ivas_error IsmFileWriter_writeFrame( 
    file = ismWriter->file;



    /* IVAS_fmToDo: work in progress; currently position_azimuth, position_elevation, position_radius, spread, gain_factor */

#ifdef FIX_I173_I174

    sprintf( char_buff, "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor );

#else

    sprintf( char_buff, "%04d,%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f\n", ismWriter->frameCounter, ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor );

#endif



    if ( file )

    {
@@ -128,8 +136,9 @@ ivas_error IsmFileWriter_writeFrame( 
    {

        return IVAS_ERR_FAILED_FILE_WRITE;

    }



#ifndef FIX_I173_I174

    ++ismWriter->frameCounter;

#endif



    return IVAS_ERR_OK;

}