Changeset 8817

Timestamp:

02/27/09 15:35:28 (4 years ago)

Author:

jgaeddert

Message:

configuring buffers, callbacks

Location:

ossiedev/branches/0.7.x/platform/AudioDevice/src

Files:

• AudioDevice.cpp (modified) (9 diffs)
• AudioDevice.h (modified) (5 diffs)

ossiedev/branches/0.7.x/platform/AudioDevice/src/AudioDevice.cpp

@@ -30 +30 @@
 
 #define AUDIODEVICE_NUMCHANNELS     (2)
-#define AUDIODEVICE_SAMPLEFORMAT    (paInt16)
+#define AUDIODEVICE_SAMPLEFORMAT    (paFloat32) // paInt16
 
 // Initializing constructor
@@ -41 +41 @@
 
     // set configured flags to false
+    // All properties must be configured before the stream is opened,
+    // after which any change in properties will be ignored
     configured = false;
     configured_prop_samplerate_record   = false;
@@ -47 +49 @@
     configured_prop_buffersize_playback = false;
 
+    buffer_playback = NULL;
+    buffer_record   = NULL;
+
     // Create Port for output sound
     dataOut = new standardInterfaces_i::complexShort_u("complexShortOut");
+    dataIn  = new standardInterfaces_i::complexShort_p("complexShortIn");
     // TODO: create port for input sound
 
@@ -70 +76 @@
 AudioDevice_i::~AudioDevice_i()
 {
+    if (buffer_playback)
+        delete [] buffer_playback;
+    if (buffer_record)
+        delete [] buffer_record;
+
     PaError err = Pa_Terminate();
     if (err != paNoError) {
@@ -144 +155 @@
               << props.length()  
              )
+
+    if (configured) {
+        std::cout << "warning: AudioDevice_i::configure(), "
+                  << "cannot reconfigure once all properties are set"
+                  << std::endl;
+        return;
+    }
 
     // read properties from .prf
@@ -201 +219 @@
         return;
 
-    if (isRunning) {
-        stop();
-        // ...
-        start();
-    } else {
-        // ...
-    }
-
+    // configure streams
+    ConfigureStreams();
+
+    // initialize buffers
+    buffer_playback = new float[2*buffersize_playback];
+    buffer_record   = new float[2*buffersize_record];
 }
 
@@ -370 +386 @@
 }
 
+void AudioDevice_i::SetRecordData(float * _data)
+{
+    // copy data to buffer
+    for (unsigned int i=0; i<buffersize_record; i++) {
+        record_data_L[i] = buffer_record[2*i+0];
+        record_data_R[i] = buffer_record[2*i+1];
+    }
+
+    // push data
+    dataOut->pushPacket(record_data_L, record_data_R);
+}
+
+void AudioDevice_i::GetPlaybackData(float ** _data)
+{
+    // wait for data
+    dataIn->getData(playback_data_L, playback_data_R);
+
+    // copy to buffer
+    for (unsigned int i=0; i<buffersize_playback; i++) {
+        buffer_playback[2*i+0] = (*playback_data_L)[i];
+        buffer_playback[2*i+1] = (*playback_data_R)[i];
+    }
+
+    // release input buffer
+    dataIn->bufferEmptied();
+
+    // return pointer to playback buffer
+    _data = &buffer_playback;
+}
+
 int portaudio_callback_record(
     const void *inputBuffer,
@@ -378 +424 @@
     void *userData )
 {
-    AudioDevice_i * device = (AudioDevice_i*)userData;
-    short int * in = (short int*)inputBuffer;
+    //short int * in = (short int*)inputBuffer;
 
     // prevent unused variable warnings
@@ -403 +448 @@
 {
     AudioDevice_i * device = (AudioDevice_i*)userData;
-    short int * out = (short int*)outputBuffer;
+    //short int * out = (short int*)outputBuffer;
+    // wait for data
+    float *data;
+    device->GetPlaybackData(&data);
 
     // prevent unused variable warnings

ossiedev/branches/0.7.x/platform/AudioDevice/src/AudioDevice.h

@@ -34 +34 @@
 #include "standardinterfaces/complexShort.h"
 #include "standardinterfaces/complexShort_u.h"
+#include "standardinterfaces/complexShort_p.h"
 
 #include "portaudio.h"
@@ -52 +53 @@
     PaStreamCallbackFlags statusFlags,
     void *userData );
+
 
 /// Main sound card device (capture) definition
@@ -72 +74 @@
     /// static function for omni thread: playback_sound()
     static void run_playback( void * data );
-
-    /// Sets isRunning to False (pause)
+        /// Sets isRunning to False (pause)
+    
+    //
+    void SetRecordData(float * _data);
+    void GetPlaybackData(float ** _data);
+    
     void stop() 
         throw (CF::Resource::StopError, CORBA::SystemException);
@@ -127 +133 @@
     /// Port: output sound samples
     standardInterfaces_i::complexShort_u *dataOut;
+    standardInterfaces_i::complexShort_p *dataIn;
 
     // properties configured flags
@@ -156 +163 @@
     unsigned int buffersize_playback;
 
-    PortTypes::ShortSequence playback_data_L;
-    PortTypes::ShortSequence playback_data_R;
+    PortTypes::ShortSequence *playback_data_L;
+    PortTypes::ShortSequence *playback_data_R;
 
     PortTypes::ShortSequence record_data_L;
     PortTypes::ShortSequence record_data_R;
+
+    float * buffer_playback;
+    float * buffer_record;
 
 };