Changeset 1674
- Timestamp:
- 09/28/09 05:36:17 (14 years ago)
- Files:
-
- trunk/libffado/src/libstreaming/rme/RmeReceiveStreamProcessor.cpp (modified) (4 diffs)
- trunk/libffado/src/libstreaming/rme/RmeReceiveStreamProcessor.h (modified) (2 diffs)
- trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.cpp (modified) (2 diffs)
- trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/libstreaming/rme/RmeReceiveStreamProcessor.cpp
r1672 r1674 42 42 #include "libutil/ByteSwap.h" 43 43 44 // This is to pick up the RME_MODEL_* constants. There's probably a better 45 // way ... 46 #include "../../rme/rme_avdevice.h" 47 44 48 #include <cstring> 45 49 #include <math.h> … … 56 60 #define get_bits(_d,_start,_len) (((_d)>>((_start)-(_len)+1)) & ((1<<(_len))-1)) 57 61 58 RmeReceiveStreamProcessor::RmeReceiveStreamProcessor(FFADODevice &parent, unsigned int event_size) 62 RmeReceiveStreamProcessor::RmeReceiveStreamProcessor(FFADODevice &parent, 63 unsigned int model, unsigned int event_size) 59 64 : StreamProcessor(parent, ePT_Receive) 65 , m_rme_model( model ) 60 66 , m_event_size( event_size ) 61 67 , mb_head ( 0 ) … … 67 73 RmeReceiveStreamProcessor::getMaxPacketSize() { 68 74 int framerate = m_Parent.getDeviceManager().getStreamProcessorManager().getNominalRate(); 69 return framerate<=48000?616:(framerate<=96000?1032:1160); 75 if (m_rme_model == Rme::RME_MODEL_FIREFACE800) 76 return 8 + (framerate<=48000?784:(framerate<=96000?1200:1200)); 77 else 78 return 8 + (framerate<=48000?504:(framerate<=96000?840:1000)); 70 79 } 71 80 … … 73 82 RmeReceiveStreamProcessor::getNominalFramesPerPacket() { 74 83 int framerate = m_Parent.getDeviceManager().getStreamProcessorManager().getNominalRate(); 75 return framerate<=48000? 8:(framerate<=96000?16:32);84 return framerate<=48000?7:(framerate<=96000?15:25); 76 85 } 77 86 trunk/libffado/src/libstreaming/rme/RmeReceiveStreamProcessor.h
r1672 r1674 57 57 * (midi-muxed is only one stream) 58 58 */ 59 RmeReceiveStreamProcessor(FFADODevice &parent, unsigned int event_size);59 RmeReceiveStreamProcessor(FFADODevice &parent, unsigned int model, unsigned int event_size); 60 60 virtual ~RmeReceiveStreamProcessor() {}; 61 61 … … 84 84 int decodeRmeMidiEventsToPort(RmeMidiPort *, quadlet_t *data, unsigned int offset, unsigned int nevents); 85 85 86 unsigned int m_rme_model; 86 87 /* 87 88 * An iso packet mostly consists of multiple events. m_event_size trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.cpp
r1672 r1674 44 44 #include "libutil/ByteSwap.h" 45 45 46 // This is to pick up the RME_MODEL_* constants. There's probably a better 47 // way ... 48 #include "../../rme/rme_avdevice.h" 49 46 50 #include <cstring> 47 51 #include <assert.h> … … 67 71 68 72 /* transmit */ 69 RmeTransmitStreamProcessor::RmeTransmitStreamProcessor(FFADODevice &parent, unsigned int event_size ) 73 RmeTransmitStreamProcessor::RmeTransmitStreamProcessor(FFADODevice &parent, 74 unsigned int model, unsigned int event_size ) 70 75 : StreamProcessor(parent, ePT_Transmit ) 76 , m_rme_model( model) 71 77 , m_event_size( event_size ) 72 78 , m_tx_dbc( 0 ) trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.h
r1672 r1674 55 55 * Create a RME transmit StreamProcessor 56 56 */ 57 RmeTransmitStreamProcessor(FFADODevice &parent, unsigned int event_size); 57 RmeTransmitStreamProcessor(FFADODevice &parent, 58 unsigned int model, unsigned int event_size); 58 59 virtual ~RmeTransmitStreamProcessor() {}; 59 60 … … 106 107 unsigned int offset, unsigned int nevents); 107 108 109 unsigned int m_rme_model; 110 108 111 /* 109 112 * An iso packet mostly consists of multiple events. m_event_size
