Add QNX io-audio adapter

Adds a JACK internal client to interact with QNX io-audio system.

common/JackAudioAdapterFactory.cpp

@@ -35,6 +35,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #define JackPlatformAdapter JackAlsaAdapter
 #endif
 
+#ifdef __QNX__
+#include "JackIoAudioAdapter.h"
+#define JackPlatformAdapter JackIoAudioAdapter
+#endif
+
 #if defined(__sun__) || defined(sun)
 #include "JackOSSAdapter.h"
 #define JackPlatformAdapter JackOSSAdapter

common/wscript

@@ -414,6 +414,11 @@ def build(bld):
          process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
          process.use = ['ALSA', 'SAMPLERATE']
 
+    if bld.env['BUILD_ADAPTER'] and bld.env['IS_QNX']:
+         audio_adapter_sources += ['../qnx/ioaudio/JackIoAudioAdapter.cpp']
+         process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
+         process.use = ['IOAUDIO', 'SAMPLERATE']
+
     if bld.env['BUILD_ADAPTER'] and bld.env['IS_SUN']:
          audio_adapter_sources += ['../solaris/oss/JackOSSAdapter.cpp', 'memops.c']
          process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)

qnx/ioaudio/JackIoAudioAdapter.h

@@ -0,0 +1,295 @@
+/*
+ Copyright (C) 2008 Grame
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ */
+
+#ifndef __JackIoAudioAdapter__
+#define __JackIoAudioAdapter__
+
+#include <cmath>
+#include <climits>
+#include <cassert>
+#include <sys/asoundlib.h>
+#include "JackAudioAdapterInterface.h"
+#include "JackPlatformPlug.h"
+#include "JackError.h"
+#include "jack.h"
+#include "jslist.h"
+
+namespace Jack
+    {
+
+#define max(x,y) (((x)>(y)) ? (x) : (y))
+#define min(x,y) (((x)<(y)) ? (x) : (y))
+#define NUM_BUFFERS 256
+
+    /**
+     * A convenient class to pass parameters to AudioInterface
+     */
+    class AudioParam
+        {
+    public:
+        const char* fInputCardName;
+        const char* fOutputCardName;
+        unsigned int fFrequency;
+        int fBuffering;
+
+        unsigned int fCardInputVoices;
+        unsigned int fCardOutputVoices;
+
+        unsigned int fPeriod;
+
+    public:
+        AudioParam(
+                jack_nframes_t buffer_size = 512,
+                jack_nframes_t sample_rate = 44100,
+                const char* input_card = "pcmPreferredc",
+                int input_ports = 2,
+                const char* output_card = "pcmPreferredp",
+                int output_ports = 2,
+                int periods = 2) :
+                        fInputCardName(input_card),
+                        fOutputCardName(output_card),
+                        fFrequency(sample_rate),
+                        fBuffering(buffer_size),
+                        fCardInputVoices(input_ports),
+                        fCardOutputVoices(output_ports),
+                        fPeriod(periods)
+            {
+            }
+
+        AudioParam& inputCardName(const char* n)
+            {
+            fInputCardName = n;
+            return *this;
+            }
+
+        AudioParam& outputCardName(const char* n)
+            {
+            fOutputCardName = n;
+            return *this;
+            }
+
+        AudioParam& frequency(int f)
+            {
+            fFrequency = f;
+            return *this;
+            }
+
+        AudioParam& buffering(int fpb)
+            {
+            fBuffering = fpb;
+            return *this;
+            }
+
+        void setInputs(int inputs)
+            {
+            fCardInputVoices = inputs;
+            }
+
+        AudioParam& inputs(int n)
+            {
+            fCardInputVoices = n;
+            return *this;
+            }
+
+        void setOutputs(int outputs)
+            {
+            fCardOutputVoices = outputs;
+            }
+
+        AudioParam& outputs(int n)
+            {
+            fCardOutputVoices = n;
+            return *this;
+            }
+        };
+
+    /**
+     * An ALSA audio interface
+     */
+    class AudioInterface
+        {
+    public:
+        AudioParam fParams;
+
+        //device info
+        snd_pcm_t* fOutputDevice;
+        snd_pcm_t* fInputDevice;
+        snd_pcm_channel_params_t *fInputParams;
+        snd_pcm_channel_params_t *fOutputParams;
+        snd_pcm_channel_setup_t *fInputSetup;
+        snd_pcm_channel_setup_t *fOutputSetup;
+
+        //samples info
+        snd_pcm_format_t fInputFormat;
+        snd_pcm_format_t fOutputFormat;
+//            uint32_t fSampleAccess;
+
+//channels
+//        const char* fCaptureName;
+//        const char* fPlaybackName;
+
+        unsigned int fNumInputPorts;
+        unsigned int fNumOutputPorts;
+
+        //Number of frames for one voice/port
+        jack_nframes_t fInputBufferFrames;
+        jack_nframes_t fOutputBufferFrames;
+
+//interleaved mode audiocard buffers
+        void* fInputCardBuffer;
+        void* fOutputCardBuffer;
+
+//            //non-interleaved mode audiocard buffers
+//            void* fCardInputBuffers[NUM_BUFFERS];
+//            void* fCardOutputBuffers[NUM_BUFFERS];
+//
+//            //non-interleaved mod, floating point software buffers
+//            jack_default_audio_sample_t* fJackInputBuffers[NUM_BUFFERS];
+//            jack_default_audio_sample_t* fJackOutputBuffers[NUM_BUFFERS];
+
+        //non-interleaved mod, floating point software buffers
+        jack_default_audio_sample_t** fJackInputBuffers;
+        jack_default_audio_sample_t** fJackOutputBuffers;
+
+        //public methods ---------------------------------------------------------
+
+//        const char* cardName()
+//            {
+//            return fInputCardName;
+//            }
+//
+//        int frequency()
+//            {
+//            return fFrequency;
+//            }
+//
+//        int buffering()
+//            {
+//            return fBuffering;
+//            }
+
+//        jack_default_audio_sample_t** inputSoftChannels()
+//            {
+//            return fJackInputBuffers;
+//            }
+//
+//        jack_default_audio_sample_t** outputSoftChannels()
+//            {
+//            return fJackOutputBuffers;
+//            }
+
+        AudioInterface(const AudioParam& ap = AudioParam());
+
+        AudioInterface(jack_nframes_t buffer_size, jack_nframes_t sample_rate);
+
+        ~AudioInterface();
+
+        /**
+         * Open the audio interface
+         */
+        int open();
+
+        int close();
+
+        int setAudioParams(snd_pcm_t* stream, snd_pcm_channel_params_t* params);
+
+        ssize_t interleavedBufferSize(snd_pcm_channel_params_t* params);
+
+        ssize_t noninterleavedBufferSize(snd_pcm_channel_params_t* params);
+
+        /**
+         * Read audio samples from the audio card. Convert samples to floats and take
+         * care of interleaved buffers
+         */
+        int read();
+
+        /**
+         * write the output soft channels to the audio card. Convert sample
+         * format and interleaves buffers when needed
+         */
+        int write();
+
+        /**
+         *  print short information on the audio device
+         */
+        int shortinfo();
+
+        /**
+         *  print more detailled information on the audio device
+         */
+        int longinfo();
+
+        void printCardInfo(snd_ctl_hw_info_t* ci);
+
+        void printHWParams(snd_pcm_channel_params_t* params);
+
+    private:
+        int AudioInterface_common();
+        };
+
+    /*!
+     \brief Audio adapter using io-audio API.
+     */
+
+    class JackIoAudioAdapter: public JackAudioAdapterInterface,
+            public JackRunnableInterface
+        {
+
+    private:
+        JackThread fThread;
+        AudioInterface fAudioInterface;
+
+    public:
+        JackIoAudioAdapter(
+                jack_nframes_t buffer_size,
+                jack_nframes_t sample_rate,
+                const JSList* params);
+        ~JackIoAudioAdapter()
+            {
+            }
+
+        virtual int Open();
+        virtual int Close();
+
+        virtual void Create();
+        virtual void Destroy();
+
+        virtual int SetSampleRate(jack_nframes_t sample_rate);
+        virtual int SetBufferSize(jack_nframes_t buffer_size);
+
+        virtual bool Init();
+        virtual bool Execute();
+
+        };
+
+    }
+
+#ifdef __cplusplus
+extern "C"
+    {
+#endif
+#include "JackCompilerDeps.h"
+#include "driver_interface.h"
+    SERVER_EXPORT jack_driver_desc_t* jack_get_descriptor();
+
+#ifdef __cplusplus
+    }
+#endif
+
+#endif

tests/qnx/TestIoAudioAdapter.cpp

@@ -0,0 +1,56 @@
+#include <gtest/gtest.h>
+#include "JackIoAudioAdapter.h"
+
+namespace Jack
+{
+    class TestIoAudioAdapter: public ::testing::Test
+    {
+    public:
+        TestIoAudioAdapter()
+        {
+
+        }
+
+    };
+
+    TEST_F( TestIoAudioAdapter, Open_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioAdapter, Close_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioAdapter, Create_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioAdapter, Destroy_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioAdapter, SetSampleRate_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioAdapter, SetBufferSize_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioAdapter, Init_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioAdapter, Execute_Success )
+    {
+
+    }
+
+}

tests/qnx/TestIoAudioInterface.cpp

@@ -0,0 +1,44 @@
+#include <gtest/gtest.h>
+#include "JackIoAudioAdapter.h"
+
+namespace Jack
+{
+    class TestIoAudioInterface: public ::testing::Test
+    {
+    public:
+        TestIoAudioInterface()
+        {
+
+        }
+    };
+
+    TEST_F( TestIoAudioInterface, Open_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioInterface, Close_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioInterface, Read_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioInterface, Write_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioInterface, ShortInfo_Success )
+    {
+
+    }
+
+    TEST_F( TestIoAudioInterface, LongInfo_Success )
+    {
+
+    }
+}