Commit b09a7f47 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch... 

Merge branch '1161-ivas-float-update-enable-force-tcx10-tcx20-on-the-encoder-command-line-in-debugging-mode' into 'ivas-float-update'

Resolve "Enable -force TCX10|TCX20 on the encoder command-line in DEBUGGING mode"

See merge request !981
parents 217e6aa8 6baa6d37

apps/encoder.c

+41 −1
Original line number Diff line number Diff line
@@ -368,6 +368,15 @@ int main( 
        goto cleanup;

    }



#ifdef SUPPORT_FORCE_TCX10_TCX20

#ifdef DEBUGGING

    if ( arg.forcedMode == IVAS_ENC_FORCE_TCX10 && totalBitrate < 48000 )

    {

        fprintf( stderr, "Warning: Enforcing the TCX10 mode is only supported for bitrates higher or equal than 48 kbps!\n\n" );

    }

#endif

#endif



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

     * Configure and initialize (allocate memory for static variables) the encoder

     *------------------------------------------------------------------------------------------*/
@@ -1056,7 +1065,24 @@ static bool parseCmdlIVAS_enc( 
            }

            else

            {

#ifdef SUPPORT_FORCE_TCX10_TCX20

                if ( arg->forcedMode == IVAS_ENC_FORCE_TCX10 )

                {

                    strcpy( stmp, "TCX10" );

                }

                else if ( arg->forcedMode == IVAS_ENC_FORCE_TCX20 )

                {

                    strcpy( stmp, "TCX20" );

                }

                else

                {

                    strncpy( stmp, argv[i + 1], sizeof( stmp ) );

                }



                fprintf( stdout, "Forcing codec to:       %s\n", stmp );

#else

                fprintf( stdout, "Forcing codec to:       %s\n", argv[i + 1] );

#endif

            }



            i += 2;
@@ -2033,10 +2059,24 @@ static IVAS_ENC_FORCED_MODE parseForcedMode( 
    {

        return IVAS_ENC_FORCE_GSC;

    }

    if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX'" ) == 0 ) )

    if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX'" ) == 0 ) 

#ifdef SUPPORT_FORCE_TCX10_TCX20

         || ( strcmp( forcedModeChar, "TCX20" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX20'" ) == 0 )

#endif

        )

    {

#ifdef SUPPORT_FORCE_TCX10_TCX20

        return IVAS_ENC_FORCE_TCX20;

#else

        return IVAS_ENC_FORCE_TCX;

#endif

    }

#ifdef SUPPORT_FORCE_TCX10_TCX20

    if ( ( strcmp( forcedModeChar, "TCX10" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX10'" ) == 0 ) )

    {

        return IVAS_ENC_FORCE_TCX10;

    }

#endif

    if ( ( strcmp( forcedModeChar, "HQ" ) == 0 ) || ( strcmp( forcedModeChar, "'HQ'" ) == 0 ) )

    {

        return IVAS_ENC_FORCE_HQ;

lib_com/cnst.h

+6 −0
Original line number Diff line number Diff line
@@ -81,8 +81,14 @@ 
#define FORCE_MUSIC                     101             /* debugging - force music on the command line */

#define FORCE_ACELP                     102             /* debugging - force ACELP core on the command line */

#define FORCE_GSC                       103             /* debugging - force GSC core on the command line */

#ifdef SUPPORT_FORCE_TCX10_TCX20

#define FORCE_TCX10                     104             /* debugging - force TCX10 core on the command line */

#define FORCE_TCX20                     105             /* debugging - force TCX20 core on the command line */

#define FORCE_HQ                        106             /* debugging - force HQ core on the command line */

#else

#define FORCE_TCX                       104             /* debugging - force TCX core on the command line */

#define FORCE_HQ                        105             /* debugging - force HQ core on the command line */

#endif

#define FORCE_TD_RENDERER               201

#define FORCE_CLDFB_RENDERER            202

#endif

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -57,10 +57,8 @@ 
/*#define MEM_COUNT_DETAILS*/                   /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */



#ifdef DEBUGGING



#define DISABLE_DFT_STEREO_ASSERT               /* This assert is hit for -10 dB tests/codec_be_on_mr_nonselection/test_param_file.py::test_param_file_tests[stv-stereo at 32 kbps, 48kHz in, 48kHz out, DTX on, random FER at 5%, bandwidth switching] */





/*#define DEBUG_MODE_INFO*/                         /* output most important parameters to the subdirectory "res/" */

#ifdef DEBUG_MODE_INFO

/*#define DEBUG_MODE_ACELP*/                    /* output most important ACELP core parameters to the subdirectory "res/" */
@@ -76,6 +74,7 @@ 
/*#define DEBUG_MODE_INFO_ALLRAD*/              /* define to output generated HOA decoding mtx */

/*#define DEBUG_MODE_LFE */                     /* define to output LFE relevant parameters */

#endif

#define SUPPORT_FORCE_TCX10_TCX20              /* VA: Enable -force tcx10|tcx20 command-line option */



#ifdef DEBUG_MODE_MDCT

#define DEBUG_PLOT_BITS

lib_enc/ivas_decision_matrix_enc.c

+7 −0
Original line number Diff line number Diff line
@@ -200,10 +200,17 @@ void ivas_decision_matrix_enc( 
        {

            st->core = ACELP_CORE;

        }

#ifdef SUPPORT_FORCE_TCX10_TCX20

        else if ( st->force == FORCE_TCX20 || st->force == FORCE_TCX10 ) /* Initalizations should always happen with TCX20*/

        {

            st->core = TCX_20_CORE;

        }

#else

        else if ( st->force == FORCE_TCX )

        {

            st->core = TCX_20_CORE;

        }

#endif

        else if ( st->force == FORCE_HQ && st->element_mode != IVAS_CPE_MDCT && element_brate >= IVAS_24k4 )

        {

            st->core = HQ_CORE;

lib_enc/lib_enc.c

+9 −0
Original line number Diff line number Diff line
@@ -2325,9 +2325,18 @@ static ivas_error forcedModeApiToInternal( 
        case IVAS_ENC_FORCE_GSC:

            *forcedModeInternal = FORCE_GSC;

            break;

#ifdef SUPPORT_FORCE_TCX10_TCX20

        case IVAS_ENC_FORCE_TCX10:

            *forcedModeInternal = FORCE_TCX10;

            break;

        case IVAS_ENC_FORCE_TCX20:

            *forcedModeInternal = FORCE_TCX20;

            break;

#else

        case IVAS_ENC_FORCE_TCX:

            *forcedModeInternal = FORCE_TCX;

            break;

#endif

        case IVAS_ENC_FORCE_HQ:

            *forcedModeInternal = FORCE_HQ;

            break;