Changeset 425
- Timestamp:
- 02/27/07 19:15:25 (17 years ago)
- Files:
-
- branches/streaming-rework/config.h.in (modified) (1 diff)
- branches/streaming-rework/src/libstreaming/MotuStreamProcessor.cpp (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/streaming-rework/config.h.in
r412 r425 84 84 #undef const 85 85 86 /* Define to `unsigned ' if <sys/types.h> does not define. */86 /* Define to `unsigned int' if <sys/types.h> does not define. */ 87 87 #undef size_t 88 88 branches/streaming-rework/src/libstreaming/MotuStreamProcessor.cpp
r419 r425 409 409 410 410 // allocate the internal buffer 411 floatticks_per_frame = (TICKS_PER_SECOND*1.0) / ((float)m_framerate);411 m_ticks_per_frame = (TICKS_PER_SECOND*1.0) / ((float)m_framerate); 412 412 unsigned int events_per_frame = m_framerate<=48000?8:(m_framerate<=96000?16:32); 413 413 414 414 assert(m_data_buffer); 415 415 m_data_buffer->setBufferSize(ringbuffer_size_frames); 416 m_data_buffer->setEventSize(m_event_size /events_per_frame);417 m_data_buffer->setEventsPerFrame( events_per_frame);416 m_data_buffer->setEventSize(m_event_size); 417 m_data_buffer->setEventsPerFrame(1); 418 418 419 419 m_data_buffer->setUpdatePeriod(m_period); 420 m_data_buffer->setNominalRate( ticks_per_frame);420 m_data_buffer->setNominalRate(m_ticks_per_frame); 421 421 422 422 // FIXME: check if the timestamp wraps at one second … … 919 919 m_data_buffer->setBufferTailTimestamp(m_last_timestamp2); 920 920 921 debugOutput(DEBUG_LEVEL_VERBOSE,"On enable: last ts2=%lld\n",m_last_timestamp2); 921 922 } else { 922 923 debugOutput(DEBUG_LEVEL_VERY_VERBOSE, … … 989 990 // set the timestamp as if there will be a sample put into 990 991 // the buffer by the next packet. 992 if (ts > TICKS_PER_SECOND) 993 ts -= TICKS_PER_SECOND; 991 994 m_data_buffer->setBufferTailTimestamp(ts); 995 debugOutput(DEBUG_LEVEL_VERBOSE,"%p, last ts=%lld, ts=%lld, lts2=%lld\n", m_data_buffer, m_last_timestamp, ts, m_last_timestamp2); 992 996 993 997 return RAW1394_ISO_DEFER; … … 995 999 996 1000 debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "put packet...\n"); 1001 debugOutput(DEBUG_LEVEL_VERBOSE,"enabled: %p, last ts=%lld, ts2=%lld\n",m_data_buffer, m_last_timestamp, m_last_timestamp2); 997 1002 998 1003 //=> process the packet … … 1074 1079 1075 1080 // prepare the framerate estimate 1076 floatticks_per_frame = (TICKS_PER_SECOND*1.0) / ((float)m_framerate);1081 m_ticks_per_frame = (TICKS_PER_SECOND*1.0) / ((float)m_framerate); 1077 1082 1078 1083 // initialize internal buffer … … 1083 1088 assert(m_data_buffer); 1084 1089 m_data_buffer->setBufferSize(ringbuffer_size_frames); 1085 m_data_buffer->setEventSize(m_event_size/events_per_frame); 1086 m_data_buffer->setEventsPerFrame(events_per_frame); 1087 1088 m_data_buffer->setUpdatePeriod(m_period); 1089 m_data_buffer->setNominalRate(ticks_per_frame); 1090 m_data_buffer->setEventSize(m_event_size); 1091 m_data_buffer->setEventsPerFrame(1); 1092 1093 // JMW: The rx buffer receives a new timestamp once per received frame so I think the 1094 // buffer update period is events_per_frame, not events per period. 1095 // m_data_buffer->setUpdatePeriod(m_period); 1096 m_data_buffer->setUpdatePeriod(events_per_frame); 1097 m_data_buffer->setNominalRate(m_ticks_per_frame); 1090 1098 1091 1099 m_data_buffer->setWrapValue(TICKS_PER_SECOND);