Changeset 3956

Timestamp:

03/12/10 03:08:33 (5 months ago)

Author:

sletz

Message:

Capture or playback only mode now working in master mode.

Files:

• jack2/branches/libjacknet/common/JackNetAdapter.cpp (modified) (4 diffs)
• jack2/branches/libjacknet/common/JackNetAPI.cpp (modified) (4 diffs)
• jack2/branches/libjacknet/macosx/coreaudio/JackCoreAudioDriver.cpp (modified) (1 diff)
• jack2/branches/libjacknet/macosx/coreaudio/TiPhoneCoreAudioRenderer.cpp (modified) (5 diffs)
• jack2/branches/libjacknet/macosx/coreaudio/TiPhoneCoreAudioRenderer.h (modified) (4 diffs)
• jack2/branches/libjacknet/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj (modified) (2 diffs)
• jack2/branches/libjacknet/macosx/iphone/main_master.mm (modified) (5 diffs)
• jack2/branches/libjacknet/macosx/iphone/main_slave.mm (modified) (1 diff)

jack2/branches/libjacknet/common/JackNetAdapter.cpp

@@ -41 +41 @@
-        fParams.fMtu = DEFAULT_MTU;
-        fParams.fTransportSync = 0;
-fParams.fSendAudioChannels = 2
-fParams.fReturnAudioChannels = 2
+int send_audio = -1
+int return_audio = -1
-        fParams.fSendMidiChannels = 0;
-        fParams.fReturnMidiChannels = 0;
@@ -72 +72 @@
-                    break;
-                case 'C' :
-fParams.fSendAudioChannels
+send_audio
-                    break;
-                case 'P' :
-fParams.fReturnAudioChannels
+return_audio
-                    break;
-                case 'n' :
@@ -106 +106 @@
-        fSocket.SetPort ( port );
-        fSocket.SetAddress ( fMulticastIP, port );
-
+
+
+
+
+
+
+
-        //set the audio adapter interface channel values
-        SetInputs ( fParams.fSendAudioChannels );
@@ -216 +222 @@
-
-        //set buffers
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-

jack2/branches/libjacknet/common/JackNetAPI.cpp

@@ -146 +146 @@
-        fRequest.buffer_size = request->buffer_size;
-        fRequest.sample_rate = request->sample_rate;
+        fAudioCaptureBuffer = NULL;
+        fAudioPlaybackBuffer = NULL;
+        fMidiCaptureBuffer = NULL;
+        fMidiPlaybackBuffer = NULL;
-    }
-                
@@ -284 +288 @@
-     
-        // Set buffers
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-      
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -345 +357 @@
-     {
-        try {
-
-
+
-             
-
+int 
-                fNetAudioPlaybackBuffer->SetBuffer(port_index, audio_input_buffer[port_index]);
-            }
-             
-
+int 
-                fNetMidiPlaybackBuffer->SetBuffer(port_index, ((JackMidiBuffer**)midi_input_buffer)[port_index]);
-            }
@@ -371 +382 @@
-     {
-        try {
-
-
+
-           
-
+int 
-                 fNetAudioCaptureBuffer->SetBuffer(port_index, audio_output_buffer[port_index]);
-             }
-             
-
+int 
-                 fNetMidiCaptureBuffer->SetBuffer(port_index, ((JackMidiBuffer**)midi_output_buffer)[port_index]);
-             }

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

@@ -1984 +1984 @@
-        bool playback = false;
-        int chan_in = -1;   // Default: if not explicitely set, then max possible will be used...
-à
+
-        bool monitor = false;
-        const char* capture_driver_uid = "";

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

@@ -81 +81 @@
-{
-    TiPhoneCoreAudioRendererPtr renderer = (TiPhoneCoreAudioRendererPtr)inRefCon;
-io
+renderer->fCAInput
-    
-    float coef = float(LONG_MAX);
@@ -88 +88 @@
-    for (int chan = 0; chan < renderer->fDevNumInChans; chan++) {
-        for (int frame = 0; frame < inNumberFrames; frame++) {
-long*)io
+int*)renderer->fCAInput
-        }
-    }
@@ -96 +96 @@
-    for (int chan = 0; chan < renderer->fDevNumOutChans; chan++) {
-        for (int frame = 0; frame < inNumberFrames; frame++) {
-long*)ioData->mBuffers[chan].mData)[frame] = long
+int*)ioData->mBuffers[chan].mData)[frame] = int
-        }
-    }
@@ -327 +327 @@
-        }
-    }
-
+
-    if (fDevNumInChans > 0 && fDevNumOutChans == 0) {
-        AURenderCallbackStruct output;
@@ -349 +349 @@
-        }
-    }
+    
+    // Prepare buffers
+    fCAInputData = (AudioBufferList*)malloc(sizeof(UInt32) + fDevNumInChans * sizeof(AudioBuffer));
+    fCAInputData->mNumberBuffers = fDevNumInChans;
+    for (int i = 0; i < fDevNumInChans; i++) {
+        fCAInputData->mBuffers[i].mNumberChannels = 1;
+        fCAInputData->mBuffers[i].mDataByteSize = bufferSize * sizeof(int);
+        fCAInputData->mBuffers[i].mData = malloc(bufferSize * sizeof(int));
+    }
+    
+    /*
+    // Add listeners
+    err1 = AudioDeviceAddPropertyListener(fDeviceID, 0, true, kAudioDeviceProcessorOverload, DeviceNotificationCallback, this);
+    if (err != noErr) {
+        jack_error("Error calling AudioDeviceAddPropertyListener with kAudioDeviceProcessorOverload");
+        printError(err);
+        return -1;
+    }
+    */
-
-    return NO_ERR;

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

@@ -42 +42 @@
-        int     fDevNumInChans;
-        int     fDevNumOutChans;
+        
+        AudioBufferList* fCAInputData;
-     
-        float* fInChannel[MAX_CHANNELS];
@@ -58 +60 @@
-
-        TiPhoneCoreAudioRenderer(int input, int output)
-DevNumInChans(input), fDevNumOutChans(output), fAudioCallback(NULL), fCallbackArg
+AudioCallback(NULL), fCallbackArg(NULL), fDevNumInChans(input), fDevNumOutChans(output), fCAInputData
-        {
-            memset(fInChannel, 0, sizeof(float*) * MAX_CHANNELS);
@@ -71 +73 @@
-            }
-        }
+        
-        virtual ~TiPhoneCoreAudioRenderer()
-        {
@@ -79 +82 @@
-            for (int i = 0; i < fDevNumOutChans; i++) {
-                delete[] fOutChannel[i]; 
+            }
+            
+            if (fCAInputData) {
+                for (int i = 0; i < fDevNumInChans; i++) {
+                    free(fCAInputData->mBuffers[i].mData);
+                }
+                free(fCAInputData);
-            }
-        }

jack2/branches/libjacknet/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj

@@ -185 +185 @@
-                4BCF75F210BC2FD90082C526 /* iPhoneThruNet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iPhoneThruNet.app; sourceTree = BUILT_PRODUCTS_DIR; };
-                4BCF75F610BC30140082C526 /* audio_thru.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = audio_thru.mm; sourceTree = SOURCE_ROOT; };
-                4BDFCCD7113DB30500D77992 /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = "<group>"; };
-                4BDFCD57113DB6B700D77992 /* NetJackSlave.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NetJackSlave.app; sourceTree = BUILT_PRODUCTS_DIR; };
-                4BDFCD59113DB6B700D77992 /* Info copy 2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy 2.plist"; sourceTree = "<group>"; };
-                4BF1360E0F4B0B4C00218A3F /* JackAudioAdapterInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioAdapterInterface.cpp; path = ../../common/JackAudioAdapterInterface.cpp; sourceTree = SOURCE_ROOT; };
-                4BF136120F4B0B5E00218A3F /* JackAudioAdapterInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackAudioAdapterInterface.h; path = ../../common/JackAudioAdapterInterface.h; sourceTree = SOURCE_ROOT; };
@@ -355 +353 @@
-                                8D1107310486CEB800E47090 /* Info.plist */,
-                                4BC9C1D31135AA1800D22670 /* iPhoneNetMasterAppl-Info.plist */,
-                                4BDFCCD7113DB30500D77992 /* Info copy.plist */,
-                                4BDFCD59113DB6B700D77992 /* Info copy 2.plist */,
-                        );
-                        name = Resources;

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

@@ -18 +18 @@
-jack_adapter_t* adapter;
-
-
-
+ = NULL
+ = NULL
-
-
-
+
+
+
-
-jack_master_t request = { buffer_size, sample_rate, "master" };
-jack_slave_t result;
+
+static void MixAudio(float** dst, float** src1, float** src2, int channels, int buffer_size)
+{
+    for (int chan = 0; chan < channels; chan++) {
+        for (int frame = 0; frame < buffer_size; frame++) {
+            dst[chan][frame] = src1[chan][frame] + src2[chan][frame];
+        }
+    }
+}
-
-static void MasterAudioCallback(int frames, float** inputs, float** outputs, void* arg)
@@ -31 +41 @@
-    int i; 
-    
+    /*
-    // Copy from iPod input to network buffers
-    for (i = 0; i < result.audio_input; i++) {
-out
+in
-    }
+    */
+    
+    /*
+    // Copy from network out buffers to network in buffers (audio thru)
+    for (i = 0; i < result.audio_input; i++) {
+        memcpy(audio_input_buffer[i], audio_output_buffer[i], buffer_size * sizeof(float));
+    }
+    */
+    
+    // Mix iPod input and network in buffers to network out buffers
+    MixAudio(audio_input_buffer, inputs, audio_output_buffer, result.audio_input, buffer_size);
-    
-    // Send network buffers
-output, audio_out
+input, audio_in
-        printf("jack_net_master_send error..\n");
-    }
-    
-    // Recv network buffers
-input, audio_in
+output, audio_out
-        printf("jack_net_master_recv error..\n");
-    }
@@ -48 +70 @@
-    // Copy from network buffers to iPod output
-    for (i = 0; i < result.audio_output; i++) {
-in
+out
-    }
-}
@@ -59 +81 @@
-    int wait_usec = (unsigned long)((((float)buffer_size) / ((float)sample_rate)) * 1000000.0f);
-    
-    TiPhoneCoreAudioRenderer audio_device(NUM_INPUT, NUM_OUTPUT);
- 
-    if ((net = jack_net_master_open(DEFAULT_MULTICAST_IP, DEFAULT_PORT, "iPhone", &request, &result))  == 0) {
-        printf("jack_net_master_open error..\n");
@@ -66 +86 @@
-    }
-    
+    TiPhoneCoreAudioRenderer audio_device(result.audio_input, result.audio_output);
+     
-    // Allocate buffers
-
-
-
+
+
+
+
+
-    }
-    
-
-
-
+
+
+
+
+
-    }
-    

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

@@ -71 +71 @@
-    //if ((net = jack_net_slave_open("169.254.112.119", DEFAULT_PORT, "iPhone", &request, &result))  == 0) {
-    if ((net = jack_net_slave_open(DEFAULT_MULTICAST_IP, DEFAULT_PORT, "iPod", &request, &result))  == 0) {
-slave
+master
-        return -1;
-    }