Changeset 3932

Timestamp:

03/02/10 06:27:53 (5 months ago)

Author:

sletz

Message:

More flexible handling of network audio buffers.

Files:

• jack2/branches/libjacknet/common/JackNetInterface.cpp (modified) (9 diffs)
• jack2/branches/libjacknet/common/JackNetInterface.h (modified) (1 diff)
• jack2/branches/libjacknet/common/JackNetTool.cpp (modified) (1 diff)
• jack2/branches/libjacknet/common/JackNetTool.h (modified) (2 diffs)
• jack2/branches/libjacknet/common/JackTools.h (modified) (1 diff)
• jack2/branches/libjacknet/macosx/coreaudio/TiPhoneCoreAudioRenderer.cpp (modified) (2 diffs)
• jack2/branches/libjacknet/macosx/coreaudio/TiPhoneCoreAudioRenderer.h (modified) (1 diff)
• jack2/branches/libjacknet/macosx/iphone/main_master.mm (modified) (1 diff)
• jack2/branches/libjacknet/macosx/iphone/main_slave.mm (modified) (4 diffs)

jack2/branches/libjacknet/common/JackNetInterface.cpp

@@ -116 +116 @@
-        //bufsize = sync + audio + midi
-        bufsize = MAX_LATENCY * (fParams.fMtu + ( int ) audio_size + ( int ) midi_size);
+        jack_info("SetNetBufferSize bufsize = %d", bufsize);
-
-        //tx buffer
@@ -299 +300 @@
-
-        //audio net buffers
-
-
+
+
+
+
+
+
-        assert ( fNetAudioCaptureBuffer );
-        assert ( fNetAudioPlaybackBuffer );
@@ -388 +393 @@
-    {
-        if (fParams.fNetworkMode == 's') {
-3
+(CYCLE_OFFSET_SLOW + 1)
-        } else {
-            return true;
@@ -465 +470 @@
-                //  - this mode will skip the two first cycles, thus it lets time for data to be processed and queued on the socket rx buffer
-                //the slow mode is the safest mode because it wait twice the bandwidth relative time (send/return + process)
-2
+CYCLE_OFFSET_SLOW
-                    return 0;
-                } else {
-                    rx_bytes = Recv ( rx_head->fPacketSize, 0 );
-                }
-    
-2
+
+CYCLE_OFFSET_SLOW
-                    jack_info("Warning : '%s' runs in slow network mode, but data received too late (%d cycle(s) offset)", fParams.fName, fCycleOffset);
-                }
@@ -515 +520 @@
-        uint recvd_midi_pckt = 0;
-        uint recvd_audio_pckt = 0;
+        int last_cycle = 0;
+         
-        packet_header_t* rx_head = reinterpret_cast<packet_header_t*> ( fRxBuffer );
-        
@@ -554 +561 @@
-                        fRxHeader.fSubCycle = rx_head->fSubCycle;
-                        fRxHeader.fIsLastPckt = rx_head->fIsLastPckt;
-SubCycle 
+Cycle,  rx_head->fSubCycle
-                        jumpcnt = 0;
+                        last_cycle = rx_head->fCycle;
-                        break;
-
-                    case 's':   //sync
-                        jack_info("NetMaster : overloaded, skipping receive from '%s'", fParams.fName);
+                        // Finish rendering (copy to JACK ports)
+                        fNetAudioPlaybackBuffer->FinishRenderToJackPorts(last_cycle); 
-                        return 0;
-                }
-            }
-        }
+        
+        // Finish rendering (copy to JACK ports)
+        fNetAudioPlaybackBuffer->FinishRenderToJackPorts(last_cycle); 
-        return rx_bytes;
-    }
@@ -791 +804 @@
-
-        //audio net buffers
-
-
+
+
+
+
+
-
-        //audio netbuffer length
@@ -868 +884 @@
-        uint recvd_audio_pckt = 0;
-        int rx_bytes = 0;
+        int last_cycle = 0;
+     
-        packet_header_t* rx_head = reinterpret_cast<packet_header_t*> ( fRxBuffer );
-
@@ -894 +912 @@
-                        rx_bytes = Recv ( rx_head->fPacketSize, 0 );
-                        if (recvd_audio_pckt++ != rx_head->fSubCycle) {
-
-
+
-                        }
-                        fRxHeader.fCycle = rx_head->fCycle;
-                        fRxHeader.fSubCycle = rx_head->fSubCycle;
-                        fRxHeader.fIsLastPckt = rx_head->fIsLastPckt;
-
+
+
-                        break;
-
-                    case 's':   //sync
-                        jack_info ( "NetSlave : overloaded, skipping receive." );
+                        // Finish rendering (copy to JACK ports)
+                        fNetAudioCaptureBuffer->FinishRenderToJackPorts(last_cycle); 
-                        return 0;
-                }
-            }
-        }
+        
+        // Finish rendering (copy to JACK ports)
+        fNetAudioCaptureBuffer->FinishRenderToJackPorts(last_cycle); 
-        fRxHeader.fCycle = rx_head->fCycle;
-        return 0;

jack2/branches/libjacknet/common/JackNetInterface.h

@@ -213 +213 @@
-#define SLAVE_INIT_TIMEOUT 2000000      // in usec
-
-
+
+
-
-#endif

jack2/branches/libjacknet/common/JackNetTool.cpp

@@ -128 +128 @@
-// net audio buffer *********************************************************************************
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        fNetBuffer = net_buffer;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-// SessionParams ************************************************************************************

jack2/branches/libjacknet/common/JackNetTool.h

@@ -249 +249 @@
-// audio data *********************************************************************************
-
+    class SERVER_EXPORT NetAudioBuffer 
+    {
+    
+        public:
+            NetAudioBuffer ()
+            {}
+            ~NetAudioBuffer()
+            {}
+            
+            virtual size_t GetSize() = 0;
+            //jack<->buffer
+            virtual void RenderFromJackPorts (int subcycle ) = 0;
+            virtual void RenderToJackPorts ( int cycle, int subcycle) = 0;
+            virtual void FinishRenderToJackPorts (int cycle) = 0;
+
+            virtual void SetBuffer ( int index, sample_t* buffer ) = 0;
+            virtual sample_t* GetBuffer ( int index ) = 0;
+   };
+
-    /**
-    \Brief Audio buffer and operations class
@@ -258 +277 @@
-
-    */
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        private:
-
-
-
-
+
-            char* fNetBuffer;
-sample_t** fPortBuffer;
+
-        public:
-
-
+Single
+Single
-
-            size_t GetSize();
-            //jack<->buffer
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            void SetBuffer ( int index, sample_t* buffer );

jack2/branches/libjacknet/common/JackTools.h

@@ -138 +138 @@
-            T Add ( T measure_point )
-            {
-                               
+                
-            }
-

jack2/branches/libjacknet/macosx/coreaudio/TiPhoneCoreAudioRenderer.cpp

@@ -119 +119 @@
-}
-
-Default
+
-{
-    OSStatus err1;
@@ -126 +126 @@
-        AudioStreamBasicDescription srcFormat, dstFormat;
-    
-Default
+
-          
-    // Initialize and configure the audio session

jack2/branches/libjacknet/macosx/coreaudio/TiPhoneCoreAudioRenderer.h

@@ -79 +79 @@
-        }
-
-Default
+
-        int Close();
-

jack2/branches/libjacknet/macosx/iphone/main_master.mm

@@ -72 +72 @@
-    }
-    
-Default
+
-        return -1;
-    }

jack2/branches/libjacknet/macosx/iphone/main_slave.mm

@@ -12 +12 @@
-#include "TiPhoneCoreAudioRenderer.h"
-
-2
-2
+1
+1
-
-jack_net_slave_t* net;
@@ -34 +34 @@
-{
-
-
+
+
+
+
+
+
+
+
+
-    return 0;
-}
@@ -40 +48 @@
-static void SlaveAudioCallback(int frames, float** inputs, float** outputs, void* arg)
-{
-
+//
-}
+
+//http://www.securityfocus.com/infocus/1884
+
+#define WIFI_MTU 1500
+
-
-int main(int argc, char *argv[]) {
-    
- 
+
-    
-DEFAULT
+WIFI
-    jack_master_t result;
-
-DEFAULT_MULTICAST_IP
+"169.254.136.64"
-        return -1;
-    }
@@ -70 +83 @@
-    }
-    
-Default
+
-        return -1;
-    }