Commit e44ad7d3 authored by sagnowski's avatar sagnowski
Browse files

Revert "call JbmTraceFileWriter_writeFrame() from application again" 

This reverts commit 053e51b2.
parent 053e51b2

apps/decoder.c

+3 −1
Original line number Diff line number Diff line
@@ -2042,7 +2042,7 @@ static ivas_error decodeVoIP( 
        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms

#ifdef SUPPORT_JBM_TRACEFILE

                                                 ,

                                                 jbmTraceWriter != NULL

                                                 jbmTraceWriter

#endif

                                                 ) ) != IVAS_ERR_OK )

#else
@@ -2054,6 +2054,7 @@ static ivas_error decodeVoIP( 
            goto cleanup;

        }



#ifndef MC_JBM

#ifdef SUPPORT_JBM_TRACEFILE

        /* write JBM trace file entry - only done for EVS testing */

        if ( jbmTraceWriter != NULL )
@@ -2072,6 +2073,7 @@ static ivas_error decodeVoIP( 
                goto cleanup;

            }

        }

#endif

#endif



        /* write JBM Offset file entry */

lib_dec/lib_dec.c

+8 −3
Original line number Diff line number Diff line
@@ -1391,7 +1391,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
#ifdef MC_JBM

#ifdef SUPPORT_JBM_TRACEFILE

    ,

    const int16_t jbmWriter_flag /* i  : JBM tracefile write on/off flag             */

    JbmTraceFileWriter *jbmTraceFileWriter

#endif

#endif

)
@@ -1613,10 +1613,15 @@ 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 ( jbmWriter_flag )

        if ( jbmTraceFileWriter != NULL )

        {

            /*store JBM trace data entry */

            /* write JBM trace data entry */

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

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

            {

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

                return IVAS_ERR_UNKNOWN;

            }

        }

#endif

#else

lib_dec/lib_dec.h

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


#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>
@@ -204,7 +209,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
    const uint32_t systemTimestamp_ms           /* i  : current system timestamp                                                */

#ifdef MC_JBM

#ifdef SUPPORT_JBM_TRACEFILE

  , const int16_t jbmWriter_flag                /* i  : JBM tracefile write on/off flag                                         */

    , JbmTraceFileWriter *jbmWriter

#endif

#endif

);