Changeset 2167:a72f8c925e4b in roaraudio

Timestamp:

07/25/09 21:42:44 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

start transcoding code

File:

• roarclients/roarphone.c (modified) (5 diffs)

roarclients/roarphone.c

@@ -43 +43 @@
  int antiecho;
  int samples;
+ int transcode;
 } g_conf;
 
@@ -58 +59 @@
         "  --device   DEVICE    - Set the device\n"
         "  --antiecho AEMODE    - Set the anti echo mode\n"
+        "  --transcode          - Use local transcodeing\n"
         "  --help               - Show this help\n"
        );
@@ -177 +179 @@
                                 .codec    = ROAR_CODEC_DEFAULT
                                };
+ struct roar_audio_info dinfo;
  struct roar_vio_calls dvio, svio;
  char * driver   = DRIVER;
@@ -219 +222 @@
     return 1;
    }
+  } else if ( strcmp(k, "--transcode") == 0 ) {
+   g_conf.transcode = 1;
   } else if ( strcmp(k, "--help") == 0 ) {
    usage();
@@ -231 +236 @@
  g_conf.samples = info.channels * info.rate / TIMEDIV;
 
- if ( roar_cdriver_open(&dvio, driver, device, &info, ROAR_DIR_BIDIR) == -1 ) {
+ memcpy(&dinfo, &info, sizeof(dinfo));
+
+ if ( g_conf.transcode ) {
+  dinfo.bits  = 16;
+  dinfo.codec = ROAR_CODEC_DEFAULT;
+
+  switch (info.codec) {
+   case ROAR_CODEC_ALAW:
+   case ROAR_CODEC_MULAW:
+     info.bits = 8;
+    break;
+   case ROAR_CODEC_ROAR_CELT:
+     info.bits = 16;
+    break;
+   case ROAR_CODEC_ROAR_SPEEX:
+     info.bits = 16;
+    break;
+  }
+ }
+
+ if ( roar_cdriver_open(&dvio, driver, device, &dinfo, ROAR_DIR_BIDIR) == -1 ) {
   return 1;
  }