Mercurial > octave-nkf

changeset 19705:322d0fe84a8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make audio buffer size dependent on sample rate * audiodevinfo.cc (audioplayer::play, audioplayer::playblocking, audiorecorder::record, audiorecorder::recordblocking): Decrease audio buffer size and make size dependent on audio sample rate.
author Mike Miller <mtmiller@ieee.org>
date Sun, 01 Feb 2015 18:16:00 -0500
parents e5facc6eec13
children b5a8f0f31664
files libinterp/dldfcn/audiodevinfo.cc
diffstat 1 files changed, 31 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/dldfcn/audiodevinfo.cc	Sat Feb 07 20:55:39 2015 -0800
+++ b/libinterp/dldfcn/audiodevinfo.cc	Sun Feb 01 18:16:00 2015 -0500
@@ -35,6 +35,7 @@
 #include "defun-dld.h"
 #include "error.h"
 #include "gripes.h"
+#include "oct-locbuf.h"
 #include "oct-obj.h"
 #include "ov.h"
 #include "ov-int32.h"
@@ -548,8 +549,6 @@
   DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
 };
 
-static const unsigned int BUFFER_SIZE = 8192;
-
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (audioplayer, "audioplayer", "audioplayer");
 
 static int
@@ -682,7 +681,7 @@
   // Don't multiply the audio data by scale_factor here.  Although it
   // would move the operation outside of the loops below, it also causes
   // a second copy of the *entire* data array to be made when only a
-  // small portion (BUFFER_SIZE elements) is usually needed for this
+  // small portion (buffer_size elements) is usually needed for this
   // callback.
 
   const RowVector sound_l = player->get_left ();
@@ -1129,10 +1128,12 @@
   if (get_stream ())
     stop ();
 
+  const unsigned int buffer_size = get_fs () / 20;
+  OCTAVE_LOCAL_BUFFER (uint32_t, buffer, buffer_size * 2);
+
   PaError err;
-  uint32_t buffer[BUFFER_SIZE * 2];
   err = Pa_OpenStream (&stream, 0, &(output_parameters), get_fs (),
-                       BUFFER_SIZE, paClipOff, 0, 0);
+                       buffer_size, paClipOff, 0, 0);
   if (err != paNoError)
     {
       error ("audioplayer: unable to open audio playback stream");
@@ -1149,14 +1150,15 @@
   unsigned int start, end;
   start = get_sample_number ();
   end = get_end_sample ();
-  for (unsigned int i = start; i < end; i += BUFFER_SIZE)
+
+  for (unsigned int i = start; i < end; i += buffer_size)
     {
       if (octave_callback_function != 0)
-        octave_play_callback (0, buffer, BUFFER_SIZE, 0, 0, this);
+        octave_play_callback (0, buffer, buffer_size, 0, 0, this);
       else
-        portaudio_play_callback (0, buffer, BUFFER_SIZE, 0, 0, this);
-
-      err = Pa_WriteStream (stream, buffer, BUFFER_SIZE);
+        portaudio_play_callback (0, buffer, buffer_size, 0, 0, this);
+
+      err = Pa_WriteStream (stream, buffer, buffer_size);
     }
 
   err = Pa_StopStream (stream);
@@ -1184,14 +1186,16 @@
   if (get_stream ())
     stop ();
 
+  const unsigned int buffer_size = get_fs () / 20;
+
   PaError err;
   if (octave_callback_function != 0)
     err = Pa_OpenStream (&stream, 0, &(output_parameters),
-                         get_fs (), BUFFER_SIZE, paClipOff,
+                         get_fs (), buffer_size, paClipOff,
                          octave_play_callback, this);
   else
     err = Pa_OpenStream (&stream, 0, &(output_parameters),
-                         get_fs (), BUFFER_SIZE, paClipOff,
+                         get_fs (), buffer_size, paClipOff,
                          portaudio_play_callback, this);
 
   if (err != paNoError)
@@ -1762,17 +1766,20 @@
 
   left.clear ();
   right.clear ();
+
+  const unsigned int buffer_size = get_fs () / 20;
+
   PaError err;
   if (octave_callback_function != 0)
     {
       err = Pa_OpenStream (&stream, &(input_parameters), 0,
-                           get_fs (), BUFFER_SIZE, paClipOff,
+                           get_fs (), buffer_size, paClipOff,
                            octave_record_callback, this);
     }
   else
     {
       err = Pa_OpenStream (&stream, &(input_parameters), 0,
-                           get_fs (), BUFFER_SIZE, paClipOff,
+                           get_fs (), buffer_size, paClipOff,
                            portaudio_record_callback, this);
     }
   if (err != paNoError)
@@ -1797,9 +1804,12 @@
   left.clear ();
   right.clear ();
 
+  const unsigned int buffer_size = get_fs () / 20;
+  OCTAVE_LOCAL_BUFFER (uint8_t, buffer, buffer_size * 2 * 3);
+
   PaError err;
   err = Pa_OpenStream (&stream, &(input_parameters), 0,
-                       get_fs (), BUFFER_SIZE, paClipOff, 0, this);
+                       get_fs (), buffer_size, paClipOff, 0, this);
   if (err != paNoError)
     {
       error ("audiorecorder: unable to open audio recording stream");
@@ -1814,14 +1824,15 @@
     }
 
   unsigned int frames = seconds * get_fs ();
-  uint8_t buffer[BUFFER_SIZE * 2 * 3];
-  for (unsigned long i = 0; i < frames / BUFFER_SIZE; i++)
+
+  for (unsigned int i = 0; i < frames; i += buffer_size)
     {
-      Pa_ReadStream (get_stream (), buffer, BUFFER_SIZE);
+      Pa_ReadStream (get_stream (), buffer, buffer_size);
+
       if (octave_callback_function != 0)
-        octave_record_callback (buffer, 0, BUFFER_SIZE, 0, 0, this);
+        octave_record_callback (buffer, 0, buffer_size, 0, 0, this);
       else
-        portaudio_record_callback (buffer, 0, BUFFER_SIZE, 0, 0, this);
+        portaudio_record_callback (buffer, 0, buffer_size, 0, 0, this);
     }
 }