add input latency measurement

[pulseaudio] / polyp / module-oss-mmap.c

diff --git a/polyp/module-oss-mmap.c b/polyp/module-oss-mmap.c
index 8151a13af347fd043a406a8f9bc13a17c729aa9f..015f4c6cf2aa6b2a8ffc9fea0c40127988e167eb 100644 (file)
--- a/polyp/module-oss-mmap.c
+++ b/polyp/module-oss-mmap.c
@@ -47,6 +47,10 @@
 #include "xmalloc.h"
 #include "log.h"
 
+PA_MODULE_AUTHOR("Lennart Poettering")
+PA_MODULE_DESCRIPTION("OSS Sink/Source (mmap)")
+PA_MODULE_VERSION(PACKAGE_VERSION)
+
 struct userdata {
     struct pa_sink *sink;
     struct pa_source *source;
@@ -206,7 +210,7 @@ static void io_callback(struct pa_mainloop_api *m, struct pa_io_event *e, int fd
         do_write(u);
 }
 
-static uint32_t sink_get_latency_cb(struct pa_sink *s) {
+static pa_usec_t sink_get_latency_cb(struct pa_sink *s) {
     struct userdata *u = s->userdata;
     assert(s && u);
 
@@ -214,7 +218,7 @@ static uint32_t sink_get_latency_cb(struct pa_sink *s) {
     return pa_bytes_to_usec(u->out_fill, &s->sample_spec);
 }
 
-int pa_module_init(struct pa_core *c, struct pa_module*m) {
+int pa__init(struct pa_core *c, struct pa_module*m) {
     struct audio_buf_info info;
     struct userdata *u = NULL;
     const char *p;
@@ -249,7 +253,7 @@ int pa_module_init(struct pa_core *c, struct pa_module*m) {
 
     nfrags = 12;
     frag_size = 1024;
-    if (pa_modargs_get_value_s32(ma, "fragments", &nfrags) < 0 || nfrags < 2 || pa_modargs_get_value_s32(ma, "fragment_size", &frag_size) < 0 || frag_size < 1) {
+    if (pa_modargs_get_value_s32(ma, "fragments", &nfrags) < 0 || pa_modargs_get_value_s32(ma, "fragment_size", &frag_size) < 0) {
         pa_log(__FILE__": failed to parse fragments arguments\n");
         goto fail;
     }
@@ -269,9 +273,10 @@ int pa_module_init(struct pa_core *c, struct pa_module*m) {
     }
 
     pa_log(__FILE__": device opened in %s mode.\n", mode == O_WRONLY ? "O_WRONLY" : (mode == O_RDONLY ? "O_RDONLY" : "O_RDWR"));
-    
-    if (pa_oss_set_fragments(u->fd, nfrags, frag_size) < 0)
-        goto fail;
+
+    if (nfrags >= 2 && frag_size >= 1)
+        if (pa_oss_set_fragments(u->fd, nfrags, frag_size) < 0)
+            goto fail;
     
     if (pa_oss_auto_format(u->fd, &u->sample_spec) < 0)
         goto fail;
@@ -361,7 +366,7 @@ int pa_module_init(struct pa_core *c, struct pa_module*m) {
     return 0;
 
 fail:
-    pa_module_done(c, m);
+    pa__done(c, m);
 
     if (ma)
         pa_modargs_free(ma);
@@ -369,7 +374,7 @@ fail:
     return -1;
 }
 
-void pa_module_done(struct pa_core *c, struct pa_module*m) {
+void pa__done(struct pa_core *c, struct pa_module*m) {
     struct userdata *u;
     assert(c && m);
 
@@ -398,11 +403,15 @@ void pa_module_done(struct pa_core *c, struct pa_module*m) {
     if (u->out_mmap && u->out_mmap != MAP_FAILED)
         munmap(u->out_mmap, u->out_mmap_length);
     
-    if (u->sink)
-        pa_sink_free(u->sink);
+    if (u->sink) {
+        pa_sink_disconnect(u->sink);
+        pa_sink_unref(u->sink);
+    }
 
-    if (u->source)
-        pa_source_free(u->source);
+    if (u->source) {
+        pa_source_disconnect(u->source);
+        pa_source_unref(u->source);
+    }
 
     if (u->io_event)
         u->core->mainloop->io_free(u->io_event);