/* Private Method */
void resetStreamCallbacks();
void resetInternalObjects();
+ bool streamCork(bool cork, pa_stream_success_cb_t cb, void* user_data);
+ void notifyCorkStatus();
/* Private Callback Method */
static void __contextStateChangeCb(pa_context* c, void* user_data);
static void __streamStartedCb(pa_stream* s, void* user_data);
static void __streamUnderflowCb(pa_stream* s, void* user_data);
static void __streamOverflowCb(pa_stream* s, void* user_data);
- static void __streamEventCb(pa_stream* s, const char *name, pa_proplist *pl, void *user_data);
+ static void __streamEventCb(pa_stream* s, const char* name, pa_proplist* pl, void* user_data);
static void __successStreamCb(pa_stream* s, int success, void* user_data);
+ static void __successCorkCb(pa_stream* s, int success, void* user_data);
+ static void __successCorkCbSignal(pa_stream* s, int success, void* user_data);
static void __successDrainCb(pa_stream* s, int success, void* user_data);
static void __successDrainCbInThread(pa_stream* s, int success, void* user_data);
static void __successVolumeCb(pa_context* c, int success, void* user_data);
CAudioIO::pause();
CAudioIO::setState(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED);
- __mTotalWrittenCount = 0;
- __mTotalWrittenBytes = 0;
-
locker.unlock();
CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED);
void CAudioOutput::__dumpStat() noexcept {
AUDIO_IO_LOGD("pClient[%p] : total written %5" PRIu64 " times, %10" PRIu64 " bytes, %7zu ms",
- mpPulseAudioClient, __mTotalWrittenCount, __mTotalWrittenBytes, mAudioInfo.bytesToMs(__mTotalWrittenBytes));
+ mpPulseAudioClient, __mTotalWrittenCount.load(), __mTotalWrittenBytes.load(),
+ mAudioInfo.bytesToMs(__mTotalWrittenBytes.load()));
}
void CAudioOutput::__dumpStat(size_t length) noexcept {
writtenBytes = 0;
}
}
+
+void CAudioOutput::onCorked(CPulseAudioClient* pClient, bool corked) {
+ assert(pClient);
+
+ AUDIO_IO_LOGD("pClient:[%p], corked:[%d]", pClient, corked);
+
+ if (!corked)
+ return;
+
+ __dumpStat();
+
+ AUDIO_IO_LOGW("Now reset previous written count/bytes due to corked!");
+
+ __mTotalWrittenCount = 0;
+ __mTotalWrittenBytes = 0;
+}
\ No newline at end of file
AUDIO_IO_LOGW("pClient[%p] pa_stream[%p] : name[%s], proplist[%p]", pClient, s, name, pl);
- if (strcmp(name, PA_STREAM_EVENT_POP_TIMEOUT) == 0) {
- pa_operation* o = pa_stream_cork(pClient->__mpStream, 1, NULL, NULL);
- if (!o) {
- AUDIO_IO_LOGE("pa_stream[%p] : cork failed", pClient->__mpStream);
- return;
- }
- pa_operation_unref(o);
- }
+ if (strcmp(name, PA_STREAM_EVENT_POP_TIMEOUT) != 0)
+ return;
+
+ if (!pClient->streamCork(true, __successCorkCb, pClient))
+ AUDIO_IO_LOGE("pa_stream[%p] : cork failed", pClient->__mpStream);
}
//LCOV_EXCL_STOP
+void CPulseAudioClient::notifyCorkStatus() {
+ assert(__mpListener);
+ assert(__mpStream);
+
+ __mpListener->onCorked(this, static_cast<bool>(pa_stream_is_corked(__mpStream)));
+}
+
+void CPulseAudioClient::__successCorkCb(pa_stream* s, int success, void* user_data) {
+ assert(s);
+ assert(user_data);
+
+ auto pClient = static_cast<CPulseAudioClient*>(user_data);
+
+ AUDIO_IO_LOGD("pClient[%p] pa_stream[%p] success[%d] user_data[%p]", pClient, s, success, user_data);
+
+ if (success)
+ pClient->notifyCorkStatus();
+}
+
+void CPulseAudioClient::__successCorkCbSignal(pa_stream* s, int success, void* user_data) {
+ assert(s);
+ assert(user_data);
+
+ auto pClient = static_cast<CPulseAudioClient*>(user_data);
+
+ AUDIO_IO_LOGD("pClient[%p] pa_stream[%p] success[%d] user_data[%p]", pClient, s, success, user_data);
+
+ if (success)
+ pClient->notifyCorkStatus();
+
+ pClient->__mIsOperationSuccess = static_cast<bool>(success);
+
+ /* FIXME : verify following action without any waiting */
+ pa_threaded_mainloop_signal(pClient->__mpMainloop, 0);
+}
+
void CPulseAudioClient::__successStreamCb(pa_stream* s, int success, void* user_data) {
assert(s);
assert(user_data);
CPulseThreadLocker locker{__mpMainloop};
if (pa_stream_is_corked(__mpStream)) {
AUDIO_IO_LOGW("pa_stream[%p] is corked...do uncork here first!!!!", __mpStream);
- pa_operation* o = pa_stream_cork(__mpStream, 0, NULL, NULL);
- if (!o)
+ if (!streamCork(false, __successCorkCb, this))
AUDIO_IO_LOGE("pa_stream[%p] : uncork failed", __mpStream);
- else
- pa_operation_unref(o);
}
ret = pa_stream_write(__mpStream, data, length, NULL, 0LL, PA_SEEK_RELATIVE);
// LCOV_EXCL_START
if (pa_stream_is_corked(__mpStream)) {
AUDIO_IO_LOGW("pa_stream[%p] is corked...do uncork here first!!!!", __mpStream);
- pa_operation* o = pa_stream_cork(__mpStream, 0, NULL, NULL);
- if (!o)
+
+ if (!streamCork(false, __successCorkCb, this))
AUDIO_IO_LOGE("pa_stream[%p] : uncork failed", __mpStream);
- else
- pa_operation_unref(o);
}
if (__mIsFirstStream) {
return ret;
}
+bool CPulseAudioClient::streamCork(bool cork, pa_stream_success_cb_t cb, void* user_data) {
+ pa_operation* o = pa_stream_cork(__mpStream, static_cast<int>(cork), cb, user_data);
+ if (!o)
+ return false;
+ pa_operation_unref(o);
+
+ return true;
+}
+
void CPulseAudioClient::cork(bool cork) {
AUDIO_IO_LOGD("cork[%d]", cork);
CPulseThreadLocker locker{__mpMainloop};
/* FIXME: wait for completion like drain? */
- pa_operation* o = pa_stream_cork(__mpStream, static_cast<int>(cork), __successStreamCb, this);
- if (!o) {
+ if (!streamCork(cork, __successCorkCbSignal, this)) {
AUDIO_IO_LOGE("pa_stream[%p] : cork[%d] failed", __mpStream, cork);
return;
}
- pa_operation_unref(o);
- AUDIO_IO_LOGD("cork[%d] done", cork);
+
+ AUDIO_IO_LOGD("cork[%d] requested, is-stream-started[%d]", cork, __mIsStarted);
+
+ /* FIXME: need to consider manual pa_stream_trigger() when uncorking but stream is not started yet,
+ because even uncorked here, it is still prebuf state so, empty-pop will not be checked in this situation */
}
bool CPulseAudioClient::isCorked() {