Changeset 795
- Timestamp:
- 01/01/08 09:27:10 (13 years ago)
- Files:
-
- trunk/libffado/src/ffado.cpp (modified) (1 diff)
- trunk/libffado/src/libieee1394/IsoHandlerManager.h (modified) (1 diff)
- trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (2 diffs)
- trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (2 diffs)
- trunk/libffado/src/libutil/TimestampedBuffer.cpp (modified) (1 diff)
- trunk/libffado/tests/test-ffado.cpp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/ffado.cpp
r791 r795 233 233 periods++; 234 234 if(periods>periods_print) { 235 debugOutputShort(DEBUG_LEVEL_ VERBOSE, "\nffado_streaming_wait\n");236 debugOutputShort(DEBUG_LEVEL_ VERBOSE, "============================================\n");237 debugOutputShort(DEBUG_LEVEL_ VERBOSE, "Xruns: %d\n", xruns);238 debugOutputShort(DEBUG_LEVEL_ VERBOSE, "============================================\n");235 debugOutputShort(DEBUG_LEVEL_NORMAL, "\nffado_streaming_wait\n"); 236 debugOutputShort(DEBUG_LEVEL_NORMAL, "============================================\n"); 237 debugOutputShort(DEBUG_LEVEL_NORMAL, "Xruns: %d\n", xruns); 238 debugOutputShort(DEBUG_LEVEL_NORMAL, "============================================\n"); 239 239 dev->m_deviceManager->showStreamingInfo(); 240 debugOutputShort(DEBUG_LEVEL_ VERBOSE, "\n");240 debugOutputShort(DEBUG_LEVEL_NORMAL, "\n"); 241 241 periods_print+=100; 242 242 } trunk/libffado/src/libieee1394/IsoHandlerManager.h
r776 r795 34 34 #include <vector> 35 35 36 #define THREAD_PER_ISOHANDLER36 //#define THREAD_PER_ISOHANDLER 37 37 38 38 #define FFADO_MAX_ISO_HANDLERS_PER_PORT 16 trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp
r791 r795 1610 1610 StreamProcessor::dumpInfo() 1611 1611 { 1612 debugOutputShort( DEBUG_LEVEL_NORMAL, " StreamProcessor %p information\n", this);1612 debugOutputShort( DEBUG_LEVEL_NORMAL, " StreamProcessor %p:\n", this); 1613 1613 debugOutputShort( DEBUG_LEVEL_NORMAL, " Port, Channel : %d, %d\n", m_1394service.getPort(), m_channel); 1614 debugOutputShort( DEBUG_LEVEL_NORMAL, " StreamProcessor info:\n");1615 1614 uint64_t now = m_1394service.getCycleTimerTicks(); 1616 1615 debugOutputShort( DEBUG_LEVEL_NORMAL, " Now : %011llu (%03us %04uc %04ut)\n", … … 1619 1618 (unsigned int)TICKS_TO_CYCLES(now), 1620 1619 (unsigned int)TICKS_TO_OFFSET(now)); 1621 debugOutputShort( DEBUG_LEVEL_NORMAL, " Xruns : %s\n", (m_in_xrun ? "True":"False")); 1622 debugOutputShort( DEBUG_LEVEL_NORMAL, " State : %s\n", ePSToString(m_state)); 1623 debugOutputShort( DEBUG_LEVEL_NORMAL, " Next state : %s\n", ePSToString(m_next_state)); 1624 debugOutputShort( DEBUG_LEVEL_NORMAL, " transition at : %u\n", m_cycle_to_switch_state); 1620 debugOutputShort( DEBUG_LEVEL_NORMAL, " Xrun? : %s\n", (m_in_xrun ? "True":"False")); 1621 if (m_state == m_next_state) { 1622 debugOutputShort( DEBUG_LEVEL_NORMAL, " State : %s\n", 1623 ePSToString(m_state)); 1624 } else { 1625 debugOutputShort( DEBUG_LEVEL_NORMAL, " State : %s (Next: %s)\n", 1626 ePSToString(m_state), ePSToString(m_next_state)); 1627 debugOutputShort( DEBUG_LEVEL_NORMAL, " transition at : %u\n", m_cycle_to_switch_state); 1628 } 1625 1629 debugOutputShort( DEBUG_LEVEL_NORMAL, " Buffer : %p\n", m_data_buffer); 1626 debugOutputShort( DEBUG_LEVEL_NORMAL, " Nominal framerate : %u\n", m_StreamProcessorManager.getNominalRate()); 1627 debugOutputShort( DEBUG_LEVEL_NORMAL, " Device framerate : Sync: %f, Buffer %f\n", 1628 24576000.0/m_StreamProcessorManager.getSyncSource().m_data_buffer->getRate(), 1629 24576000.0/m_data_buffer->getRate() 1630 ); 1631 1630 debugOutputShort( DEBUG_LEVEL_NORMAL, " Framerate : Nominal: %u, Sync: %f, Buffer %f\n", 1631 m_StreamProcessorManager.getNominalRate(), 1632 24576000.0/m_StreamProcessorManager.getSyncSource().m_data_buffer->getRate(), 1633 24576000.0/m_data_buffer->getRate()); 1634 float d = getSyncDelay(); 1635 debugOutputShort(DEBUG_LEVEL_NORMAL, " Sync delay : %f ticks (%f frames, %f cy)\n", 1636 d, d/getTicksPerFrame(), 1637 d/((float)TICKS_PER_CYCLE)); 1632 1638 m_data_buffer->dumpInfo(); 1633 1639 } trunk/libffado/src/libstreaming/StreamProcessorManager.cpp
r791 r795 742 742 ready = ((*it)->canClientTransferFrames(m_period)); 743 743 ready_for_transfer &= ready; 744 if (!ready) (*it)->flush();745 744 xrun_occurred |= (*it)->xrunOccurred(); 746 745 } … … 749 748 ++it ) { 750 749 ready = ((*it)->canClientTransferFrames(m_period)); 751 ready_for_transfer &= ready; 752 if (!ready) (*it)->flush(); 750 //ready_for_transfer &= ready; 753 751 xrun_occurred |= (*it)->xrunOccurred(); 754 752 } trunk/libffado/src/libutil/TimestampedBuffer.cpp
r790 r795 1239 1239 #endif 1240 1240 1241 debugOutputShort( DEBUG_LEVEL_NORMAL, " TimestampedBuffer (%p) info:\n",this); 1242 debugOutputShort( DEBUG_LEVEL_NORMAL, " Frame counter : %d\n", m_framecounter); 1243 debugOutputShort( DEBUG_LEVEL_NORMAL, " Events in buffer : %d\n", getBufferFill()); 1244 debugOutputShort( DEBUG_LEVEL_NORMAL, " Buffer head timestamp : "TIMESTAMP_FORMAT_SPEC"\n",ts_head); 1245 debugOutputShort( DEBUG_LEVEL_NORMAL, " Buffer tail timestamp : "TIMESTAMP_FORMAT_SPEC"\n",m_buffer_tail_timestamp); 1246 debugOutputShort( DEBUG_LEVEL_NORMAL, " Next tail timestamp : "TIMESTAMP_FORMAT_SPEC"\n",m_buffer_next_tail_timestamp); 1247 debugOutputShort( DEBUG_LEVEL_NORMAL, " Head - Tail : "TIMESTAMP_FORMAT_SPEC"\n",diff); 1248 debugOutputShort( DEBUG_LEVEL_NORMAL, " rate : %f (%f)\n",m_dll_e2,m_dll_e2/m_update_period); 1241 debugOutputShort( DEBUG_LEVEL_NORMAL, " TimestampedBuffer (%p): %04d frames, %04d events\n", 1242 this, m_framecounter, getBufferFill()); 1243 debugOutputShort( DEBUG_LEVEL_NORMAL, " Timestamps : head: "TIMESTAMP_FORMAT_SPEC", Tail: "TIMESTAMP_FORMAT_SPEC", Next tail: "TIMESTAMP_FORMAT_SPEC"\n", 1244 ts_head, m_buffer_tail_timestamp, m_buffer_next_tail_timestamp); 1245 debugOutputShort( DEBUG_LEVEL_NORMAL, " Head - Tail : "TIMESTAMP_FORMAT_SPEC"\n", diff); 1246 debugOutputShort( DEBUG_LEVEL_NORMAL, " DLL Rate : %f (%f)\n", m_dll_e2, m_dll_e2/m_update_period); 1249 1247 } 1250 1248 trunk/libffado/tests/test-ffado.cpp
r742 r795 68 68 struct arguments 69 69 { 70 short silent;71 short verbose;72 intport;73 intnode_id;74 intnode_id_set;70 short silent; 71 long int verbose; 72 long int port; 73 long int node_id; 74 long int node_id_set; 75 75 char* args[2]; 76 76 }; … … 185 185 arguments.args[1] = ""; 186 186 187 setDebugLevel(arguments.verbose);188 189 187 // Parse our arguments; every option seen by `parse_opt' will 190 188 // be reflected in `arguments'. … … 195 193 196 194 printf("verbose level = %d\n", arguments.verbose); 195 setDebugLevel(arguments.verbose); 197 196 198 197 printf( "Using ffado library version: %s\n\n", ffado_get_version() );