Commit 02ace634 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1950_basop_portFlpMr2198' into 'main' 

Port float MR 2198 to main

Closes #1950

See merge request !2144
parents 2d75a92b 6530dc56

apps/decoder.c

+14 −1
Original line number Diff line number Diff line
@@ -1468,6 +1468,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;

}
@@ -1504,7 +1516,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

    fprintf( stdout, "-fr L               : render frame size in ms L=(5,10,20), default is 20)\n" );

    fprintf( stdout, "-fec_cfg_file       : Optimal channel aware configuration computed by the JBM   \n" );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#endif



/*#define DISABLE_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  */



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

lib_dec/jbm_pcmdsp_apa_fx.c

+11 −0
Original line number Diff line number Diff line
@@ -882,6 +882,17 @@ UWord8 apa_exec_fx( 
        move32();

    }



#ifdef DEBUG_APA_SILENCE_NON_SCALED

    IF( l_in == *l_out )

    {

        set_s( a_out, 0, *l_out );

    }

    ELSE

    {

        set_s( a_out, INT16_MAX, *l_out );

    }

#endif



    return 0;

}

readme.txt

+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