Commit 6a88cb40 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'activate_643_switch' into 'main' 

[ref-using-main] Resolve "PCA bypass command-line option" - Part 2: activate switch

See merge request !1214
parents e3f59d4a 3b6feaa9

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 
#define FIX_890_ARRAY_SIZE                              /* Nokia: issue #890: mismatch in 2D array size declaration and use */

#define BE_FIX_887_GCC_WARNING_ARRAY_SIZE               /* VoiceAge: Issue 887: change array size definition to avoid warning with gcc 11.4.0 */

#define FIX_247_EXTERNAL_RENDERER_COMMAND_LINE          /* VA: issue 247: harmonize command-line options names of external renderer with the decoder */

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

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



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

tests/conftest.py

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ class EncoderFrontend: 
            command.extend(["-max_band", max_band])



        if pca:

            command.extend(["-bypass", "2"])

            command.extend(["-pca"])



        if quiet_mode:

            command.extend(["-q"])