Commit f77293dc authored by sagnowski's avatar sagnowski
Browse files

Merge branch '1361-timestamps-in-jbm-trace-not-affected-by-delay-compensation' into 'main'

Resolve "Timestamps in JBM trace not affected by delay compensation"

See merge request !2198
parents 81c4baaa 07a12ebd
Loading
Loading
Loading
Loading
Loading
+14 −1
Original line number Diff line number Diff line
@@ -1617,6 +1617,18 @@ static bool parseCmdlIVAS_dec(
        return false;
    }

#ifdef SUPPORT_JBM_TRACEFILE
    /* Validate options that depend on other options */
    if ( arg->jbmTraceFilename != NULL && arg->delayCompensationEnabled
         /* This decMode check should be removed once timestamp sync issues between JBM trace and audio are fixed in EVS */
         && arg->decMode != IVAS_DEC_MODE_EVS )
    {
        fprintf( stderr, "Error: Writing to a JBM trace file requires delay compensation to be disabled with -no_delay_cmp\n\n" );
        usage_dec();
        return false;
    }
#endif

    return true;
}

@@ -1653,7 +1665,8 @@ static void usage_dec( void )
    fprintf( stdout, "                      EVS RTP Payload Format. The SDP parameter hf_only is required.\n" );
    fprintf( stdout, "                      Reading RFC4867 AMR/AMR-WB RTP payload format is not supported.\n" );
#ifdef SUPPORT_JBM_TRACEFILE
    fprintf( stdout, "-Tracefile TF       : VoIP mode: Generate trace file named TF\n" );
    fprintf( stdout, "-Tracefile TF       : VoIP mode: Generate trace file named TF. Requires -no_delay_cmp to\n" );
    fprintf( stdout, "                      be enabled so that trace contents remain in sync with audio output.\n" );
#endif
#ifdef DEBUGGING
#ifdef VARIABLE_SPEED_DECODING
+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@
/*#define DEBUG_JBM_CMD_OPTION*/                /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */
/*#define VARIABLE_SPEED_DECODING*/             /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */
/*#define DISABLE_LIMITER*/                     /* disable the limiter */
/*#define DEBUG_APA_SILENCE_NON_SCALED*/        /* Switch APA into mode that replaces contents of non-scaled frames with silence. Useful for identifying scaled regions in the audio output of the decoder */

/*Split Rendering Debug switches*/
/*#define DBG_WAV_WRITER*/                      /* add debugging function dbgwrite_wav() */
+11 −0
Original line number Diff line number Diff line
@@ -725,6 +725,17 @@ uint8_t apa_exec(
        ps->nFramesSinceSetScale >>= statsResetShift;
    }

#ifdef DEBUG_APA_SILENCE_NON_SCALED
    if ( l_in == *l_out )
    {
        set_zero( a_out, *l_out );
    }
    else
    {
        set_f( a_out, (float) INT16_MAX, *l_out );
    }
#endif

    return 0;
}

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ Options:
                      The decoder may read rtpdump files containing TS26.445 Annex A.2.2
                      EVS RTP Payload Format. The SDP parameter hf_only is required.
                      Reading RFC4867 AMR/AMR-WB RTP payload format is not supported.
-Tracefile TF       : VoIP mode: Generate trace file named TF
-Tracefile TF        : VoIP mode: Generate trace file named TF. Requires -no_delay_cmp to
                      be enabled so that trace contents remain in sync with audio output.
-fec_cfg_file       : Optimal channel aware configuration computed by the JBM
                      as described in Section 6.3.1 of TS26.448. The output is
                      written into a .txt file. Each line contains the FER indicator
+35 −35

File changed.

Preview size limit exceeded, changes collapsed.

Loading