Changeset 1224:d66ef0e2143d in roaraudio

Timestamp:

02/25/09 00:56:42 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

start of stream ctl implementation

Location:

roard

Files:

• codecfilter.c (modified) (1 diff)
• include/codecfilter.h (modified) (1 diff)
• include/streams.h (modified) (2 diffs)
• streams.c (modified) (1 diff)

roard/codecfilter.c

@@ -292 +292 @@
 }
 
+int codecfilter_ctl  (CODECFILTER_USERDATA_T   inst, int codecfilter, int_least32_t cmd, void * data) {
+ if ( codecfilter == -1 )
+  return -1;
+
+ if ( g_codecfilter[codecfilter].ctl )
+  return g_codecfilter[codecfilter].ctl(inst, cmd, data);
+
+ return -1;
+}
+
+
 int codecfilter_delay_fulldyn(CODECFILTER_USERDATA_T   inst, uint_least32_t * delay) {
  *delay = 0; // just to be sure

roard/include/codecfilter.h

@@ -93 +93 @@
 int codecfilter_flush(CODECFILTER_USERDATA_T   inst, int codecfilter);
 int codecfilter_delay(CODECFILTER_USERDATA_T   inst, int codecfilter, uint_least32_t * delay);
+int codecfilter_ctl  (CODECFILTER_USERDATA_T   inst, int codecfilter, int_least32_t cmd, void * data);
 
 int codecfilter_delay_fulldyn(CODECFILTER_USERDATA_T   inst, uint_least32_t * delay);

roard/include/streams.h

@@ -36 +36 @@
 //#define ROAR_STREAM(x)        ((struct roar_stream*)(x))
 #define ROAR_STREAM_SERVER(x) ((struct roar_stream_server*)(x))
+
+// stream ctls...:
+
+#define ROAR_STREAM_CTL_COMPMASK  0xFF000000
+#define ROAR_STREAM_CTL_TYPEMASK  0x00FF0000
+#define ROAR_STREAM_CTL_CMDMASK   0x0000FFFF
+
+#define ROAR_STREAM_CTL_COMP_BASE 0x00000000
+#define ROAR_STREAM_CTL_COMP_CF   0x01000000
+#define ROAR_STREAM_CTL_COMP_DRV  0x02000000
+
 
 struct roar_stream_server {
@@ -86 +97 @@
 int streams_calc_delay   (int id);
 
-int streams_ctl          (int id, int cmd, void * data);
+int streams_ctl          (int id, int_least32_t cmd, void * data);
 
 int stream_add_buffer     (int id, struct roar_buffer *  buf);

roard/streams.c

@@ -371 +371 @@
 }
 
+int streams_ctl          (int id, int_least32_t cmd, void * data) {
+ struct roar_stream_server * ss;
+ int_least32_t comp;
+
+ if ( (ss = g_streams[id]) == NULL )
+  return -1;
+
+ comp = cmd & ROAR_STREAM_CTL_COMPMASK;
+
+ cmd &= ~comp;
+
+ switch (comp) {
+  case ROAR_STREAM_CTL_COMP_BASE:
+   break;
+  case ROAR_STREAM_CTL_COMP_CF:
+    return codecfilter_ctl(ss->codecfilter_inst, ss->codecfilter, cmd, data);
+   break;
+  case ROAR_STREAM_CTL_COMP_DRV:
+   break;
+  default:
+   return -1;
+ }
+
+ return -1;
+}
+
 int streams_get_outputbuffer  (int id, void ** buffer, size_t size) {
  if ( g_streams[id] == NULL )