Commit e85b554d authored by vaclav's avatar vaclav
Browse files

issue 643: rename PCA bypass command-line option; under FIX_643_PCA_OPTION

parent a8f576ed

apps/encoder.c

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


            i++;

        }

#ifdef FIX_643_PCA_OPTION

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

        {

            arg->pca = 1;

        }

#else

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

        {

            i++;
@@ -1723,6 +1729,7 @@ static bool parseCmdlIVAS_enc( 
                return false;

            }

        }

#endif



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

         * Option not recognized
@@ -1919,7 +1926,11 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ 
#define FIX_814_DOUBLE_PREC_IN_REVERB                   /* Philips: Issue 814: Replace double precision arithmetic in reverb */

#define FIX_866_MOVE_VBAP                               /* Nokia: Issue 866: Move VBAP to lib_rend */

#define FIX_863_REMOVE_REDUNDANCIES_OMASA               /* Nokia/VA: Issue 863: Remove redundancies in stereo_classifier for OMASA */

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



/* #################### End BE switches ################################## */

readme.txt

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, 
-mime               : Mime output bitstream file format

                      The encoder produces TS26.445 Annex.2.6 Mime Storage Format, (not RFC4867 Mime Format).

                      default output bitstream file format is G.192

-bypass mode        : SBA PCA by-pass, mode = (1, 2), 1 = PCA off, 2 = signal adaptive, default is 1

-pca                : activate PCA in SBA format FOA at 256 kbps

-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation.

                      Currently, all values default to level 3 (full functionality).

-q                  : Quiet mode, limit printouts to terminal, default is deactivated

tests/conftest.py

+3 −3
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ class EncoderFrontend: 
        sba_order: Optional[str] = None,

        dtx_mode: Optional[bool] = False,

        max_band: Optional[str] = None,

        bypass_mode: Optional[int] = None,

        pca_mode: Optional[int] = None,

        quiet_mode: Optional[bool] = True,

        add_option_list: Optional[list] = None,

    ) -> None:
@@ -239,8 +239,8 @@ class EncoderFrontend: 
        if max_band is not None:

            command.extend(["-max_band", max_band])



        if bypass_mode is not None:

            command.extend(["-bypass", str(bypass_mode)])

        if pca_mode is not None:

            command.extend(["-pca", str(pca_mode)])



        if quiet_mode:

            command.extend(["-q"])