Merge branch '643-pca-bypass-command-line-option' into 'main'

  - mv IVAS_rend_test IVAS_rend

.merge-request-comparison-check: &merge-request-comparison-check

  - echo "--------------- Running merge-request-comparison-check anchor ---------------"

  - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi

  - if [ $exit_code -eq 1 ] && [ $non_be_flag == 0 ]; then echo "Non-bitexact cases without non-BE tag encountered!"; exit $EXIT_CODE_FAIL; fi

  - if [ $exit_code -eq 1 ] && [ $non_be_flag != 0 ]; then echo "Non-bitexact cases with non-BE tag encountered"; exit $EXIT_CODE_NON_BE; fi

            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++;

                return false;

            }

        }

#endif

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

         * Option not recognized

    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

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

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

-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

    # ------------  run cmd  ------------

    tag_out = f"{tag}_ivasbr{ivas_br[:-3]}k_DTX{dtx}"

    if gain_flag == 1:

    if gain_flag != -1:

        tag_out += f'_Gain{gain_flag}'

    plc_tag_out = f"{tag_out}_{plc_pattern}"