Changeset 1223:29f5a58d63ce in roaraudio

Timestamp:

02/25/09 00:44:19 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

typo in 'streams_calc_delay' and added cf ctl, prototype for a stream ctl...

Location:

roard

Files:

• codecfilter.c (modified) (11 diffs)
• include/codecfilter.h (modified) (1 diff)
• include/streams.h (modified) (1 diff)
• req.c (modified) (1 diff)
• streams.c (modified) (3 diffs)

roard/codecfilter.c

@@ -29 +29 @@
 struct roar_codecfilter g_codecfilter[] = {
  {-1,                     "null", "null codec filter", NULL, ROAR_CODECFILTER_NONE,
-                                          NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+                                          NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
 
 /*
@@ -38 +38 @@
 */
  {ROAR_CODEC_RIFF_WAVE, "RIFF/WAVE", "RIFF/WAVE", NULL, ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
-  cf_wave_open, cf_wave_close, NULL, cf_wave_write, cf_wave_read, NULL, NULL},
+  cf_wave_open, cf_wave_close, NULL, cf_wave_write, cf_wave_read, NULL, NULL, NULL},
 //#endif
 
@@ -54 +54 @@
   NULL,
 #endif
-  cf_alaw_read, NULL, cf_alaw_delay},
+  cf_alaw_read, NULL, cf_alaw_delay, NULL},
 #endif
 
@@ -70 +70 @@
   NULL,
 #endif
-  cf_mulaw_read, NULL, cf_alaw_delay},
+  cf_mulaw_read, NULL, cf_alaw_delay, NULL},
 #endif
 
@@ -77 +77 @@
  {ROAR_CODEC_OGG_GENERAL, "cmd",  "ogg123",
   ROAR_HAVE_BIN_OGG123 " -q -d raw -f - -", ROAR_CODECFILTER_READ,
-  cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn},
+  cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn, NULL},
 #endif
 #endif
@@ -88 +88 @@
  ROAR_CODECFILTER_READ,
 #endif
- cf_vorbis_open, cf_vorbis_close, NULL, cf_vorbis_write, cf_vorbis_read, NULL, codecfilter_delay_fulldyn},
+ cf_vorbis_open, cf_vorbis_close, NULL, cf_vorbis_write, cf_vorbis_read, NULL, codecfilter_delay_fulldyn, NULL},
 #else
 #ifndef ROAR_WITHOUT_CF_CMD
@@ -94 +94 @@
  {ROAR_CODEC_OGG_VORBIS, "cmd",  "ogg123",
   ROAR_HAVE_BIN_OGG123 " -q -d raw -f - -", ROAR_CODECFILTER_READ,
-  cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn},
+  cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn, NULL},
 #endif
 #endif
@@ -102 +102 @@
  {ROAR_CODEC_OGG_SPEEX, "fishsound",  "libfishsound Xiph Codec library",
   NULL, ROAR_CODECFILTER_READ,
-  cf_fishsound_open, cf_fishsound_close, NULL, NULL, cf_fishsound_read, NULL, codecfilter_delay_fulldyn},
+  cf_fishsound_open, cf_fishsound_close, NULL, NULL, cf_fishsound_read, NULL, codecfilter_delay_fulldyn, NULL},
 
  {ROAR_CODEC_OGG_FLAC, "fishsound",  "libfishsound Xiph Codec library",
   NULL, ROAR_CODECFILTER_READ,
-  cf_fishsound_open, cf_fishsound_close, NULL, NULL, cf_fishsound_read, NULL, codecfilter_delay_fulldyn},
+  cf_fishsound_open, cf_fishsound_close, NULL, NULL, cf_fishsound_read, NULL, codecfilter_delay_fulldyn, NULL},
 #endif
 
@@ -113 +113 @@
  {ROAR_CODEC_MIDI_FILE, "MIDIFILE", "timidity MIDI synth",
   ROAR_HAVE_BIN_TIMIDITY " -Or1sl -s %R -o - -", ROAR_CODECFILTER_READ,
-  cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn},
+  cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn, NULL},
 #endif
 #endif
@@ -119 +119 @@
 #ifdef ROAR_HAVE_LIBCELT
  {ROAR_CODEC_ROAR_CELT, "RoarCELT", "RoarAudio CELT", NULL, ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
-  cf_celt_open, cf_celt_close, NULL, cf_celt_write, cf_celt_read, NULL, cf_celt_delay},
+  cf_celt_open, cf_celt_close, NULL, cf_celt_write, cf_celt_read, NULL, cf_celt_delay, NULL},
 #endif
 
 #ifdef ROAR_HAVE_LIBSPEEX
  {ROAR_CODEC_ROAR_SPEEX, "RoarSpeex", "RoarAudio Speex", NULL, ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
-  cf_speex_open, cf_speex_close, NULL, cf_speex_write, cf_speex_read, NULL, NULL},
+  cf_speex_open, cf_speex_close, NULL, cf_speex_write, cf_speex_read, NULL, NULL, NULL},
 #endif
 
@@ -138 +138 @@
 #endif
   ROAR_CODECFILTER_READ,
-  cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn},
-#endif
-#endif
-
- {-1, NULL, NULL, NULL, ROAR_CODECFILTER_NONE, NULL, NULL, NULL, NULL, NULL, NULL, NULL} // end of list
+  cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn, NULL},
+#endif
+#endif
+
+ {-1, NULL, NULL, NULL, ROAR_CODECFILTER_NONE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL} // end of list
 };
 

roard/include/codecfilter.h

@@ -51 +51 @@
  int (*flush)(CODECFILTER_USERDATA_T   inst);
  int (*delay)(CODECFILTER_USERDATA_T   inst, uint_least32_t * delay);
+ int (*ctl  )(CODECFILTER_USERDATA_T   inst, int cmd, void * data);
 };
 

roard/include/streams.h

@@ -84 +84 @@
 int streams_get_flag     (int id, int flag);
 
-int sreams_calc_delay    (int id);
+int streams_calc_delay   (int id);
+
+int streams_ctl          (int id, int cmd, void * data);
 
 int stream_add_buffer     (int id, struct roar_buffer *  buf);

roard/req.c

@@ -482 +482 @@
  }
 
- if ( sreams_calc_delay(mes->stream) == -1 ) {
+ if ( streams_calc_delay(mes->stream) == -1 ) {
   ROAR_WARN("req_on_get_stream_para(*): can not calc delay for stream %i", mes->stream);
  }

roard/streams.c

@@ -337 +337 @@
 }
 
-int sreams_calc_delay    (int id) {
+int streams_calc_delay    (int id) {
  struct roar_stream_server * ss;
  struct roar_stream        * s;
@@ -354 +354 @@
  if ( ss->vio.ctl != NULL ) {
   if ( roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_GET_DELAY, t) != -1 ) { // *t is in byte
-   ROAR_DBG("sreams_calc_delay(id=%i): VIO delay in byte: %i", id, *t);
+   ROAR_DBG("streams_calc_delay(id=%i): VIO delay in byte: %i", id, *t);
    tmp = *t;
    tmp *= 1000000; // musec per sec
    tmp /= s->info.rate * s->info.channels * (s->info.bits/8);
-   ROAR_DBG("sreams_calc_delay(id=%i): VIO delay in musec: %i", id, tmp);
+   ROAR_DBG("streams_calc_delay(id=%i): VIO delay in musec: %i", id, tmp);
 
    d += tmp;
@@ -364 +364 @@
  }
 
- ROAR_DBG("sreams_calc_delay(id=%i): delay in musec: %i", id, d);
+ ROAR_DBG("streams_calc_delay(id=%i): delay in musec: %i", id, d);
 
  ss->delay = d;