* class CAudioInput inherited by CAudioIO
*/
CAudioInput::CAudioInput(CAudioInfo& info) :
- CAudioIO(info),
- __mIsUsedSyncRead(true),
- __mIsInit(false),
- __mVolume(CAudioInfo::DEFAULT_RECORD_VOLUME) {
+ CAudioIO(info) {
mDirection = CAudioInfo::EAudioDirection::AUDIO_DIRECTION_IN;
}
//LCOV_EXCL_STOP
}
+ CAudioIO::setState(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
}
}
void CAudioInput::prepare() {
+ CAudioTimedLocker locker(__func__, mMutex);
+
if (!__IsInit())
THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); //LCOV_EXCL_LINE
CPulseStreamSpec spec(streamSpec, mAudioInfo);
- std::unique_lock<std::mutex> mutex(mMutex);
mpPulseAudioClient = new CPulseAudioClient(CPulseAudioClient::EStreamDirection::STREAM_DIRECTION_RECORD, spec, this);
mpPulseAudioClient->initialize();
mpPulseAudioClient->applyRecordVolume(__mVolume);
/* Uncork stream which is created with CORKED flag */
mpPulseAudioClient->cork(false);
#endif
- mutex.unlock();
-
CAudioIO::prepare();
} catch (const CAudioError& e) {
//LCOV_EXCL_START
}
void CAudioInput::unprepare() {
+ CAudioTimedLocker locker(__func__, mMutex);
+
if (!__IsInit())
THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, //LCOV_EXCL_LINE
"Did not initialize CAudioInput"); //LCOV_EXCL_LINE
CAudioIO::unprepare();
- std::unique_lock<std::mutex> mutex(mMutex);
if (mpPulseAudioClient && mpPulseAudioClient->isInThread())
THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't unprepare inside pulseaudio thread");
+
SAFE_FINALIZE(mpPulseAudioClient);
SAFE_DELETE(mpPulseAudioClient);
- mutex.unlock();
+
+ CAudioIO::setState(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
+
+ locker.unlock();
CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
}
void CAudioInput::pause() {
+ CAudioTimedLocker locker(__func__, mMutex);
+
if (!__IsInit() || !__IsReady())
THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, //LCOV_EXCL_LINE
"Did not initialize or prepare CAudioInput"); //LCOV_EXCL_LINE
THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't pause in thread"); //LCOV_EXCL_LINE
CAudioIO::pause();
+ CAudioIO::setState(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED);
+
+ locker.unlock();
+
CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED);
}
void CAudioInput::resume() {
+ CAudioTimedLocker locker(__func__, mMutex);
+
if (!__IsInit() || !__IsReady())
THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, //LCOV_EXCL_LINE
"Did not initialize or prepare CAudioInput"); //LCOV_EXCL_LINE
THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't resume in thread"); //LCOV_EXCL_LINE
CAudioIO::resume();
+ CAudioIO::setState(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING);
+
+ locker.unlock();
+
CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING);
}
void CAudioInput::flush() {
+ CAudioTimedLocker locker(__func__, mMutex);
+
if (!__IsInit() || !__IsReady())
THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, //LCOV_EXCL_LINE
"Did not initialize or prepare CAudioInput"); //LCOV_EXCL_LINE
}
size_t CAudioInput::read(void* buffer, size_t length) {
+ CAudioTimedLocker locker(__func__, mMutex);
+
if (!__IsInit() || !__IsReady())
THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, //LCOV_EXCL_LINE
"Did not initialize or prepare CAudioInput"); //LCOV_EXCL_LINE
int ret = 0;
- std::unique_lock<std::mutex> mutex(mMutex);
// If another thread did call unprepare, do not read
if (!mpPulseAudioClient)
THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, //LCOV_EXCL_LINE
// Block until read done
ret = mpPulseAudioClient->read(buffer, length);
- mutex.unlock();
+ locker.unlock();
sched_yield();
THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Not initialized"); //LCOV_EXCL_LINE
if (__IsReady()) {
- std::unique_lock<std::mutex> defer_mutex(mMutex, std::defer_lock);
+ CAudioTimedLocker locker(__func__);
if (!mpPulseAudioClient->isInThread())
- defer_mutex.lock();
+ locker.lock(mMutex, mutex_timeout_s);
mpPulseAudioClient->applyRecordVolume(volume);
}
THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Not initialized"); //LCOV_EXCL_LINE
return __mVolume;
-}
\ No newline at end of file
+}