FCL/sf/mw/qt: comparison src/multimedia/audio/qaudioinput_alsa

equal deleted inserted replaced

-:41300fa6a67c
+:2f34d5167611
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtMultimedia module of the Qt Toolkit.
 **
 if(device) {
 //set to pull mode
 pullMode = true;
 audioSource = device;
+deviceState = QAudio::ActiveState;
 } else {
 //set to push mode
 pullMode = false;
+deviceState = QAudio::IdleState;
 audioSource = new InputPrivate(this);
 audioSource->open(QIODevice::ReadOnly | QIODevice::Unbuffered);
 }
 if( !open() )
 // Step 6: Start audio processing
 chunks = buffer_size/period_size;
 timer->start(period_time*chunks/2000);
 errorState  = QAudio::NoError;
-deviceState = QAudio::ActiveState;
 totalTimeValue = 0;
 return true;
 }
 int QAudioInputPrivate::bytesReady() const
 {
 if(resuming)
 return period_size;
-if(deviceState != QAudio::ActiveState)
+if(deviceState != QAudio::ActiveState && deviceState != QAudio::IdleState)
 return 0;
 int frames = snd_pcm_avail_update(handle);
 if((int)frames > (int)buffer_frames)
 frames = buffer_frames;
 return snd_pcm_frames_to_bytes(handle, frames);
 }
 qint64 QAudioInputPrivate::read(char* data, qint64 len)
 {
-Q_UNUSED(data)
 Q_UNUSED(len)
 // Read in some audio data and write it to QIODevice, pull mode
 if ( !handle )
 return 0;
 bytesAvailable = bytesReady();
 frames = buffer_frames;
 int readFrames = snd_pcm_readi(handle, audioBuffer, frames);
 if (readFrames >= 0) {
 err = snd_pcm_frames_to_bytes(handle, readFrames);
 #ifdef DEBUG_AUDIO
-qDebug()<<QString::fromLatin1("PULL: read in bytes = %1 (frames=%2)").arg(err).arg(readFrames).toLatin1().constData();
+qDebug()<<QString::fromLatin1("read in bytes = %1 (frames=%2)").arg(err).arg(readFrames).toLatin1().constData();
 #endif
 break;
 } else if((readFrames == -EAGAIN) || (readFrames == -EINTR)) {
 errorState = QAudio::IOError;
 err = 0;
 count++;
 }
 if(err > 0) {
 // got some send it onward
 #ifdef DEBUG_AUDIO
-qDebug()<<"PULL: frames to write to QIODevice = "<<
+qDebug()<<"frames to write to QIODevice = "<<
 snd_pcm_bytes_to_frames( handle, (int)err )<<" ("<<err<<") bytes";
 #endif
-if(deviceState != QAudio::ActiveState)
+if(deviceState != QAudio::ActiveState && deviceState != QAudio::IdleState)
 return 0;
+if (pullMode) {
 qint64 l = audioSource->write(audioBuffer,err);
 if(l < 0) {
 close();
 errorState = QAudio::IOError;
 deviceState = QAudio::StoppedState;
 emit stateChanged(deviceState);
 } else if(l == 0) {
-errorState = QAudio::NoError;
+if (deviceState != QAudio::IdleState) {
-deviceState = QAudio::IdleState;
+errorState = QAudio::NoError;
+deviceState = QAudio::IdleState;
+emit stateChanged(deviceState);
+}
+} else {
+totalTimeValue += err;
+resuming = false;
+if (deviceState != QAudio::ActiveState) {
+errorState = QAudio::NoError;
+deviceState = QAudio::ActiveState;
+emit stateChanged(deviceState);
+}
+}
+return l;
 } else {
-totalTimeValue += snd_pcm_bytes_to_frames(handle, err)*1000000/settings.frequency();
+memcpy(data,audioBuffer,err);
+totalTimeValue += err;
 resuming = false;
-errorState = QAudio::NoError;
+if (deviceState != QAudio::ActiveState) {
-deviceState = QAudio::ActiveState;
+errorState = QAudio::NoError;
-}
+deviceState = QAudio::ActiveState;
-return l;
+emit stateChanged(deviceState);
+}
+return err;
+}
 }
 return 0;
 }
 void QAudioInputPrivate::resume()
 bytesAvailable = buffer_size;
 }
 resuming = true;
 deviceState = QAudio::ActiveState;
 int chunks = buffer_size/period_size;
-timer->start(buffer_time*chunks/2000);
+timer->start(period_time*chunks/2000);
 emit stateChanged(deviceState);
 }
 }
 void QAudioInputPrivate::setBufferSize(int value)
 return intervalTime;
 }
 qint64 QAudioInputPrivate::processedUSecs() const
 {
-return totalTimeValue;
+return qint64(1000000) * totalTimeValue / settings.frequency();
 }
 void QAudioInputPrivate::suspend()
 {
 if(deviceState == QAudio::ActiveState||resuming) {
 return true;
 }
 qint64 QAudioInputPrivate::elapsedUSecs() const
 {
-if(!handle)
-return 0;
 if (deviceState == QAudio::StoppedState)
 return 0;
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-snd_pcm_status_t* status;
-snd_pcm_status_alloca(&status);
-snd_timestamp_t t1,t2;
-if( snd_pcm_status(handle, status) >= 0) {
-snd_pcm_status_get_tstamp(status,&t1);
-snd_pcm_status_get_trigger_tstamp(status,&t2);
-t1.tv_sec-=t2.tv_sec;
-signed long l = (signed long)t1.tv_usec - (signed long)t2.tv_usec;
-if(l < 0) {
-t1.tv_sec--;
-l = -l;
-l %= 1000000;
-}
-return ((t1.tv_sec * 1000000)+l);
-} else
-return 0;
-#else
 return clockStamp.elapsed()*1000;
-#endif
 }
 void QAudioInputPrivate::reset()
 {
 if(handle)
 {
 }
 qint64 InputPrivate::readData( char* data, qint64 len)
 {
-// push mode, user read() called
+return audioDevice->read(data,len);
-if((audioDevice->state() != QAudio::ActiveState) && !audioDevice->resuming)
-return 0;
-int readFrames;
-int count=0, err = 0;
-while(count < 5) {
-int frames = snd_pcm_bytes_to_frames(audioDevice->handle, len);
-readFrames = snd_pcm_readi(audioDevice->handle, data, frames);
-if (readFrames >= 0) {
-err = snd_pcm_frames_to_bytes(audioDevice->handle, readFrames);
-#ifdef DEBUG_AUDIO
-qDebug()<<QString::fromLatin1("PUSH: read in bytes = %1 (frames=%2)").arg(err).arg(readFrames).toLatin1().constData();
-#endif
-break;
-} else if((readFrames == -EAGAIN) || (readFrames == -EINTR)) {
-audioDevice->errorState = QAudio::IOError;
-err = 0;
-break;
-} else {
-if(readFrames == -EPIPE) {
-audioDevice->errorState = QAudio::UnderrunError;
-err = snd_pcm_prepare(audioDevice->handle);
-} else if(readFrames == -ESTRPIPE) {
-err = snd_pcm_prepare(audioDevice->handle);
-}
-if(err != 0) break;
-}
-count++;
-}
-if(err > 0 && readFrames > 0) {
-audioDevice->totalTimeValue += readFrames*1000/audioDevice->settings.frequency()*1000;
-audioDevice->deviceState = QAudio::ActiveState;
-return err;
-}
-return 0;
 }
 qint64 InputPrivate::writeData(const char* data, qint64 len)
 {
 Q_UNUSED(data)

changeset 18	2f34d5167611
parent 3	41300fa6a67c
child 19	fcece45ef507