slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Purged ALSA implementation

Browse Source 
Avoided potential memory leak and null pointer access, removed unused
variables, reduced redundant code, etc.

Change-Id: Ia0ddf56a7a1a0f142f2edb070c2c0b32cbf76ce7
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This commit is contained in:
Bernd Weimer
2013-05-27 12:58:59 +02:00
committed by The Qt Project
parent 9785766067
commit 1410fda0ff
2 changed files with 73 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
View File

@@ -197,23 +197,22 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const
{ {
// Set nearest to closest settings that do work. // Set nearest to closest settings that do work.
// See if what is in settings will work (return value). // See if what is in settings will work (return value).
int err = 0; int err = -1;
snd_pcm_t* handle; snd_pcm_t* pcmHandle;
snd_pcm_hw_params_t *params; snd_pcm_hw_params_t *params;
QString dev = device; QString dev;
QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
if(dev.compare(QLatin1String("default")) == 0) {
#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
dev = QLatin1String(devices.first().constData());
#else
dev = QLatin1String("hw:0,0");
#endif
} else {
#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) #if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
dev = device; dev = device;
if (dev.compare(QLatin1String("default")) == 0) {
QList<QByteArray> devices = availableDevices(QAudio::AudioOutput);
if (!devices.isEmpty())
dev = QLatin1String(devices.first().constData());
}
#else #else
if (dev.compare(QLatin1String("default")) == 0) {
dev = QLatin1String("hw:0,0");
} else {
int idx = 0; int idx = 0;
char *name; char *name;
@@ -225,156 +224,81 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const
idx++; idx++;
} }
dev = QString(QLatin1String("hw:%1,0")).arg(idx); dev = QString(QLatin1String("hw:%1,0")).arg(idx);
}
#endif #endif
}
if(mode == QAudio::AudioOutput) { snd_pcm_stream_t stream = mode == QAudio::AudioOutput
err=snd_pcm_open( &handle,dev.toLocal8Bit().constData(),SND_PCM_STREAM_PLAYBACK,0); ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE;
} else {
err=snd_pcm_open( &handle,dev.toLocal8Bit().constData(),SND_PCM_STREAM_CAPTURE,0); if (snd_pcm_open(&pcmHandle, dev.toLocal8Bit().constData(), stream, 0) < 0)
}
if(err < 0) {
handle = 0;
return false; return false;
}
bool testChannel = false; snd_pcm_nonblock(pcmHandle, 0);
bool testCodec = false;
bool testSampleRate = false;
bool testType = false;
bool testSize = false;
int dir = 0;
snd_pcm_nonblock( handle, 0 );
snd_pcm_hw_params_alloca(&params); snd_pcm_hw_params_alloca(&params);
snd_pcm_hw_params_any( handle, params ); snd_pcm_hw_params_any(pcmHandle, params);
// set the values! // set the values!
snd_pcm_hw_params_set_channels(handle,params,format.channelCount()); snd_pcm_hw_params_set_channels(pcmHandle, params, format.channelCount());
snd_pcm_hw_params_set_rate(handle,params,format.sampleRate(),dir); snd_pcm_hw_params_set_rate(pcmHandle, params, format.sampleRate(), 0);
err = -1;
snd_pcm_format_t pcmFormat = SND_PCM_FORMAT_UNKNOWN;
switch (format.sampleSize()) { switch (format.sampleSize()) {
case 8: case 8:
if (format.sampleType() == QAudioFormat::SignedInt) if (format.sampleType() == QAudioFormat::SignedInt)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_S8); pcmFormat = SND_PCM_FORMAT_S8;
else if (format.sampleType() == QAudioFormat::UnSignedInt) else if (format.sampleType() == QAudioFormat::UnSignedInt)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_U8); pcmFormat = SND_PCM_FORMAT_U8;
break; break;
case 16: case 16:
if (format.sampleType() == QAudioFormat::SignedInt) { if (format.sampleType() == QAudioFormat::SignedInt) {
if(format.byteOrder() == QAudioFormat::LittleEndian) pcmFormat = format.byteOrder() == QAudioFormat::LittleEndian
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_S16_LE); ? SND_PCM_FORMAT_S16_LE : SND_PCM_FORMAT_S16_BE;
else if(format.byteOrder() == QAudioFormat::BigEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_S16_BE);
} else if (format.sampleType() == QAudioFormat::UnSignedInt) { } else if (format.sampleType() == QAudioFormat::UnSignedInt) {
if(format.byteOrder() == QAudioFormat::LittleEndian) pcmFormat = format.byteOrder() == QAudioFormat::LittleEndian
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_U16_LE); ? SND_PCM_FORMAT_U16_LE : SND_PCM_FORMAT_U16_BE;
else if(format.byteOrder() == QAudioFormat::BigEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_U16_BE);
} }
break; break;
case 32: case 32:
if (format.sampleType() == QAudioFormat::SignedInt) { if (format.sampleType() == QAudioFormat::SignedInt) {
if(format.byteOrder() == QAudioFormat::LittleEndian) pcmFormat = format.byteOrder() == QAudioFormat::LittleEndian
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_S32_LE); ? SND_PCM_FORMAT_S32_LE : SND_PCM_FORMAT_S32_BE;
else if(format.byteOrder() == QAudioFormat::BigEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_S32_BE);
} else if (format.sampleType() == QAudioFormat::UnSignedInt) { } else if (format.sampleType() == QAudioFormat::UnSignedInt) {
if(format.byteOrder() == QAudioFormat::LittleEndian) pcmFormat = format.byteOrder() == QAudioFormat::LittleEndian
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_U32_LE); ? SND_PCM_FORMAT_U32_LE : SND_PCM_FORMAT_U32_BE;
else if(format.byteOrder() == QAudioFormat::BigEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_U32_BE);
} else if (format.sampleType() == QAudioFormat::Float) { } else if (format.sampleType() == QAudioFormat::Float) {
if (format.byteOrder() == QAudioFormat::LittleEndian) pcmFormat = format.byteOrder() == QAudioFormat::LittleEndian
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_FLOAT_LE); ? SND_PCM_FORMAT_FLOAT_LE : SND_PCM_FORMAT_FLOAT_BE;
else if (format.byteOrder() == QAudioFormat::BigEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_FLOAT_BE);
} }
} }
if (pcmFormat != SND_PCM_FORMAT_UNKNOWN)
err = snd_pcm_hw_params_set_format(pcmHandle, params, pcmFormat);
// For now, just accept only audio/pcm codec // For now, just accept only audio/pcm codec
if(!format.codec().startsWith(QLatin1String("audio/pcm"))) { if (!format.codec().startsWith(QLatin1String("audio/pcm")))
err = -1; err = -1;
} else
testCodec = true;
if (err >= 0 && format.channelCount() != -1) { if (err >= 0 && format.channelCount() != -1) {
err = snd_pcm_hw_params_test_channels(handle,params,format.channelCount()); err = snd_pcm_hw_params_test_channels(pcmHandle, params, format.channelCount());
if (err >= 0) if (err >= 0)
err = snd_pcm_hw_params_set_channels(handle,params,format.channelCount()); err = snd_pcm_hw_params_set_channels(pcmHandle, params, format.channelCount());
if(err>=0)
testChannel = true;
} }
if (err >= 0 && format.sampleRate() != -1) { if (err >= 0 && format.sampleRate() != -1) {
err = snd_pcm_hw_params_test_rate(handle,params,format.sampleRate(),0); err = snd_pcm_hw_params_test_rate(pcmHandle, params, format.sampleRate(), 0);
if (err >= 0) if (err >= 0)
err = snd_pcm_hw_params_set_rate(handle,params,format.sampleRate(),dir); err = snd_pcm_hw_params_set_rate(pcmHandle, params, format.sampleRate(), 0);
if(err>=0)
testSampleRate = true;
} }
if((err>=0 && format.sampleSize() != -1) && if (err >= 0 && pcmFormat != SND_PCM_FORMAT_UNKNOWN)
(format.sampleType() != QAudioFormat::Unknown)) { err = snd_pcm_hw_params_set_format(pcmHandle, params, pcmFormat);
switch(format.sampleSize()) {
case 8:
if(format.sampleType() == QAudioFormat::SignedInt)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_S8);
else if(format.sampleType() == QAudioFormat::UnSignedInt)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_U8);
break;
case 16:
if(format.sampleType() == QAudioFormat::SignedInt) {
if(format.byteOrder() == QAudioFormat::LittleEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_S16_LE);
else if(format.byteOrder() == QAudioFormat::BigEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_S16_BE);
} else if(format.sampleType() == QAudioFormat::UnSignedInt) {
if(format.byteOrder() == QAudioFormat::LittleEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_U16_LE);
else if(format.byteOrder() == QAudioFormat::BigEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_U16_BE);
}
break;
case 32:
if(format.sampleType() == QAudioFormat::SignedInt) {
if(format.byteOrder() == QAudioFormat::LittleEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_S32_LE);
else if(format.byteOrder() == QAudioFormat::BigEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_S32_BE);
} else if(format.sampleType() == QAudioFormat::UnSignedInt) {
if(format.byteOrder() == QAudioFormat::LittleEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_U32_LE);
else if(format.byteOrder() == QAudioFormat::BigEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_U32_BE);
} else if (format.sampleType() == QAudioFormat::Float) {
if (format.byteOrder() == QAudioFormat::LittleEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_FLOAT_LE);
else if (format.byteOrder() == QAudioFormat::BigEndian)
err = snd_pcm_hw_params_set_format(handle,params,SND_PCM_FORMAT_FLOAT_BE);
}
}
if(err>=0) {
testSize = true;
testType = true;
}
}
if (err >= 0) if (err >= 0)
err = snd_pcm_hw_params(handle, params); err = snd_pcm_hw_params(pcmHandle, params);
if(err == 0) { snd_pcm_close(pcmHandle);
// settings work
// close()
if(handle)
snd_pcm_close(handle);
return true;
}
if(handle)
snd_pcm_close(handle);
return false; return (err == 0);
} }
void QAudioDeviceInfoInternal::updateLists() void QAudioDeviceInfoInternal::updateLists()
@@ -451,12 +375,10 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
devices.append(deviceName.toLocal8Bit().constData()); devices.append(deviceName.toLocal8Bit().constData());
} }
free(name);
if (descr != NULL)
free(descr); free(descr);
if (io != NULL)
free(io); free(io);
} }
free(name);
++n; ++n;
} }
snd_device_name_free_hint(hints); snd_device_name_free_hint(hints);

2
src/multimedia/audio/qaudiooutput_alsa_p.cpp
View File

@@ -125,7 +125,7 @@ void QAudioOutputPrivate::async_callback(snd_async_handler_t *ahandler)
audioOut = static_cast<QAudioOutputPrivate*> audioOut = static_cast<QAudioOutputPrivate*>
(snd_async_handler_get_callback_private(ahandler)); (snd_async_handler_get_callback_private(ahandler));
if((audioOut->deviceState==QAudio::ActiveState)||(audioOut->resuming)) if (audioOut && (audioOut->deviceState == QAudio::ActiveState || audioOut->resuming))
audioOut->feedback(); audioOut->feedback();
} }