Changeset 1046 for trunk/libffado/src/libstreaming
- Timestamp:
- 04/26/08 09:42:39 (16 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp
r1036 r1046 352 352 // this is an xrun situation 353 353 m_in_xrun = true; 354 debug Warning("Should update state to WaitingForStreamDisable due to dropped packet xrun\n");354 debugOutput(DEBUG_LEVEL_NORMAL, "Should update state to WaitingForStreamDisable due to dropped packet xrun\n"); 355 355 m_cycle_to_switch_state = CYCLE_TIMER_GET_CYCLES(pkt_ctr) + 1; // switch in the next cycle 356 356 m_next_state = ePS_WaitingForStreamDisable; … … 391 391 // they represent a discontinuity in the timestamps, and hence are 392 392 // to be dealt with 393 debug Warning("(%p) Correcting timestamp for dropped cycles, discarding packet...\n", this);393 debugOutput(DEBUG_LEVEL_NORMAL, "(%p) Correcting timestamp for dropped cycles, discarding packet...\n", this); 394 394 m_data_buffer->setBufferTailTimestamp(substractTicks(m_last_timestamp, 395 395 (uint64_t)(getNominalFramesPerPacket() … … 439 439 // allow for the xrun to be picked up 440 440 if (result2 == eCRV_XRun) { 441 debug Warning("processPacketData xrun\n");441 debugOutput(DEBUG_LEVEL_NORMAL, "processPacketData xrun\n"); 442 442 m_in_xrun = true; 443 443 debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to data xrun\n"); … … 497 497 if(m_state == ePS_Running) { 498 498 debugShowBackLogLines(200); 499 debug Warning("dropped packets xrun\n");499 debugOutput(DEBUG_LEVEL_NORMAL, "dropped packets xrun\n"); 500 500 debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to dropped packets xrun\n"); 501 501 m_cycle_to_switch_state = CYCLE_TIMER_GET_CYCLES(pkt_ctr) + 1; … … 623 623 // allow for the xrun to be picked up 624 624 if (result2 == eCRV_XRun) { 625 debug Warning("generatePacketData xrun\n");625 debugOutput(DEBUG_LEVEL_NORMAL, "generatePacketData xrun\n"); 626 626 m_in_xrun = true; 627 627 debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to data xrun\n"); … … 661 661 } 662 662 } else if (result == eCRV_XRun) { // pick up the possible xruns 663 debug Warning("generatePacketHeader xrun\n");663 debugOutput(DEBUG_LEVEL_NORMAL, "generatePacketHeader xrun\n"); 664 664 m_in_xrun = true; 665 665 debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state to WaitingForStreamDisable due to header xrun\n"); trunk/libffado/src/libstreaming/StreamProcessorManager.cpp
r1045 r1046 149 149 if (result == ETIMEDOUT) { 150 150 debugOutput(DEBUG_LEVEL_VERBOSE, 151 "(%p) pthread_cond_timedwait() timed out (result=%d)\n",151 "(%p) sem_timedwait() timed out (result=%d)\n", 152 152 this, result); 153 153 return eAR_Timeout; 154 154 } else if (result == EINTR) { 155 155 debugOutput(DEBUG_LEVEL_VERBOSE, 156 "(%p) pthread_cond_[timed]wait() interrupted by signal (result=%d)\n",156 "(%p) sem_[timed]wait() interrupted by signal (result=%d)\n", 157 157 this, result); 158 158 return eAR_Interrupted; 159 159 } else { 160 debugError("(%p) pthread_cond_[timed]wait error (result=%d)\n",160 debugError("(%p) sem_[timed]wait error (result=%d)\n", 161 161 this, result); 162 162 debugError("(%p) timeout_sec=%d timeout_nsec=%lld ts.sec=%d ts.nsec=%lld\n", … … 1002 1002 1003 1003 if ((*it)->xrunOccurred()) { 1004 debugWarning("Xrun on RECV SP %p due to ISO side xrun\n",*it); 1004 debugOutput(DEBUG_LEVEL_NORMAL, 1005 "Xrun on RECV SP %p due to ISO side xrun\n", *it); 1005 1006 (*it)->dumpInfo(); 1006 1007 } 1007 1008 if (!((*it)->canClientTransferFrames(m_period))) { 1008 debugWarning("Xrun on RECV SP %p due to buffer side xrun\n",*it); 1009 debugOutput(DEBUG_LEVEL_NORMAL, 1010 "Xrun on RECV SP %p due to buffer side xrun\n", *it); 1009 1011 (*it)->dumpInfo(); 1010 1012 } … … 1014 1016 ++it ) { 1015 1017 if ((*it)->xrunOccurred()) { 1016 debugWarning("Xrun on XMIT SP %p due to ISO side xrun\n",*it); 1018 debugOutput(DEBUG_LEVEL_NORMAL, 1019 "Xrun on XMIT SP %p due to ISO side xrun\n", *it); 1017 1020 } 1018 1021 if (!((*it)->canClientTransferFrames(m_period))) { 1019 debugWarning("Xrun on XMIT SP %p due to buffer side xrun\n",*it); 1022 debugOutput(DEBUG_LEVEL_NORMAL, 1023 "Xrun on XMIT SP %p due to buffer side xrun\n", *it); 1020 1024 } 1021 1025 } 1022 1026 #endif 1023 1024 1027 m_nbperiods++; 1025 1026 1028 // now we can signal the client that we are (should be) ready 1027 1029 return !xrun_occurred;