Commit ffbcac53 authored by sagnowski's avatar sagnowski
Browse files

Merge branch '261-jbm-trace-file-writer' into 'main' 

Resolve "JBM trace file writer"

See merge request !360
parents 15fa87b6 969c8de4

Workspace_msvc/lib_rend.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

apps/decoder.c

+10 −0
Original line number Diff line number Diff line
@@ -1794,6 +1794,15 @@ cleanup: 
#endif

#endif



#ifdef MC_JBM

#ifdef SUPPORT_JBM_TRACEFILE

static ivas_error writeJbmTraceFileFrameWrapper( const void *data, void *writer )

{

    return JbmTraceFileWriter_writeFrame( data, writer );

}

#endif

#endif





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

 * decodeVoIP()
@@ -2042,6 +2051,7 @@ static ivas_error decodeVoIP( 
        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms

#ifdef SUPPORT_JBM_TRACEFILE

                                                 ,

                                                 writeJbmTraceFileFrameWrapper,

                                                 jbmTraceWriter

#endif

                                                 ) ) != IVAS_ERR_OK )

lib_dec/lib_dec.c

+5 −4
Original line number Diff line number Diff line
@@ -1383,7 +1383,8 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
#ifdef MC_JBM

#ifdef SUPPORT_JBM_TRACEFILE

    ,

    JbmTraceFileWriter *jbmTraceFileWriter

    JbmTraceFileWriterFn jbmWriterFn,

    void *jbmWriter

#endif

#endif

)
@@ -1604,12 +1605,12 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 


#ifdef MC_JBM

#ifdef SUPPORT_JBM_TRACEFILE

        /* jbmTraceFileWriter may be NULL if tracefile writing was not requested on CLI */

        if ( jbmTraceFileWriter != NULL )

        /* jbmWriterFn and jbmWriter may be NULL if tracefile writing was not requested on CLI */

        if ( jbmWriterFn != NULL && jbmWriter != NULL )

        {

            /* write JBM trace data entry */

            store_JbmData( hVoIP, dataUnit, systemTimestamp_ms, extBufferedSamples, hDecoderConfig->output_Fs );

            if ( ( JbmTraceFileWriter_writeFrame( &hVoIP->JbmTraceData, jbmTraceFileWriter ) ) != IVAS_ERR_OK )

            if ( ( jbmWriterFn( &hVoIP->JbmTraceData, jbmWriter ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError writing JBM Trace data to file\n" );

                return IVAS_ERR_UNKNOWN;

lib_dec/lib_dec.h

+9 −6
Original line number Diff line number Diff line
@@ -35,11 +35,6 @@ 


#include "common_api_types.h"

#include "ivas_error.h"

#ifdef MC_JBM

#ifdef SUPPORT_JBM_TRACEFILE

#include "jbm_file_writer.h"

#endif

#endif

#include <stdbool.h>

#include <stdint.h>
@@ -108,6 +103,13 @@ typedef enum _IVAS_DEC_BS_FORMAT 


typedef struct IVAS_DEC *IVAS_DEC_HANDLE;



#ifdef MC_JBM

#ifdef SUPPORT_JBM_TRACEFILE

/* Callback function for JBM tracefile writing */

typedef ivas_error ( *JbmTraceFileWriterFn )( const void *data, void *writer );

#endif

#endif





/* clang-format off */

/*---------------------------------------------------------------------*
@@ -209,7 +211,8 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
    const uint32_t systemTimestamp_ms           /* i  : current system timestamp                                                */

#ifdef MC_JBM

#ifdef SUPPORT_JBM_TRACEFILE

    , JbmTraceFileWriter *jbmWriter

    , JbmTraceFileWriterFn jbmWriterFn,

    void* jbmWriter

#endif

#endif

);