diff options
| author | Jan Buethe <jbuethe@amazon.de> | 2023-12-14 15:20:27 +0300 |
|---|---|---|
| committer | Jan Buethe <jbuethe@amazon.de> | 2023-12-20 12:24:55 +0300 |
| commit | 25a1339605cd61366b58024b3c0f0656f1cfca80 (patch) | |
| tree | da38b088e62adc06deacd0db11753de150056ed0 | |
| parent | c4c8a267c38a8e8bb68e4fdde35955ad63654b5f (diff) | |
osce enabled by default, dec_complexity=10
| -rw-r--r-- | configure.ac | 50 | ||||
| -rw-r--r-- | src/opus_demo.c | 10 |
2 files changed, 35 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index 84ce651d..3caf8735 100644 --- a/configure.ac +++ b/configure.ac @@ -162,6 +162,32 @@ AS_IF([test "$enable_custom_modes" = "yes"],[ AM_CONDITIONAL([CUSTOM_MODES], [test "$enable_custom_modes" = "yes"]) + +AC_ARG_ENABLE([osce-training-data], + AS_HELP_STRING([--enable-osce-training-data], [enables feature output for SILK enhancement]),, + [enable_osc_training_data=no] +) + +AS_IF([test "$enable_osce_training_data" = "yes"], [ + AC_DEFINE([ENABLE_OSCE_TRAINING_DATA], [1], [Enable dumping of OSCE training data]) +]) + +AC_MSG_CHECKING([argument osce training data]) +AS_IF([test "$enable_osce_training_data" = "yes"], [ + AC_MSG_RESULT([yes]) +], [AC_MSG_RESULT([no])]) + +AC_ARG_ENABLE([osce], + AS_HELP_STRING([--disable-osce], [enables feature output for SILK enhancement]),, + [enable_osce=yes] +) + +AS_IF([test "$enable_osce" = "yes" || test "$enable_osce_training_data" = "yes"], [ + AC_DEFINE([ENABLE_OSCE], [1], [Enable Opus Speech Coding Enhancement]) +]) + +AM_CONDITIONAL([ENABLE_OSCE], [test "$enable_osce" = "yes" || test "$enable_osce_training_data" = "yes"]) + AC_ARG_ENABLE([dred], [AS_HELP_STRING([--enable-dred], [Use Deep REDundancy (DRED)])],, [enable_dred=no]) @@ -904,30 +930,6 @@ AS_IF([test "$enable_dnn_debug_float" = "no"], [ AC_DEFINE([DISABLE_DEBUG_FLOAT], [1], [Disable DNN debug float]) ]) -AC_ARG_ENABLE([osce-training-data], - AS_HELP_STRING([--enable-osce-training-data], [enables feature output for SILK enhancement]),, - [enable_osc_training_data=no] -) - -AS_IF([test "$enable_osce_training_data" = "yes"], [ - AC_DEFINE([ENABLE_OSCE_TRAINING_DATA], [1], [Enable dumping of OSCE training data]) -]) - -AC_MSG_CHECKING([argument osce training data]) -AS_IF([test "$enable_osce_training_data" = "yes"], [ - AC_MSG_RESULT([yes]) -], [AC_MSG_RESULT([no])]) - -AC_ARG_ENABLE([osce], - AS_HELP_STRING([--enable-osce], [enables feature output for SILK enhancement]),, - [enable_osce=no] -) - -AS_IF([test "$enable_osce" = "yes" || test "$enable_osce_training_data" = "yes"], [ - AC_DEFINE([ENABLE_OSCE], [1], [Enable Opus Speech Coding Enhancement]) -]) - -AM_CONDITIONAL([ENABLE_OSCE], [test "$enable_osce" = "yes" || test "$enable_osce_training_data" = "yes"]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "$HAVE_DOXYGEN" = "yes"]) diff --git a/src/opus_demo.c b/src/opus_demo.c index bccdf976..dd42f8bd 100644 --- a/src/opus_demo.c +++ b/src/opus_demo.c @@ -463,7 +463,7 @@ int main(int argc, char *argv[]) use_vbr = 1; max_payload_bytes = MAX_PACKET; complexity = 10; - dec_complexity = 0; + dec_complexity = 10; use_inbandfec = 0; forcechannels = OPUS_AUTO; use_dtx = 0; @@ -690,6 +690,14 @@ int main(int argc, char *argv[]) { opus_encoder_ctl(enc, OPUS_SET_DRED_DURATION(dred_duration)); } +<<<<<<< HEAD +======= + +#ifdef ENABLE_OSCE_TRAINING_DATA + /* force encoder to use SILK for the time being */ + opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(MODE_SILK_ONLY)); +#endif +>>>>>>> 895fb562 (osce enabled by default, dec_complexity=10) } if (!encode_only) { |