Changeset 2962:b67619049df3 in roaraudio

Timestamp:

10/20/09 19:52:30 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added codec option /mode/

Files:

• include/libroar/config.h (modified) (2 diffs)
• libroar/config.c (modified) (1 diff)

include/libroar/config.h

@@ -51 +51 @@
 #define ROAR_LIBROAR_CONFIG_PSET_DENOISE    0x0080 /* need to implement */
 #define ROAR_LIBROAR_CONFIG_PSET_VBR        0x0100
+#define ROAR_LIBROAR_CONFIG_PSET_MODE       0x0200
+
+#define ROAR_LIBROAR_CONFIG_MODE_NB         ROAR_SPEEX_MODE_NB
+#define ROAR_LIBROAR_CONFIG_MODE_WB         ROAR_SPEEX_MODE_WB
+#define ROAR_LIBROAR_CONFIG_MODE_UWB        ROAR_SPEEX_MODE_UWB
 
 struct roar_libroar_config_codec {
@@ -69 +74 @@
  // sizes:
  size_t max_cc;
+
+ // enums:
+ int mode;
 };
 

libroar/config.c

@@ -132 +132 @@
   codec_cfg->para_set |= ROAR_LIBROAR_CONFIG_PSET_VBR;
   codec_cfg->vbr = _P_BOOL(value_str);
+ } else if ( !strcmp(option_str, "mode") ) {
+  if ( !strcmp(value_str, "nb") ) {
+   codec_cfg->para_set |= ROAR_LIBROAR_CONFIG_PSET_MODE;
+   codec_cfg->mode      = ROAR_LIBROAR_CONFIG_MODE_NB;
+  } else if ( !strcmp(value_str, "wb") ) {
+   codec_cfg->para_set |= ROAR_LIBROAR_CONFIG_PSET_MODE;
+   codec_cfg->mode      = ROAR_LIBROAR_CONFIG_MODE_WB;
+  } else if ( !strcmp(value_str, "uwb") ) {
+   codec_cfg->para_set |= ROAR_LIBROAR_CONFIG_PSET_MODE;
+   codec_cfg->mode      = ROAR_LIBROAR_CONFIG_MODE_UWB;
+  } else {
+   ROAR_WARN("roar_libroar_config_parse_codec(*): Unknown codec mode: %s", value_str);
+   return -1;
+  }
  } else {
   ROAR_WARN("roar_libroar_config_parse_codec(*): Unknown codec option: %s", option_str);