Changeset 1869

Timestamp:

07/18/10 07:42:58 (2 years ago)

Author:

jwoithe

Message:

RME: more receive streaming changes. The resulting code has enabled the first successful audio capture from an RME firewire interface to Linux (test was done using FF400).
RME: work towards getting playback working (no success yet - just silence).

Files:

• trunk/libffado/src/libstreaming/rme/RmeReceiveStreamProcessor.cpp (modified) (4 diffs)
• trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.cpp (modified) (15 diffs)
• trunk/libffado/src/rme/rme_avdevice.cpp (modified) (4 diffs)
• trunk/libffado/src/rme/rme_avdevice.h (modified) (1 diff)

trunk/libffado/src/libstreaming/rme/RmeReceiveStreamProcessor.cpp

@@ -115 +115 @@
-//fprintf(stderr, "recv len=%d\n", length);
-
-8
+0
-        // The iso data blocks from the RMEs comprise 24-bit audio
-        // data encoded in 32-bit integers.  The LSB of the 32-bit integers
@@ -238 +238 @@
-    unsigned int j=0;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-    switch(m_StreamProcessorManager.getAudioDataType()) {
@@ -262 +260 @@
-
-                for(j = 0; j < nevents; j += 1) { // Decode nsamples
-<<16)+(*(src_data+1)<<8)+*(src_data+2)
-
-This isn't strictly needed since E_Int24 is a 24-bit,
-but doing so shouldn't break anything and makes the data
-easier 
-
+ >> 8) & 0x00ffffff
+  This isn't
+strictly needed since E_Int24 is a 24-bit, but doing
+so shouldn't break anything and makes the data easier
+
+000000
-                        *buffer |= 0xff000000;
-
-                    buffer++;
-
+/4
-                }
-            }
@@ -285 +283 @@
-
-                for(j = 0; j < nevents; j += 1) { // decode max nsamples
-
-
+
-                    /* Sign-extend highest bit of incoming 24-bit integer */
-
+000000
-                      v |= 0xff000000;
-                    *buffer = v * multiplier;
-                    buffer++;
-
+/4
-                }
-            }

trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.cpp

@@ -107 +107 @@
-{
-    unsigned int cycle = CYCLE_TIMER_GET_CYCLES(pkt_ctr);
+    signed n_events = getNominalFramesPerPacket();
-
-    // Called once per packet.  Need to work out whether data should be sent
@@ -116 +117 @@
-    // they will contain data.
-    *sy = 0x00;
-0
+n_events*m_event_size
-
-    signed int fc;
@@ -273 +274 @@
-    unsigned char *data, unsigned int *length)
-{
-    quadlet_t *quadlet = (quadlet_t *)data;
-    quadlet += 2; // skip the header
-    // Size of a single data frame in quadlets
-//    unsigned dbs = m_event_size / 4;
@@ -283 +282 @@
-    signed n_events = getNominalFramesPerPacket();
-
- + 8
+
-//        float ticks_per_frame = m_Parent.getDeviceManager().getStreamProcessorManager().getSyncSource().getTicksPerFrame();
-
@@ -291 +290 @@
-//        }
-        // FIXME: temporary
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return eCRV_OK;
-    }
-    else
-    {
-MX
+XM
-        debugOutput(DEBUG_LEVEL_VERBOSE, "readFrames() failure\n");
-        return eCRV_XRun;
@@ -409 +424 @@
-     * the length will be overridden by fillNoDataPacketHeader().
-     */
- + 8
+
-
-    uint64_t presentation_time;
@@ -469 +484 @@
-{
-    // Simply set all audio data to zero since that's what's meant by
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // The number of events per packet expected by the RME is solely
@@ -481 +503 @@
-    signed n_events = getNominalFramesPerPacket();
-
-    memset(quadlet, 0, n_events*m_event_size);
-//    float ticks_per_frame = m_Parent.getDeviceManager().getStreamProcessorManager().getSyncSource().getTicksPerFrame();
-
-    // Set up each frames's SPH.
-    for (int i=0; i < n_events; i++, quadlet += dbs) {
-//        int64_t ts_frame = addTicks(m_last_timestamp, (unsigned int)lrintf(i * ticks_per_frame));
-// FIXME:
-//        *quadlet = CondSwapToBus32(fullTicksToSph(ts_frame));
-    }
-    return eCRV_OK;
-}
-
-unsigned int RmeTransmitStreamProcessor::fillDataPacketHeader (
-    quadlet_t *data, unsigned int* length,
-    uint32_t ts )
-{
-//    quadlet_t *quadlet = (quadlet_t *)data;
-    // Size of a single data frame in quadlets.
-//    unsigned dbs = m_event_size / 4;
-
-    // The number of events per packet expected by the RME is solely
-    // dependent on the current sample rate.  An 'event' is one sample from
-    // all channels plus possibly other midi and control data.
-    signed n_events = getNominalFramesPerPacket();
-
-    // construct the packet CIP-like header.  Even if this is a data-less
-    // packet the dbs field is still set as if there were data blocks
-    // present.  For data-less packets the dbc is the same as the previously
-    // transmitted block.
-//    *quadlet = CondSwapToBus32(0x00000400 | ((m_Parent.get1394Service().getLocalNodeId()&0x3f)<<24) | m_tx_dbc | (dbs<<16));
-//    quadlet++;
-//    *quadlet = CondSwapToBus32(0x8222ffff);
-//    quadlet++;
-    return n_events;
-}
@@ -520 +509 @@
-    quadlet_t *data, unsigned int* length )
-{
-
-
-
-
-
-
-
-
-
-
-
-
+
-    return 0;
-}
@@ -547 +525 @@
-                       unsigned int nevents, unsigned int offset) {
-    bool no_problem=true;
-    unsigned int i;
-
-    // Start with MIDI and control streams all zeroed.  Due to the sparce nature
-    // of these streams it is best to simply fill them in on an as-needs basis.
-    for (i=0; i<nevents; i++) {
-        memset(data+4+i*m_event_size, 0x00, 6);
-    }
-
-    for ( PortVectorIterator it = m_Ports.begin();
@@ -640 +611 @@
-    unsigned int j=0;
-
-
-
-
-
-
-
-
+
+
-
-    switch(m_StreamProcessorManager.getAudioDataType()) {
@@ -663 +629 @@
-
-                for(j = 0; j < nevents; j += 1) { // Decode nsamples
-
-
-
-
+
-                    buffer++;
-
+/4
-                }
-            }
@@ -688 +651 @@
-#endif
-                    unsigned int v = lrintf(in * multiplier);
-
-
-
-
+
-                    buffer++;
-
+/4
-                }
-            }
@@ -705 +665 @@
-                       unsigned int offset, unsigned int nevents) {
-    unsigned int j=0;
-unsigned char *target = (unsigned char *)data + p->getPosition()
+quadlet_t *target = data + p->getPosition()/4
-
-    switch (m_StreamProcessorManager.getAudioDataType()) {
@@ -712 +672 @@
-        case StreamProcessorManager::eADT_Float:
-        for (j = 0; j < nevents; j++) {
-*(target+1) = *(target+2) = 
-
+
+/4
-        }
-        break;

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -37 +37 @@
-#include "debugmodule/debugmodule.h"
-
+#include "libstreaming/rme/RmePort.h"
+
-#include "devicemanager.h"
-
@@ -682 +684 @@
-        debugWarning("Could not retrieve id parameter, defaulting to 'dev?'\n");
-    }
+    addDirPorts(Streaming::Port::E_Capture);
-
-    /* Now set up the transmit stream processor */
@@ -700 +703 @@
-    // Other things to be done:
-    //  * add ports to transmit stream processor
+    addDirPorts(Streaming::Port::E_Playback);
-
-    return true;
@@ -763 +767 @@
-}
-
+bool 
+Device::addPort(Streaming::StreamProcessor *s_processor,
+    char *name, enum Streaming::Port::E_Direction direction,
+    int position, int size) {
+
+    Streaming::Port *p;
+    p = new Streaming::RmeAudioPort(*s_processor, name, direction, position, size);
+    if (p == NULL) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "Skipped port %s\n",name);
+    }
+    return true;
+}
+
+bool 
+Device::addDirPorts(enum Streaming::Port::E_Direction direction) {
+
+    const char *mode_str = direction==Streaming::Port::E_Capture?"cap":"pbk";
+    Streaming::StreamProcessor *s_processor;
+    std::string id;
+    char name[128];
+
+    if (direction == Streaming::Port::E_Capture) {
+        s_processor = m_receiveProcessor;
+    } else {
+        s_processor = m_transmitProcessor;
+    }
+
+    id = std::string("dev?");
+    if (!getOption("id", id)) {
+        debugWarning("Could not retrieve id parameter, defaulting to 'dev?'\n");
+    }
+
+    // Just add a few ports for initial testing
+    snprintf(name, sizeof(name), "%s_%s_%s", id.c_str(), mode_str, "port_0");
+    addPort(s_processor, name, direction, 0, 0);
+    snprintf(name, sizeof(name), "%s_%s_%s", id.c_str(), mode_str, "port_1");
+    addPort(s_processor, name, direction, 4, 0);
+    snprintf(name, sizeof(name), "%s_%s_%s", id.c_str(), mode_str, "port_6");
+    addPort(s_processor, name, direction, 24, 0);
+    snprintf(name, sizeof(name), "%s_%s_%s", id.c_str(), mode_str, "port_7");
+    addPort(s_processor, name, direction, 28, 0);
+
+    return true;
+}
+
-unsigned int 
-Device::readRegister(fb_nodeaddr_t reg) {

trunk/libffado/src/rme/rme_avdevice.h

@@ -92 +92 @@
-    signed int getNumChannels(void) { return num_channels; };
-    signed int getFramesPerPacket(void);
+
+    bool addPort(Streaming::StreamProcessor *s_processor,
+             char *name, enum Streaming::Port::E_Direction direction,
+             int position, int size);
+    bool addDirPorts(enum Streaming::Port::E_Direction direction);
-
-    unsigned int readRegister(fb_nodeaddr_t reg);