Changeset 2986:aee721f3e7e1 in roaraudio

Timestamp:

10/26/09 09:02:38 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

patch for jumbo packets

File:

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

roarclients/roarphone.c

@@ -58 +58 @@
  int transcode;
  int64_t dtx_threshold;
+ size_t jumbo_mtu;
 } g_conf;
 
@@ -96 +97 @@
 
  printf("  --server   SERVER    - Set server hostname\n"
+        " --jumbo-mtu MTU       - Sets the MTU for Jumbo Packets\n"
        );
 
@@ -370 +372 @@
                                };
  struct roar_audio_info dinfo;
- struct roar_vio_calls dvio, svio, svio_real;
+ struct roar_vio_calls dvio, svio, svio_jumbo, svio_real;
+ struct roar_vio_calls * svio_p;
  char * driver   = DRIVER;
  char * device   = NULL;
@@ -395 +398 @@
   if ( strcmp(k, "--server") == 0 ) {
    server = argv[++i];
+  } else if ( strcmp(k, "--jumbo-mtu") == 0 ) {
+   g_conf.jumbo_mtu = atoi(argv[++i]);
   } else if ( strcmp(k, "--rate") == 0 ) {
    info.rate = atoi(argv[++i]);
@@ -506 +511 @@
  }
 
+ if ( g_conf.jumbo_mtu ) {
+  if ( roar_vio_open_jumbo(&svio_jumbo, &svio, g_conf.jumbo_mtu) == -1 ) {
+   roar_vio_close(&dvio);
+   roar_vio_close(&svio);
+   return 2;
+  }
+  svio_p = &svio_jumbo;
+ } else {
+  svio_p = &svio;
+ }
+
  set_meta();
 
@@ -511 +527 @@
   dinfo.codec = info.codec;
 
-  if ( roar_bixcoder_init(transcoder, &dinfo, &svio) == -1 ) {
+  if ( roar_bixcoder_init(transcoder, &dinfo, svio_p) == -1 ) {
    roar_vio_close(&svio);
    roar_vio_close(&dvio);
@@ -525 +541 @@
 
  ROAR_DBG("main(*): CALL run_stream(&dvio, &svio, &info);");
- run_stream(&dvio, &svio, &info);
+ run_stream(&dvio, svio_p, &info);
  ROAR_DBG("main(*): RET");
 
  roar_bixcoder_close(transcoder);
 
- roar_vio_close(&svio);
+ roar_vio_close(svio_p);
  roar_vio_close(&dvio);