update ALSA backend: separate playback/capture periods

fixed: 2 for capture,  configurable 2,3 for playback.

diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc
index 8a25f548d73f1df8d29d15506a202ab0f378f5e7..be44139325065b3abdff3fe9b6396634ed9958b6 100644 (file)
--- a/libs/backends/alsa/alsa_audiobackend.cc
+++ b/libs/backends/alsa/alsa_audiobackend.cc
@@ -875,7 +875,10 @@ AlsaAudioBackend::_start (bool for_latency_measurement)
        _pcmi = new Alsa_pcmi (
                        (duplex & 2) ? alsa_device.c_str() : NULL,
                        (duplex & 1) ? alsa_device.c_str() : NULL,
-                       0, _samplerate, _samples_per_period, _periods_per_cycle, 0);
+                       /* ctrl name */ 0,
+                       _samplerate, _samples_per_period,
+                       _periods_per_cycle, /* _periods_per_cycle */ 2,
+                       /* debug */ 0);
 
        AudioBackend::ErrorCode error_code = NoError;
        switch (_pcmi->state()) {

diff --git a/libs/backends/alsa/zita-alsa-pcmi.cc b/libs/backends/alsa/zita-alsa-pcmi.cc
index d3be95e0e4db4791f90f846154754df497cb8cec..c5480fd8f9c2f6683c08b88ecebae6595b51b1fa 100644 (file)
--- a/libs/backends/alsa/zita-alsa-pcmi.cc
+++ b/libs/backends/alsa/zita-alsa-pcmi.cc
@@ -44,11 +44,13 @@ Alsa_pcmi::Alsa_pcmi (
                const char        *ctrl_name,
                unsigned int       fsamp,
                unsigned int       fsize,
-               unsigned int       nfrag,
+               unsigned int       play_nfrag,
+               unsigned int       capt_nfrag,
                unsigned int       debug)
        : _fsamp (fsamp)
        , _fsize (fsize)
-       , _nfrag (nfrag)
+       , _play_nfrag (play_nfrag)
+       , _capt_nfrag (capt_nfrag)
        , _debug (debug)
        , _state (-1)
        , _play_handle (0)
@@ -95,12 +97,12 @@ int Alsa_pcmi::pcm_start (void)
        if (_play_handle)
        {
                n = snd_pcm_avail_update (_play_handle);
-               if (n != _fsize * _nfrag)
+               if (n != _fsize * _play_nfrag)
                {
                        if (_debug & DEBUG_STAT) fprintf  (stderr, "Alsa_pcmi: full buffer not available at start.\n");
                        return -1;
                }
-               for (i = 0; i < _nfrag; i++)
+               for (i = 0; i < _play_nfrag; i++)
                {
                        play_init (_fsize);
                        for (j = 0; j < _play_nchan; j++) clear_chan (j, _fsize);
@@ -353,7 +355,7 @@ void Alsa_pcmi::printinfo (void)
                fprintf (stdout, "\n  nchan  : %d\n", _play_nchan);
                fprintf (stdout, "  fsamp  : %d\n", _fsamp);
                fprintf (stdout, "  fsize  : %ld\n", _fsize);
-               fprintf (stdout, "  nfrag  : %d\n", _nfrag);
+               fprintf (stdout, "  nfrag  : %d\n", _play_nfrag);
                fprintf (stdout, "  format : %s\n", snd_pcm_format_name (_play_format));
        }
        else fprintf (stdout, " not enabled\n");
@@ -363,7 +365,7 @@ void Alsa_pcmi::printinfo (void)
                fprintf (stdout, "\n  nchan  : %d\n", _capt_nchan);
                fprintf (stdout, "  fsamp  : %d\n", _fsamp);
                fprintf (stdout, "  fsize  : %ld\n", _fsize);
-               fprintf (stdout, "  nfrag  : %d\n", _nfrag);
+               fprintf (stdout, "  nfrag  : %d\n", _capt_nfrag);
                fprintf (stdout, "  format : %s\n", snd_pcm_format_name (_capt_format));
                if (_play_handle) fprintf (stdout, "%s\n", _synced ? "synced" : "not synced");
        }
@@ -436,7 +438,7 @@ void Alsa_pcmi::initialise (const char *play_name, const char *capt_name, const
                        if (_debug & DEBUG_INIT) fprintf (stderr, "Alsa_pcmi: can't allocate playback sw params\n");
                        return;
                }
-               if (set_hwpar (_play_handle, _play_hwpar, "playback", &_play_nchan) < 0) return;
+               if (set_hwpar (_play_handle, _play_hwpar, "playback", _play_nfrag, &_play_nchan) < 0) return;
                if (set_swpar (_play_handle, _play_swpar, "playback") < 0) return;
        }
 
@@ -452,7 +454,7 @@ void Alsa_pcmi::initialise (const char *play_name, const char *capt_name, const
                        if (_debug & DEBUG_INIT) fprintf (stderr, "Alsa_pcmi: can't allocate capture sw params\n");
                        return;
                }
-               if (set_hwpar (_capt_handle, _capt_hwpar, "capture", &_capt_nchan) < 0) return;
+               if (set_hwpar (_capt_handle, _capt_hwpar, "capture", _capt_nfrag, &_capt_nchan) < 0) return;
                if (set_swpar (_capt_handle, _capt_swpar, "capture") < 0) return;
        }
 
@@ -470,7 +472,7 @@ void Alsa_pcmi::initialise (const char *play_name, const char *capt_name, const
                        _state = -4;
                        return;
                }
-               if (snd_pcm_hw_params_get_periods (_play_hwpar, &nfrag, &dir) || (nfrag != _nfrag) || dir)
+               if (snd_pcm_hw_params_get_periods (_play_hwpar, &nfrag, &dir) || (nfrag != _play_nfrag) || dir)
                {
                        if (_debug & DEBUG_INIT) fprintf (stderr, "Alsa_pcmi: can't get requested number of periods for playback.\n");
                        _state = -5;
@@ -582,7 +584,7 @@ void Alsa_pcmi::initialise (const char *play_name, const char *capt_name, const
                        _state = -4;
                        return;
                }
-               if (snd_pcm_hw_params_get_periods (_capt_hwpar, &nfrag, &dir) || (nfrag != _nfrag) || dir)
+               if (snd_pcm_hw_params_get_periods (_capt_hwpar, &nfrag, &dir) || (nfrag != _capt_nfrag) || dir)
                {
                        if (_debug & DEBUG_INIT) fprintf (stderr, "Alsa_pcmi: can't get requested number of periods for capture.\n");
                        _state = -5;
@@ -679,7 +681,7 @@ void Alsa_pcmi::initialise (const char *play_name, const char *capt_name, const
 }
 
 
-int Alsa_pcmi::set_hwpar (snd_pcm_t *handle,  snd_pcm_hw_params_t *hwpar, const char *sname, unsigned int *nchan)
+int Alsa_pcmi::set_hwpar (snd_pcm_t *handle,  snd_pcm_hw_params_t *hwpar, const char *sname, unsigned int nfrag, unsigned int *nchan)
 {
        bool err;
 
@@ -760,16 +762,16 @@ int Alsa_pcmi::set_hwpar (snd_pcm_t *handle,  snd_pcm_hw_params_t *hwpar, const
                                sname, _fsize);
                return -4;
        }
-       if (snd_pcm_hw_params_set_periods (handle, hwpar, _nfrag, 0) < 0)
+       if (snd_pcm_hw_params_set_periods (handle, hwpar, nfrag, 0) < 0)
        {
                if (_debug & DEBUG_INIT) fprintf (stderr, "Alsa_pcmi: can't set %s periods to %u.\n",
-                               sname, _nfrag);
+                               sname, nfrag);
                return -5;
        }
-       if (snd_pcm_hw_params_set_buffer_size (handle, hwpar, _fsize * _nfrag) < 0)
+       if (snd_pcm_hw_params_set_buffer_size (handle, hwpar, _fsize * nfrag) < 0)
        {
                if (_debug & DEBUG_INIT) fprintf (stderr, "Alsa_pcmi: can't set %s buffer length to %lu.\n",
-                               sname, _fsize * _nfrag);
+                               sname, _fsize * nfrag);
                return -4;
        }
        if (snd_pcm_hw_params (handle, hwpar) < 0)

diff --git a/libs/backends/alsa/zita-alsa-pcmi.h b/libs/backends/alsa/zita-alsa-pcmi.h
index 5f7377db5cdfc8202a519e01edec2c192e74e9ee..27af0223eb35ccffec87603306d1e06e62f5ff07 100644 (file)
--- a/libs/backends/alsa/zita-alsa-pcmi.h
+++ b/libs/backends/alsa/zita-alsa-pcmi.h
@@ -46,7 +46,8 @@ public:
                        const char   *ctrl_name,
                        unsigned int  rate,
                        unsigned int  frsize,
-                       unsigned int  nfrags,
+                       unsigned int  play_nfrags,
+                       unsigned int  capt_nfrags,
                        unsigned int  debug = 0);
 
        ~Alsa_pcmi (void);
@@ -108,7 +109,8 @@ public:
        int      state (void) const { return _state; }
        size_t   fsize (void) const { return _fsize; }
        uint32_t fsamp (void) const { return _fsamp; }
-       uint32_t nfrag (void) const { return _nfrag; }
+       uint32_t play_nfrag (void) const { return _play_nfrag; }
+       uint32_t capt_nfrag (void) const { return _capt_nfrag; }
        uint32_t nplay (void) const { return _play_nchan; }
        uint32_t ncapt (void) const { return _capt_nchan; }
        snd_pcm_t *play_handle (void) const { return _play_handle; }
@@ -124,7 +126,7 @@ private:
        enum { MAXPFD = 16, MAXCHAN = 64 };
 
        void initialise (const char *play_name, const char *capt_name, const char *ctrl_name);
-       int set_hwpar (snd_pcm_t *handle, snd_pcm_hw_params_t *hwpar, const char *sname, unsigned int *nchan);
+       int set_hwpar (snd_pcm_t *handle, snd_pcm_hw_params_t *hwpar, const char *sname, unsigned int nfrag, unsigned int *nchan);
        int set_swpar (snd_pcm_t *handle, snd_pcm_sw_params_t *swpar, const char *sname);
        int recover (void);
        float xruncheck (snd_pcm_status_t *stat);
@@ -151,7 +153,8 @@ private:
 
        unsigned int           _fsamp;
        snd_pcm_uframes_t      _fsize;
-       unsigned int           _nfrag;
+       unsigned int           _play_nfrag;
+       unsigned int           _capt_nfrag;
        unsigned int           _debug;
        int                    _state;
        snd_pcm_t             *_play_handle;