Changeset 2185:428bc7864999 in roaraudio

Timestamp:

07/26/09 19:27:16 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

first try of transcoding code

File:

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

roarclients/roarphone.c

@@ -24 +24 @@
 
 #include <roaraudio.h>
+#include <libroardsp/libroardsp.h>
 #include "driver.h"
 
@@ -45 +46 @@
  int transcode;
 } g_conf;
+
+struct roar_bixcoder transcoder[1];
 
 void usage (void) {
@@ -156 +159 @@
   if ( (miclen = roar_vio_read(s0, micbuf, len)) <= 0 )
    break;
-  if ( roar_vio_write(s1, micbuf, miclen) != miclen )
-   break;
-  if ( (outlen = roar_vio_read(s1, outbuf, len)) <= 0 )
-   break;
+  if ( g_conf.transcode ) {
+   if ( roar_bixcoder_write_packet(transcoder, micbuf, miclen) == -1 )
+    break;
+  } else {
+   if ( roar_vio_write(s1, micbuf, miclen) != miclen )
+    break;
+  }
+
+  if ( g_conf.transcode ) {
+   if ( roar_bixcoder_read_packet(transcoder, outbuf, len) == -1 )
+    break;
+
+   outlen = len;
+  } else {
+   if ( (outlen = roar_vio_read(s1, outbuf, len)) <= 0 )
+    break;
+  }
 
   if ( g_conf.antiecho != AE_NONE && info->bits == 16 )
@@ -265 +281 @@
  }
 
+ if ( g_conf.transcode ) {
+  dinfo.codec = info.codec;
+
+  if ( roar_bixcoder_init(transcoder, &dinfo, &svio) == -1 ) {
+   roar_vio_close(&svio);
+   roar_vio_close(&dvio);
+   return 10;
+  }
+
+  g_conf.samples = roar_bixcoder_packet_size(transcoder, g_conf.samples);
+ }
+
  run_stream(&dvio, &svio, &info);
+
+ roar_bixcoder_close(transcoder);
 
  roar_vio_close(&svio);