Commit 79bf601b authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1950_ref_portFlpMr2198' into 'ivas-float-update'

Port Float MR 2198 to ivas-float-update

See merge request !2143
parents 61af024d 4af15f03
Loading
Loading
Loading
Loading
+14 −1
Original line number Diff line number Diff line
@@ -1681,6 +1681,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;
}

@@ -1717,7 +1729,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
@@ -146,6 +146,7 @@
#endif /* DEBUGGING */

/*#define DISABLE_LIMITER*/                     /* disable the limiter - needed for testing Bitexactness between different renderer framings */
/*#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  */

/* #################### End DEBUGGING switches ############################ */

+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
@@ -279,7 +279,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