Changeset 2675:8b6547df9647 in roaraudio

Timestamp:

09/12/09 23:46:24 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added most of the cf functions, open is still missing

Location:

roard

Files:

• container_framework.c (modified) (1 diff)
• include/container_framework.h (modified) (3 diffs)

roard/container_framework.c

@@ -213 +213 @@
 int     cont_fw_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
 
+// CF:
+int cont_fw_cf_open(CODECFILTER_USERDATA_T * inst, int codec,
+                                             struct roar_stream_server * info,
+                                             struct roar_codecfilter   * filter);
+
+int cont_fw_cf_close(CODECFILTER_USERDATA_T   inst) {
+ return cont_fw_delete(inst);
+}
+
+int cont_fw_cf_pause(CODECFILTER_USERDATA_T   inst, int newstate);
+
+
+// no direct read or writing...
+int cont_fw_cf_write(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
+ return -1;
+}
+
+int cont_fw_cf_read (CODECFILTER_USERDATA_T   inst, char * buf, int len) {
+ return -1;
+}
+
+int cont_fw_cf_flush(CODECFILTER_USERDATA_T   inst) {
+ struct cont_fw_parent_inst * self = (void*)inst;
+
+ if ( self->pcb.flush != NULL )
+  return self->pcb.flush(self);
+
+ return 0;
+}
+
+int cont_fw_cf_delay(CODECFILTER_USERDATA_T   inst, uint_least32_t * delay);
+
+int cont_fw_cf_ctl  (CODECFILTER_USERDATA_T   inst, int cmd, void * data) {
+ return -1;
+}
+
 //ll

roard/include/container_framework.h

@@ -48 +48 @@
  } ccb;
  struct {
+  int     (*open     )(struct cont_fw_parent_inst * self);
   int     (*close    )(struct cont_fw_parent_inst * self);
+  int     (*flush    )(struct cont_fw_parent_inst * self);
   int     (*new_child)(struct cont_fw_parent_inst * self, struct cont_fw_child_vio_inst * child);
  } pcb;
 };
 
+// Parent:
 int     cont_fw_new      (struct cont_fw_parent_inst ** inst);
 int     cont_fw_delete   (struct cont_fw_parent_inst  * inst);
@@ -58 +61 @@
 int     cont_fw_get_uinst(struct cont_fw_parent_inst  * inst, void ** u_inst);
 
+// Child:
 int     cont_fw_new_child(struct cont_fw_parent_inst  * inst, int id);
 int     cont_fw_init_vio(struct roar_vio_calls * vio, void * inst);
+
+// VIO:
 ssize_t cont_fw_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t cont_fw_write   (struct roar_vio_calls * vio, void *buf, size_t count);
@@ -68 +74 @@
 int     cont_fw_close   (struct roar_vio_calls * vio);
 
+// CF:
+int cont_fw_cf_open(CODECFILTER_USERDATA_T * inst, int codec,
+                                             struct roar_stream_server * info,
+                                             struct roar_codecfilter   * filter);
+int cont_fw_cf_close(CODECFILTER_USERDATA_T   inst);
+int cont_fw_cf_pause(CODECFILTER_USERDATA_T   inst, int newstate);
+int cont_fw_cf_write(CODECFILTER_USERDATA_T   inst, char * buf, int len);
+int cont_fw_cf_read (CODECFILTER_USERDATA_T   inst, char * buf, int len);
+int cont_fw_cf_flush(CODECFILTER_USERDATA_T   inst);
+int cont_fw_cf_delay(CODECFILTER_USERDATA_T   inst, uint_least32_t * delay);
+int cont_fw_cf_ctl  (CODECFILTER_USERDATA_T   inst, int cmd, void * data);
+
 #endif