From d959b7456ac592b701b0e36010faf3829c3f20e2 Mon Sep 17 00:00:00 2001 From: Robin Alexander Date: Sat, 20 Sep 2025 17:14:10 +0000 Subject: [PATCH 1/4] Use argv[0] to name the executable in the usage message --- test/decoder/ixheaacd_main.c | 11 ++++++----- test/encoder/ixheaace_testbench.c | 16 +++++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/test/decoder/ixheaacd_main.c b/test/decoder/ixheaacd_main.c index 30037b61..279a46b9 100644 --- a/test/decoder/ixheaacd_main.c +++ b/test/decoder/ixheaacd_main.c @@ -20,6 +20,7 @@ #include #include #include +#include #define AOSP_CHANGE @@ -2271,7 +2272,7 @@ int ixheaacd_main_process(WORD32 argc, pWORD8 argv[]) { /* */ /*****************************************************************************/ -void print_usage() { +void print_usage(char *argv[]) { #ifdef DISPLAY_MESSAGE ia_lib_info_struct str_lib_info = {0}; ixheaacd_get_lib_id_strings(&str_lib_info); @@ -2279,7 +2280,7 @@ void print_usage() { ia_display_id_message(str_lib_info.p_lib_name, str_lib_info.p_version_num); #endif printf("\n Usage \n"); - printf("\n -ifile: -imeta: -ofile: " + printf("\n %s %s", basename(argv[0]), "-ifile: -imeta: -ofile: " "[options]\n"); printf("\n[options] can be,"); printf("\n[-mp4:]"); @@ -2460,7 +2461,7 @@ int main(WORD32 argc, char *argv[]) { } if ((g_pf_inp == NULL) || (g_pf_out == NULL)) { - print_usage(); + print_usage(argv); err_code = IA_TESTBENCH_MFMAN_FATAL_FILE_OPEN_FAILED; ixheaacd_error_handler(&ixheaacd_ia_testbench_error_info, (pWORD8) "Input or Output File", err_code); @@ -2474,7 +2475,7 @@ int main(WORD32 argc, char *argv[]) { for (i = 0; i < argc; i++) { if (!strcmp((pCHAR8)argv[i], "-mp4:1")) { if (g_pf_meta == NULL) { - print_usage(); + print_usage(argv); err_code = IA_TESTBENCH_MFMAN_FATAL_FILE_OPEN_FAILED; ixheaacd_error_handler(&ixheaacd_ia_testbench_error_info, (pWORD8) "Metadata File", err_code); @@ -2507,4 +2508,4 @@ int main(WORD32 argc, char *argv[]) { mpeg_d_drc_on = 0; return IA_NO_ERROR; -} /* end ixheaacd_main */ \ No newline at end of file +} /* end ixheaacd_main */ diff --git a/test/encoder/ixheaace_testbench.c b/test/encoder/ixheaace_testbench.c index a0f405f8..720358dc 100644 --- a/test/encoder/ixheaace_testbench.c +++ b/test/encoder/ixheaace_testbench.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "ixheaac_type_def.h" #include "impd_drc_common_enc.h" #include "impd_drc_uni_drc.h" @@ -202,11 +203,11 @@ IA_ERRORCODE ia_enhaacplus_enc_wav_header_decode(FILE *in_file, UWORD32 *n_chann return IA_NO_ERROR; } -void ia_enhaacplus_enc_print_usage() { +void ia_enhaacplus_enc_print_usage(pCHAR8 argv[]) { printf("\nUsage:\n"); - printf("\n -ifile: -ofile: [options]\n"); + printf("\n%s %s\n", basename(argv[0]), "-ifile: -ofile: [options]"); printf("\nor\n"); - printf("\n -paramfile:\n"); + printf("\n%s %s\n", basename(argv[0]), "-paramfile:"); printf("\n[options] can be,"); printf("\n[-br:]"); printf("\n[-mps:]"); @@ -320,7 +321,8 @@ void ia_enhaacplus_enc_print_usage() { "\n It is applicable only for AOT 42. Valid values are 0 to 65535. Default is 0."); printf( "\n is used to discard algorithmic delay from the decoded file." - "\n It is applicable only for AOT 42. Valid values are 0 and 1. Default is 1."); + "\n It is applicable only for AOT 42. Valid values are 0 and 1. Default is 1." + "\n"); exit(1); } @@ -1629,7 +1631,7 @@ int main(WORD32 argc, pCHAR8 argv[]) { if (param_file_id == NULL) { ixheaace_get_lib_id_strings(&instance); ia_enhaacplus_enc_display_id_message(instance.p_lib_name, instance.p_version_num); - ia_enhaacplus_enc_print_usage(); + ia_enhaacplus_enc_print_usage(argv); return IA_NO_ERROR; } } else { @@ -1637,7 +1639,7 @@ int main(WORD32 argc, pCHAR8 argv[]) { if (param_file_id == NULL) { ixheaace_get_lib_id_strings(&instance); ia_enhaacplus_enc_display_id_message(instance.p_lib_name, instance.p_version_num); - ia_enhaacplus_enc_print_usage(); + ia_enhaacplus_enc_print_usage(argv); return IA_NO_ERROR; } } @@ -1851,7 +1853,7 @@ int main(WORD32 argc, pCHAR8 argv[]) { } if (!strncmp((const char *)argv[i], "-help", 5)) { - ia_enhaacplus_enc_print_usage(); + ia_enhaacplus_enc_print_usage(argv); } } From a36f31f47715ddfab9b018cd15e6cc23e533d0f9 Mon Sep 17 00:00:00 2001 From: Robin Alexander Date: Sat, 20 Sep 2025 17:21:04 +0000 Subject: [PATCH 2/4] Replace with the expected command xaacdec / xaacenc --- README_dec.md | 4 ++-- README_enc.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README_dec.md b/README_dec.md index 3db93207..29ad270c 100644 --- a/README_dec.md +++ b/README_dec.md @@ -164,7 +164,7 @@ The libxaac decoder can be run by providing command-line parameters(CLI options) Command line usage : ``` - -ifile: -imeta: -ofile: [options] +xaacdec -ifile: -imeta: -ofile: [options] [options] can be, [-mp4:] @@ -230,7 +230,7 @@ where, Note: `loudness_leveling_flag` is applicable only if `LOUDNESS_LEVELING_SUPPORT` macro is enabled. Sample CLI: ``` - -ifile:in_file.aac -ofile:out_file.wav -pcmsz:16 +xaacdec -ifile:in_file.aac -ofile:out_file.wav -pcmsz:16 ``` # Validating the libxaac decoder diff --git a/README_enc.md b/README_enc.md index b80b1e2b..afc17be3 100644 --- a/README_enc.md +++ b/README_enc.md @@ -29,9 +29,9 @@ The configuration file for DRC is placed in `encoder\test` directory(impd_drc_co # Command line usage : ``` - -ifile: -ofile: [options] +xaacenc -ifile: -ofile: [options] (or) - -paramfile: +xaacenc -paramfile: [options] can be, [-br:] [-mps:] @@ -110,7 +110,7 @@ where, ``` Sample CLI: ``` --ifile:input_file.wav -ofile:out_file.aac -br: –aot: