Commit f2226094 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_643_PCA_OPTION

parent bbdf1492

apps/encoder.c

+0 −40
Original line number Diff line number Diff line
@@ -1690,47 +1690,11 @@ static bool parseCmdlIVAS_enc( 


            i++;

        }

#ifdef FIX_643_PCA_OPTION

        else if ( strcmp( argv_to_upper, "-PCA" ) == 0 )

        {

            arg->pca = 1;

            i++;

        }

#else

        else if ( strcmp( argv_to_upper, "-BYPASS" ) == 0 ) // TODO: should be renamed to "-pca"

        {

            i++;

            if ( i < argc - 4 )

            {

                switch ( atoi( argv[i] ) )

                {

                    case 1:

                    {

                        arg->pca = 0;

                        break;

                    }

                    case 2:

                    {

                        arg->pca = 1;

                        break;

                    }

                    default:

                    {

                        fprintf( stderr, "Error: SBA PCA bypass argument is out of range (%d), expected 1 or 2\n", (int32_t) atoi( argv[i] ) );

                        usage_enc();

                        return false;

                    }

                }

                i++;

            }

            else

            {

                fprintf( stderr, "Error: SBA unspecified PCA BYPASS value \n\n" );

                usage_enc();

                return false;

            }

        }

#endif



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

         * Option not recognized
@@ -1927,11 +1891,7 @@ static void usage_enc( void ) 
    fprintf( stdout, "-mime               : Mime output bitstream file format\n" );

    fprintf( stdout, "                      The encoder produces TS26.445 Annex.2.6 Mime Storage Format, (not RFC4867 Mime Format).\n" );

    fprintf( stdout, "                      default output bitstream file format is G.192\n" );

#ifdef FIX_643_PCA_OPTION

    fprintf( stdout, "-pca                : activate PCA in SBA format FOA at 256 kbps \n" );

#else

    fprintf( stdout, "-bypass mode        : SBA PCA by-pass, mode = (1, 2), 1 = PCA off, 2 = signal adaptive, default is 1\n" );

#endif

    fprintf( stdout, "-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );

    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );

#ifdef DEBUGGING

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_643_PCA_OPTION                              /* VA: issue 643: rename PCA bypass command-line option */

#define FIX_902_HACK_IN_CORECODER                       /* VA: issue 902: remove a hack in ivas_core_dec() */

#define FIX_881_REMOVE_LFE_ADDITION_IN_ISM              /* VA: issue 881: remove LFE addition in ISM format */

#define FIX_899_VARIABLE_SPEED_DECODING                 /* FhG: Fix variable speed decoding                                    */