Changeset 5174:c24a2089056a in roaraudio for plugins/alsavs/pcm_roar.c

Timestamp:

10/22/11 12:11:33 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added some experimental fork of the old alsa plugin using VS API

File:

• plugins/alsavs/pcm_roar.c (modified) (11 diffs)

plugins/alsavs/pcm_roar.c

@@ -46 +46 @@
  struct roar_alsa_pcm * self = io->private_data;
  int fh;
+ int val;
+ int err;
 
  ROAR_DBG("roar_pcm_start(*) = ?");
@@ -53 +55 @@
   return 0;
 
- if ( roar_vio_simple_new_stream_obj(&(self->stream_vio), &(self->roar.con), &(self->stream),
-    self->info.rate, self->info.channels, self->info.bits, self->info.codec,
-    io->stream == SND_PCM_STREAM_PLAYBACK ? ROAR_DIR_PLAY : ROAR_DIR_MONITOR
-    ) == -1 ) {
-  return -EINVAL;
+ if ( (self->vss = roar_vs_new_from_con(&(self->roar.con), &err)) == NULL ) {
+  roar_err_set(err);
+  roar_err_update();
+  return -errno;
+ }
+
+ if ( roar_vs_stream(self->vss, &(self->info),
+                     io->stream == SND_PCM_STREAM_PLAYBACK ? ROAR_DIR_PLAY : ROAR_DIR_MONITOR,
+                     &err) == -1 ) {
+  roar_vs_close(self->vss, ROAR_VS_TRUE, NULL);
+  self->vss = NULL;
+  roar_err_set(err);
+  roar_err_update();
+  return -errno;
+ }
+
+ if ( roar_vs_buffer(self->vss, self->bufsize, &err) == -1 ) {
+  roar_vs_close(self->vss, ROAR_VS_TRUE, NULL);
+  self->vss = NULL;
+  roar_err_set(err);
+  roar_err_update();
+  return -errno;
+ }
+
+ val = ROAR_VS_ASYNCLEVEL_AUTO;
+ if ( roar_vs_ctl(self->vss, ROAR_VS_CMD_SET_ASYNC, &val, &err) == -1 ) {
+  roar_vs_close(self->vss, ROAR_VS_TRUE, NULL);
+  self->vss = NULL;
+  roar_err_set(err);
+  roar_err_update();
+  return -errno;
  }
 
  if ( self->stream_role != ROAR_ROLE_UNKNOWN ) {
-  if ( roar_stream_set_role(&(self->roar.con), &(self->stream), self->stream_role) == -1 ) {
-   ROAR_WARN("roar_pcm_start(*): Can not set stream role: %i: %s", self->stream_role, roar_error2str(roar_error));
+  if ( roar_vs_role(self->vss, self->stream_role, &err) == -1 ) {
+   ROAR_WARN("roar_pcm_start(*): Can not set stream role: %s(%i): %s",
+             roar_role2str(self->stream_role), self->stream_role, roar_error2str(roar_error));
   }
  }
 
- if ( roar_vio_ctl(&(self->stream_vio), 
+ if ( roar_vio_ctl(roar_vs_vio_obj(self->vss, NULL), 
     io->stream == SND_PCM_STREAM_PLAYBACK ? ROAR_VIO_CTL_GET_SELECT_WRITE_FH :
     ROAR_VIO_CTL_GET_SELECT_READ_FH, &fh) != 1 ) {
@@ -81 +110 @@
  self->stream_opened = 1;
 
- self->bufptr = 0;
+//RM: self->bufptr = 0;
+ ROAR_DBG("roar_pcm_start(*): Starting background thread");
  self->thread_active = 1; // We have to activate the thread before starting it, because the thread lives on that thread_active is 1.
  if ( pthread_create(&(self->thread), NULL, roar_plugin_thread, self) < 0 ) {
   self->thread_active = 0;
+  ROAR_DBG("roar_pcm_start(*) = -1");
   return -1;
  }
-
+ pthread_mutex_lock(&(self->lock)); // wait for the background thread to wake up.
+ ROAR_DBG("roar_pcm_start(*): background thread was successfully started");
+
+ ROAR_DBG("roar_pcm_start(*) = 0");
  return 0;
 }
@@ -95 +129 @@
   return;
 
- roar_vio_close(&(self->stream_vio));
+ roar_vs_close(self->vss, ROAR_VS_TRUE, NULL);
+ self->vss = NULL;
  self->stream_opened = 0;
  self->thread_active = 0;
- self->bufptr = 0;
- self->last_ptr = 0;
- self->total_written = 0;
- self->has_written = 0;
+//RM: self->bufptr = 0;
+//RM: self->last_ptr = 0;
+//RM: self->total_written = 0;
+//RM: self->has_written = 0;
 }
 
@@ -198 +233 @@
  struct roar_alsa_pcm * self = io->private_data;
  int ptr;
+ ssize_t avail;
 
  ROAR_DBG("roar_pcm_pointer(*) = ?");
+
  // Did ALSA just call snd_pcm_reset() or something like that without calling the plugin? 
  // We should restart our stream as well.
@@ -207 +244 @@
  }
 
+#if 0
  // ALSA has a weird way of calculating how much data can be written to the audio buffer.
  // It uses the formula:
@@ -218 +256 @@
  ptr = snd_pcm_bytes_to_frames(io->pcm, self->bufptr);
  pthread_mutex_unlock(&(self->lock));
+#else
+ pthread_mutex_lock(&(self->lock));
+ avail = roar_vs_get_avail_write(self->vss, NULL);
+ pthread_mutex_unlock(&(self->lock));
+
+ ROAR_DBG("roar_pcm_pointer(*): avail=%lli", (long long int)avail);
+
+ ptr = snd_pcm_bytes_to_frames(io->pcm, self->bufsize - avail);
+#endif
 
  ptr = io->appl_ptr - ptr;
@@ -261 +308 @@
 static int roar_pcm_delay(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delayp) {
  struct roar_alsa_pcm * self = io->private_data;
+ roar_mus_t lat;
 
  ROAR_DBG("roar_pcm_delay(*) = ?");
@@ -266 +314 @@
  // TODO: We need to set *delayp the latency in frames.
  pthread_mutex_lock(&(self->lock));
- roar_plugin_drain(self);
- *delayp = snd_pcm_bytes_to_frames(io->pcm, self->bytes_in_buffer);
+ roar_plugin_drain(self); // why do we call this?
+
+ lat = roar_vs_latency2(self->vss, ROAR_VS_BACKEND_DEFAULT, ROAR_VS_NOWAIT, NULL);
+ *delayp = lat * self->info.rate;
+
  pthread_mutex_unlock(&(self->lock));
 
@@ -373 +424 @@
  //self->bufsize = snd_pcm_frames_to_bytes(io->pcm, buffersize);
  self->bufsize = self->info.bits * self->info.channels * buffersize / 8;
- self->buffer = malloc(self->bufsize);
- if (self->buffer == NULL)
-  return -1;
- self->bufptr = 0;
+//RM: self->buffer = malloc(self->bufsize);
+//RM: if (self->buffer == NULL)
+//RM:  return -1;
+//RM: self->bufptr = 0;
 
  ROAR_DBG("roar_pcm_hw_params(*) Setting buffersize (bytes): %i", (int)self->bufsize);
@@ -398 +449 @@
  pthread_cond_destroy(&(self->cond));
 
- free(self->buffer);
+//RM: free(self->buffer);
  free(self);