diff --git a/CapturedFrameProtocol.h b/CapturedFrameProtocol.h
index cbc38430..7af2a055 100644
--- a/CapturedFrameProtocol.h
+++ b/CapturedFrameProtocol.h
@@ -12,5 +12,4 @@
-(void) newCapturedFrame:(IOSurfaceID)ioxpc reply:(void (^)())reply;
-
@end
diff --git a/CocoaSplit.xcodeproj/project.pbxproj b/CocoaSplit.xcodeproj/project.pbxproj
index e17317e0..b0576e14 100644
--- a/CocoaSplit.xcodeproj/project.pbxproj
+++ b/CocoaSplit.xcodeproj/project.pbxproj
@@ -820,7 +820,7 @@
HEADER_SEARCH_PATHS = /usr/local/include;
MACOSX_DEPLOYMENT_TARGET = "";
ONLY_ACTIVE_ARCH = NO;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx;
};
name = Debug;
};
@@ -843,7 +843,7 @@
HEADER_SEARCH_PATHS = /usr/local/include;
MACOSX_DEPLOYMENT_TARGET = "";
ONLY_ACTIVE_ARCH = NO;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx;
};
name = Release;
};
@@ -871,6 +871,7 @@
/usr/local/lib/libx264.a,
);
PRODUCT_NAME = CocoaSplit;
+ SDKROOT = macosx;
WRAPPER_EXTENSION = app;
};
name = Debug;
@@ -899,6 +900,7 @@
/usr/local/lib/libx264.a,
);
PRODUCT_NAME = CocoaSplit;
+ SDKROOT = macosx;
WRAPPER_EXTENSION = app;
};
name = Release;
@@ -958,6 +960,7 @@
/usr/local/lib/libx264.a,
);
PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = macosx10.9;
};
name = Debug;
};
@@ -985,6 +988,7 @@
/usr/local/lib/libmp3lame.a,
);
PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = macosx10.9;
};
name = Release;
};
@@ -1004,7 +1008,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "zakk.lol.$(TARGET_NAME:rfc1034identifier)";
- SDKROOT = macosx10.8;
+ SDKROOT = macosx;
VALID_ARCHS = "i386 x86_64";
WRAPPER_EXTENSION = xpc;
};
@@ -1025,7 +1029,7 @@
MACH_O_TYPE = mh_execute;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PRODUCT_NAME = "zakk.lol.$(TARGET_NAME:rfc1034identifier)";
- SDKROOT = macosx10.8;
+ SDKROOT = macosx;
VALID_ARCHS = "i386 x86_64";
WRAPPER_EXTENSION = xpc;
};
diff --git a/CocoaSplit/AVFAdvancedPanel.xib b/CocoaSplit/AVFAdvancedPanel.xib
index ec47aa18..eb86697c 100644
--- a/CocoaSplit/AVFAdvancedPanel.xib
+++ b/CocoaSplit/AVFAdvancedPanel.xib
@@ -1,977 +1,122 @@
-
-
-
- 1080
- 12D78
- 3084
- 1187.37
- 626.00
-
-
- IBNSLayoutConstraint
- NSArrayController
- NSButton
- NSButtonCell
- NSCustomObject
- NSMenu
- NSMenuItem
- NSPopUpButton
- NSPopUpButtonCell
- NSTextField
- NSTextFieldCell
- NSView
- NSWindowTemplate
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
- YES
- 3
-
- {11, 11}
- {10, 3}
-
- YES
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CocoaSplit/AVFCapture.h b/CocoaSplit/AVFCapture.h
index 95f4c115..a3535f03 100644
--- a/CocoaSplit/AVFCapture.h
+++ b/CocoaSplit/AVFCapture.h
@@ -23,6 +23,9 @@
AVCaptureVideoDataOutput *_video_capture_output;
AVCaptureAudioDataOutput *_audio_capture_output;
+ AVCaptureDeviceInput *_audio_capture_input;
+ AVCaptureDeviceInput *_video_capture_input;
+
CVImageBufferRef _currentFrame;
AVCaptureDevice *_selectedVideoCaptureDevice;
int _preroll_frame_cnt;
@@ -62,7 +65,9 @@
-(bool) startCaptureSession:(NSError **)error;
-(bool) stopCaptureSession;
-
+-(void) setupAudioPreview;
+-(id) initForAudio;
+-(void) setupAudioCompression;
@end
diff --git a/CocoaSplit/AVFCapture.m b/CocoaSplit/AVFCapture.m
index 4112a9cf..1fea2bb0 100644
--- a/CocoaSplit/AVFCapture.m
+++ b/CocoaSplit/AVFCapture.m
@@ -16,6 +16,40 @@
@synthesize activeVideoDevice = _activeVideoDevice;
@synthesize activeVideoFramerate = _activeVideoFramerate;
@synthesize previewVolume = _previewVolume;
+@synthesize activeAudioDevice = _activeAudioDevice;
+
+
+
+-(id) init
+{
+ if (self = [super init])
+ {
+ _capture_session = [[AVCaptureSession alloc] init];
+ [self setupVideoOutput];
+
+
+
+ [_capture_session startRunning];
+ }
+ return self;
+}
+
+
+-(id) initForAudio
+{
+
+ if (self = [super init])
+ {
+ _capture_session = [[AVCaptureSession alloc] init];
+ [self setupAudioPreview];
+ _audio_capture_queue = dispatch_queue_create("AudioQueue", NULL);
+
+ [_capture_session startRunning];
+
+ }
+
+ return self;
+}
-(void) setVideoDimensions:(int)width height:(int)height
@@ -53,7 +87,18 @@
/* [self.activeVideoDevice lockForConfiguration:nil];
self.activeVideoDevice.activeVideoMinFrameDuration = _activeVideoFramerate.minFrameDuration;
[self.activeVideoDevice unlockForConfiguration];
- */
+ */
+
+
+ if([[[_selectedVideoCaptureDevice activeFormat] videoSupportedFrameRateRanges] containsObject:_activeVideoFramerate])
+ {
+ if([_selectedVideoCaptureDevice lockForConfiguration:nil])
+ {
+ [_selectedVideoCaptureDevice setActiveVideoMinFrameDuration:_activeVideoFramerate.minFrameDuration];
+ [_selectedVideoCaptureDevice unlockForConfiguration];
+ }
+ }
+
self.videoCaptureFPS = _activeVideoFramerate.minFrameRate;
}
@@ -72,11 +117,62 @@
/* [self.activeVideoDevice lockForConfiguration:nil];
self.activeVideoDevice.activeFormat = _activeVideoFormat;
[self.activeVideoDevice unlockForConfiguration];
-*/
+*/
+
+
+ if ([_selectedVideoCaptureDevice lockForConfiguration:nil])
+ {
+ [_selectedVideoCaptureDevice setActiveFormat:_activeVideoFormat];
+ [_selectedVideoCaptureDevice unlockForConfiguration];
+ }
+
self.videoFramerates = self.activeVideoFormat.videoSupportedFrameRateRanges;
}
+-(id) activeAudioDevice
+{
+ return _activeAudioDevice;
+}
+
+-(void) setActiveAudioDevice:(id)activeAudioDevice
+{
+ _activeAudioDevice = activeAudioDevice;
+
+ if (!_capture_session)
+ {
+ return;
+ }
+
+ [_capture_session beginConfiguration];
+ if (_audio_capture_input)
+ {
+ [_capture_session removeInput:_audio_capture_input];
+ _audio_capture_input = nil;
+ }
+
+
+ _audio_capture_input = [AVCaptureDeviceInput deviceInputWithDevice:self.activeAudioDevice error:nil];
+
+ if (!_audio_capture_input)
+ {
+ NSLog(@"No audio capture input?");
+ } else {
+
+
+ if ([_capture_session canAddInput:_audio_capture_input])
+ {
+ [_capture_session addInput:_audio_capture_input];
+
+ } else {
+ NSLog(@"Can't add audio input?");
+ }
+ }
+ [_capture_session commitConfiguration];
+}
+
+
+
-(id) activeVideoDevice
{
return _activeVideoDevice;
@@ -87,6 +183,33 @@
{
_activeVideoDevice = newDev;
_selectedVideoCaptureDevice = [newDev captureDevice];
+
+ if (!_capture_session)
+ {
+ return;
+ }
+
+ [_capture_session beginConfiguration];
+
+ if (_video_capture_input)
+ {
+ [_capture_session removeInput:_video_capture_input];
+ _video_capture_input = nil;
+ }
+
+
+ if (_selectedVideoCaptureDevice)
+ {
+ _video_capture_input = [AVCaptureDeviceInput deviceInputWithDevice:_selectedVideoCaptureDevice error:nil];
+
+ if (_video_capture_input)
+ {
+ [_capture_session addInput:_video_capture_input];
+ }
+ }
+
+ [_capture_session commitConfiguration];
+
self.videoFormats = _selectedVideoCaptureDevice.formats;
self.videoFramerates = _selectedVideoCaptureDevice.activeFormat.videoSupportedFrameRateRanges;
@@ -158,14 +281,7 @@
return NO;
}
- _video_capture_queue = dispatch_queue_create("VideoQueue", NULL);
- [_video_capture_output setSampleBufferDelegate:self queue:_video_capture_queue];
-
- _audio_capture_queue = dispatch_queue_create("AudioQueue", NULL);
- [_audio_capture_output setSampleBufferDelegate:self queue:_audio_capture_queue];
-
- [_capture_session startRunning];
[_selectedVideoCaptureDevice lockForConfiguration:nil];
if (self.activeVideoFormat)
@@ -319,7 +435,6 @@
*therror = [NSError errorWithDomain:@"audioCapture" code:230 userInfo:@{NSLocalizedDescriptionKey : @"Could not add audio output to capture session"}];
return NO;
}
- [self setupAudioPreview];
} else {
NSLog(@"No audio device?");
@@ -349,22 +464,92 @@
}
+-(void) setupAudioCompression
+{
+
+ if (!_capture_session)
+ {
+ return;
+ }
+
+ if (_audio_capture_output)
+ {
+ return;
+ }
+
+
+ _audio_capture_output = [[AVCaptureAudioDataOutput alloc] init];
+
+
+
+ _audio_capture_output.audioSettings = @{AVFormatIDKey: [NSNumber numberWithInt:kAudioFormatMPEG4AAC],
+ AVSampleRateKey: [NSNumber numberWithFloat: 44100.0],
+ AVEncoderBitRateKey: [NSNumber numberWithInt:_audioBitrate*1000 ],
+ AVNumberOfChannelsKey: @2
+
+ };
+
+ [_audio_capture_output setSampleBufferDelegate:self queue:_audio_capture_queue];
+
+ [_capture_session beginConfiguration];
+
+ if ([_capture_session canAddOutput:_audio_capture_output])
+ {
+ [_capture_session addOutput:_audio_capture_output];
+ }
+
+ [_capture_session commitConfiguration];
+
+}
+
+
-(void) setupAudioPreview
{
if (_capture_session)
{
self.audioPreviewOutput = [[AVCaptureAudioPreviewOutput alloc] init];
- [_capture_session beginConfiguration];
if ([_capture_session canAddOutput:self.audioPreviewOutput])
{
[_capture_session addOutput:self.audioPreviewOutput];
}
- [_capture_session commitConfiguration];
self.audioPreviewOutput.volume = self.previewVolume;
}
}
+-(void)setupVideoOutput
+{
+ if (_capture_session)
+ {
+ NSMutableDictionary *videoSettings = [[NSMutableDictionary alloc] init];
+
+ [videoSettings setValue:@[@(kCVPixelFormatType_422YpCbCr8FullRange), @(kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange), @(kCVPixelFormatType_420YpCbCr8BiPlanarFullRange), @(kCVPixelFormatType_422YpCbCr8)] forKey:(NSString *)kCVPixelBufferPixelFormatTypeKey];
+ NSDictionary *ioAttrs = [NSDictionary dictionaryWithObject: [NSNumber numberWithBool: YES]
+ forKey: (NSString *)kIOSurfaceIsGlobal];
+
+ [videoSettings setValue:ioAttrs forKey:(NSString *)kCVPixelBufferIOSurfacePropertiesKey];
+ /* if (self.videoHeight && self.videoWidth)
+ {
+ [videoSettings setValue:@(self.videoHeight) forKey:(NSString *)kCVPixelBufferHeightKey];
+ [videoSettings setValue:@(self.videoWidth) forKey:(NSString *)kCVPixelBufferWidthKey];
+ } */
+
+ NSLog(@"SETTINGS DICT %@", videoSettings);
+ _video_capture_output = [[AVCaptureVideoDataOutput alloc] init];
+
+ if ([_capture_session canAddOutput:_video_capture_output])
+ {
+ [_capture_session addOutput:_video_capture_output];
+ _video_capture_output.videoSettings = videoSettings;
+
+ _video_capture_queue = dispatch_queue_create("VideoQueue", NULL);
+
+ [_video_capture_output setSampleBufferDelegate:self queue:_video_capture_queue];
+
+ }
+ }
+}
+
- (CVImageBufferRef) getCurrentFrame
{
@@ -421,6 +606,7 @@
{
if (connection.output == _video_capture_output)
{
+ /*
if (!self.did_preroll)
{
if (_preroll_frame_cnt < _preroll_needed_frames)
@@ -438,6 +624,7 @@
return;
}
}
+ */
CVImageBufferRef videoFrame = CMSampleBufferGetImageBuffer(sampleBuffer);
@@ -468,8 +655,10 @@
} else if (connection.output == _audio_capture_output) {
-
- [_audioDelegate captureOutputAudio:self didOutputSampleBuffer:sampleBuffer];
+ if (_audioDelegate)
+ {
+ [_audioDelegate captureOutputAudio:self didOutputSampleBuffer:sampleBuffer];
+ }
}
}
diff --git a/CocoaSplit/AppleVTPanel.xib b/CocoaSplit/AppleVTPanel.xib
index f94d93db..66635724 100644
--- a/CocoaSplit/AppleVTPanel.xib
+++ b/CocoaSplit/AppleVTPanel.xib
@@ -1,1692 +1,215 @@
-
-
-
- 1080
- 12E55
- 3084
- 1187.39
- 626.00
-
-
- IBNSLayoutConstraint
- NSArrayController
- NSButton
- NSButtonCell
- NSCustomObject
- NSMenu
- NSMenuItem
- NSNumberFormatter
- NSPopUpButton
- NSPopUpButtonCell
- NSTextField
- NSTextFieldCell
- NSUserDefaultsController
- NSView
- NSWindowTemplate
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
- YES
- 3
-
- {11, 11}
- {10, 3}
- {15, 15}
-
- YES
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CocoaSplit/CaptureController.h b/CocoaSplit/CaptureController.h
index 50ab504c..8733ac6e 100644
--- a/CocoaSplit/CaptureController.h
+++ b/CocoaSplit/CaptureController.h
@@ -160,7 +160,7 @@ void VideoCompressorReceiveFrame(void *, void *, OSStatus , VTEncodeInfoFlags ,
@property (weak) AbstractCaptureDevice *selectedVideoCapture;
-@property (weak) AVCaptureDevice *selectedAudioCapture;
+@property (readonly) AVCaptureDevice *selectedAudioCapture;
@property (readonly) double captureFPS;
diff --git a/CocoaSplit/CaptureController.m b/CocoaSplit/CaptureController.m
index 2c5ca945..f9653000 100644
--- a/CocoaSplit/CaptureController.m
+++ b/CocoaSplit/CaptureController.m
@@ -28,6 +28,7 @@
+
-(void)loadTwitchIngest
{
@@ -187,9 +188,23 @@
self.createSheet = nil;
}
+
+
+
+-(AVCaptureDevice *)selectedAudioCapture
+{
+ if (self.audioCaptureSession)
+ {
+ return self.audioCaptureSession.activeAudioDevice;
+ }
+
+ return nil;
+}
+
+
-(void) selectedAudioCaptureFromID:(NSString *)uniqueID
{
- self.selectedAudioCapture = [AVCaptureDevice deviceWithUniqueID:uniqueID];
+ self.audioCaptureSession.activeAudioDevice = [AVCaptureDevice deviceWithUniqueID:uniqueID];
}
@@ -235,6 +250,16 @@
+- (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+ if ([keyPath isEqualToString:@"videoCaptureFPS"])
+ {
+ [self setupFrameTimer];
+ }
+}
+
+
+
-(NSString *) selectedVideoType
{
return _selectedVideoType;
@@ -245,6 +270,12 @@
-(void) setSelectedVideoType:(NSString *)selectedVideoType
{
+ if (self.videoCaptureSession)
+ {
+
+ [(NSObject *)self.videoCaptureSession removeObserver:self forKeyPath:@"videoCaptureFPS"];
+ }
+
if ([selectedVideoType isEqualToString:@"Desktop"])
{
self.videoCaptureSession = [[DesktopCapture alloc ] init];
@@ -258,20 +289,15 @@
self.videoCaptureSession = [[AVFCapture alloc] init];
}
+
if (!self.videoCaptureSession)
{
self.audioCaptureSession = nil;
_selectedVideoType = nil;
}
- if ([self.videoCaptureSession providesAudio])
- {
- self.audioCaptureSession = self.videoCaptureSession;
- } else {
- self.audioCaptureSession = [[AVFCapture alloc] init];
- }
-
- self.audioCaptureDevices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
+ [(NSObject *)self.videoCaptureSession addObserver:self forKeyPath:@"videoCaptureFPS" options:NSKeyValueObservingOptionNew context:NULL];
+
self.selectedVideoCapture = nil;
_selectedVideoType = selectedVideoType;
@@ -328,6 +354,14 @@
self.selectedVideoType = [self.videoTypes objectAtIndex:0];
+ self.audioCaptureSession = [[AVFCapture alloc] initForAudio];
+ [self.audioCaptureSession setAudioDelegate:self];
+
+
+
+
+ self.audioCaptureDevices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
+
}
@@ -548,6 +582,7 @@
NSError *error;
bool success;
+ id newCompressor;
if (_cmdLineInfo)
@@ -557,46 +592,24 @@
return YES;
}
- [self.audioCaptureSession setActiveAudioDevice:_selectedAudioCapture];
- [self.videoCaptureSession setVideoDelegate:self];
- [self.videoCaptureSession setVideoDimensions:_captureWidth height:_captureHeight];
- [self.audioCaptureSession setAudioDelegate:self];
- [self.audioCaptureSession setAudioBitrate:_audioBitrate];
- [self.audioCaptureSession setAudioSamplerate:_audioSamplerate];
-
-
-
- success = [self.videoCaptureSession setupCaptureSession:&error];
- if (!success)
- {
- [NSApp presentError:error];
- return NO;
- }
- success = [self.audioCaptureSession setupCaptureSession:&error];
- if (!success)
- {
- [NSApp presentError:error];
- return NO;
- }
-
if ([self.selectedCompressorType isEqualToString:@"x264"])
{
- self.videoCompressor = [[x264Compressor alloc] init];
+ newCompressor = [[x264Compressor alloc] init];
} else if ([self.selectedCompressorType isEqualToString:@"AppleVTCompressor"]) {
- self.videoCompressor = [[AppleVTCompressor alloc] init];
+ newCompressor = [[AppleVTCompressor alloc] init];
} else {
- self.videoCompressor = nil;
+ newCompressor = nil;
}
- if (self.videoCompressor)
+ if (newCompressor)
{
- self.videoCompressor.settingsController = self;
+ newCompressor.settingsController = self;
//if ([self.videoCompressor setupCompressor] == YES)
//{
- self.videoCompressor.outputDelegate = self;
+ newCompressor.outputDelegate = self;
//}
@@ -610,7 +623,8 @@
}
- success = [self.videoCaptureSession startCaptureSession:&error];
+
+ [self.audioCaptureSession setupAudioCompression];
_frameCount = 0;
_firstAudioTime = 0;
@@ -621,13 +635,6 @@
self.captureRunning = YES;
- uint64_t frame_interval = (1.0/self.captureFPS)*NSEC_PER_SEC;
-
- _dispatch_timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, _main_capture_queue);
-
- dispatch_source_set_timer(_dispatch_timer, DISPATCH_TIME_NOW, frame_interval, 0);
- dispatch_source_set_event_handler(_dispatch_timer, ^{ [self newFrame]; });
- dispatch_resume(_dispatch_timer);
//dispatch_async(_main_capture_queue, ^{[self newFrame];});
@@ -635,38 +642,37 @@
//_captureTimer = [NSTimer timerWithTimeInterval:1.0/self.captureFPS target:self selector:@selector(newFrame) userInfo:nil repeats:YES];
//[[NSRunLoop currentRunLoop] addTimer:_captureTimer forMode:NSRunLoopCommonModes];
- if (!success)
- {
- self.captureRunning = NO;
- NSLog(@"Failed start capture");
- [NSApp presentError:error];
- return NO;
- }
- if (self.audioCaptureSession != self.videoCaptureSession)
- {
- success = [self.audioCaptureSession startCaptureSession:&error];
- }
-
-
-
-
- if (!success)
- {
- NSLog(@"Failed start capture");
- self.captureRunning = NO;
- [NSApp presentError:error];
- return NO;
- }
-
-
_PMAssertionRet = IOPMAssertionCreateWithName(kIOPMAssertionTypePreventUserIdleDisplaySleep, kIOPMAssertionLevelOn, CFSTR("CocoaSplit is capturing video"), &_PMAssertionID);
-
+
+ self.videoCompressor = newCompressor;
return YES;
}
+-(void) setupFrameTimer
+{
+
+ uint64_t frame_interval = (1.0/self.captureFPS)*NSEC_PER_SEC;
+
+
+ NSLog(@"Setting up new frame timer %f", self.captureFPS);
+ if (_dispatch_timer)
+ {
+ dispatch_source_cancel(_dispatch_timer);
+ _dispatch_timer = nil;
+
+ }
+
+ _dispatch_timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, _main_capture_queue);
+
+ dispatch_source_set_timer(_dispatch_timer, DISPATCH_TIME_NOW, frame_interval, 0);
+ dispatch_source_set_event_handler(_dispatch_timer, ^{ [self newFrame]; });
+ dispatch_resume(_dispatch_timer);
+}
+
+
-(NSString *) buildCmdLineInfo
{
@@ -848,6 +854,7 @@
}
*/
+ /*
if (self.videoCaptureSession)
{
[self.videoCaptureSession stopCaptureSession];
@@ -857,6 +864,7 @@
{
[self.audioCaptureSession stopCaptureSession];
}
+ */
@@ -901,7 +909,11 @@
- (void)captureOutputAudio:(id)fromDevice didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
{
+
+
CFAbsoluteTime currentTime = CFAbsoluteTimeGetCurrent()*1000000;
+
+
if (_firstFrameTime == 0)
{
//Don't start sending audio to the outputs until a video frame has arrived, with AVFoundation this can take 2+ seconds (!?)
@@ -997,14 +1009,15 @@
if (self.videoCaptureSession)
{
+
newFrame = [self.videoCaptureSession getCurrentFrame];
if (newFrame)
{
- if (_firstFrameTime == 0)
+ if (_firstFrameTime == 0 && self.videoCompressor)
{
NSError *error;
BOOL success;
-
+ NSLog(@"SETTING UP RESOLUTION");
success = [self setupResolution:newFrame error:&error];
if (!success)
{
@@ -1030,7 +1043,12 @@
//});
//dispatch_async(_main_capture_queue, ^{
- [self processVideoFrame:newFrame];
+
+ if (self.videoCompressor)
+ {
+ [self processVideoFrame:newFrame];
+ }
+
//});
}
@@ -1062,6 +1080,12 @@
//[self.previewCtx drawFrame:imageBuffer];
+ if (!self.videoCompressor)
+ {
+ CVPixelBufferRelease(imageBuffer);
+
+ return;
+ }
CMTime pts;
CMTime duration;
@@ -1083,6 +1107,8 @@
+ NSLog(@"FRAME COUNT %lld", _frameCount);
+
pts = CMTimeMake(_frameCount*(1.0f/self.captureFPS)*1000000,1000000);
//NSLog(@"PTS IS %@", CMTimeCopyDescription(kCFAllocatorDefault, pts));
diff --git a/CocoaSplit/CaptureSessionProtocol.h b/CocoaSplit/CaptureSessionProtocol.h
index a7fe03cc..5a054033 100644
--- a/CocoaSplit/CaptureSessionProtocol.h
+++ b/CocoaSplit/CaptureSessionProtocol.h
@@ -28,11 +28,8 @@
--(bool) stopCaptureSession;
--(bool) startCaptureSession:(NSError **)error;
-(bool) providesVideo;
-(bool) providesAudio;
--(bool) setupCaptureSession:(NSError **)therror;
-(void) setVideoDimensions:(int)width height:(int)height;
@@ -53,6 +50,8 @@
@property (assign) int audioSamplerate;
@property (assign) float previewVolume;
+-(void)setupAudioCompression;
+
diff --git a/CocoaSplit/DesktopCapture.m b/CocoaSplit/DesktopCapture.m
index 246a06fd..09db78c9 100644
--- a/CocoaSplit/DesktopCapture.m
+++ b/CocoaSplit/DesktopCapture.m
@@ -15,6 +15,10 @@
@implementation DesktopCapture
@synthesize activeVideoDevice = _activeVideoDevice;
+@synthesize videoCaptureFPS = _videoCaptureFPS;
+
+
+
@@ -24,6 +28,22 @@
}
+
+-(id) init
+{
+ if (self = [super init])
+ {
+ _capture_queue = dispatch_queue_create("Desktop Capture Queue", DISPATCH_QUEUE_SERIAL);
+
+ self.videoCaptureFPS = 60;
+
+ }
+
+ return self;
+
+}
+
+
-(AbstractCaptureDevice *)activeVideoDevice
{
return _activeVideoDevice;
@@ -38,7 +58,8 @@
self.width = displaySize.size.width;
self.height = displaySize.size.height;
-
+
+ [self setupDisplayStream];
}
-(void) setVideoDimensions:(int)width height:(int)height
@@ -49,40 +70,50 @@
}
--(bool)setupCaptureSession:(NSError *__autoreleasing *)therror
+-(double)videoCaptureFPS
+{
+ return _videoCaptureFPS;
+}
+
+
+-(void) setVideoCaptureFPS:(double)videoCaptureFPS
+{
+ _videoCaptureFPS = videoCaptureFPS;
+
+ [self setupDisplayStream];
+}
+
+
+
+-(bool)setupDisplayStream
{
- if (!self.activeVideoDevice)
+
+ if (_displayStreamRef)
+ {
+ [self stopDisplayStream];
+ }
+
+
+
+ if (!_currentDisplay)
{
- *therror = [NSError errorWithDomain:@"videoCapture" code:100 userInfo:@{NSLocalizedDescriptionKey : @"Must select video capture device first"}];
return NO;
}
- if (!(self.width > 0) || !(self.height > 0))
- {
- *therror = [NSError errorWithDomain:@"videoCapture" code:150 userInfo:@{NSLocalizedDescriptionKey : @"Width and height must be set to greater than zero"}];
- return NO;
- }
-
-
- _capture_queue = dispatch_queue_create("Desktop Capture Queue", DISPATCH_QUEUE_SERIAL);
- if (!_capture_queue)
- {
- *therror = [NSError errorWithDomain:@"videoCapture" code:160 userInfo:@{NSLocalizedDescriptionKey : @"Could not create desktop capture dispatch queue"}];
- return NO;
- }
- _currentFrameTime = 0;
-
- if (!self.videoCaptureFPS || self.videoCaptureFPS == 0)
- {
- self.videoCaptureFPS = 60.0;
- }
NSNumber *minframetime = [NSNumber numberWithFloat:(1000.0/(self.videoCaptureFPS*1000))];
+
+
_displayStreamRef = CGDisplayStreamCreateWithDispatchQueue(_currentDisplay, self.width, self.height, kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange, (__bridge CFDictionaryRef)(@{(NSString *)kCGDisplayStreamQueueDepth : @20, (NSString *)kCGDisplayStreamMinimumFrameTime : minframetime, (NSString *)kCGDisplayStreamPreserveAspectRatio: @NO}), _capture_queue, ^(CGDisplayStreamFrameStatus status, uint64_t displayTime, IOSurfaceRef frameSurface, CGDisplayStreamUpdateRef updateRef) {
+ if (status == kCGDisplayStreamFrameStatusStopped)
+ {
+ return;
+
+ }
if (frameSurface)
{
@@ -97,22 +128,10 @@
}
- /*
- CVPixelBufferRef tmpbuf;
-
- if (self.videoDelegate)
- {
- CVPixelBufferCreateWithIOSurface(NULL, frameSurface, NULL, &tmpbuf);
- if (tmpbuf)
- {
- [self.videoDelegate captureOutputVideo:nil didOutputSampleBuffer:nil didOutputImage:tmpbuf frameTime:0 ];
- CVPixelBufferRelease(tmpbuf);
- }
- }
- */
}
});
+ CGDisplayStreamStart(_displayStreamRef);
return YES;
}
@@ -136,18 +155,18 @@
}
--(bool)startCaptureSession:(NSError *__autoreleasing *)error
-{
- CGDisplayStreamStart(_displayStreamRef);
- return YES;
-}
--(bool)stopCaptureSession
+-(bool)stopDisplayStream
{
- CGDisplayStreamStop(_displayStreamRef);
+
+ if (_displayStreamRef)
+ {
+ CGDisplayStreamStop(_displayStreamRef);
+ }
+
+
_currentFrame = NULL;
- _capture_queue = NULL;
return YES;
}
diff --git a/CocoaSplit/QTCapture.m b/CocoaSplit/QTCapture.m
index dc8e9ebf..0ec4ad78 100644
--- a/CocoaSplit/QTCapture.m
+++ b/CocoaSplit/QTCapture.m
@@ -42,6 +42,21 @@
}
+-(AbstractCaptureDevice *)activeVideoDevice
+{
+ return _activeVideoDevice;
+}
+
+-(void)setActiveVideoDevice:(AbstractCaptureDevice *)activeVideoDevice
+{
+ _activeVideoDevice = activeVideoDevice;
+ [self stopCaptureSession];
+ [self startCaptureSession];
+
+}
+
+
+
-(void) setVideoDimensions:(int)width height:(int)height
{
return;
@@ -81,7 +96,7 @@
NSMutableArray *__block retArray;
- [_xpcProxy testMethod];
+ //[_xpcProxy testMethod];
[_xpcProxy listCaptureDevices:^(NSArray *r_devices) {
retArray = [[NSMutableArray alloc] init];
@@ -90,6 +105,7 @@
{
[retArray addObject:[[AbstractCaptureDevice alloc] initWithName:[devinstance valueForKey:@"name"] device:[devinstance valueForKey:@"id"] uniqueID:[devinstance valueForKey:@"id"]]];
}
+
[self willChangeValueForKey:@"availableVideoDevices"];
_availableVideoDevices = (NSArray *)retArray;
[self didChangeValueForKey:@"availableVideoDevices"];
@@ -111,6 +127,7 @@
IOSurfaceIncrementUseCount(frameIOref);
+
if (frameIOref)
{
@synchronized(self)
@@ -137,8 +154,10 @@
}
*/
- //ALWAYS REPLY
+
reply();
+
+ //ALWAYS REPLY
}
@@ -151,8 +170,9 @@
}
--(bool) startCaptureSession:(NSError **)error
+-(bool) startCaptureSession
{
+ NSLog(@"STARTING CAPTURE SESSION?");
[_xpcProxy startXPCCaptureSession:self.activeVideoDevice.uniqueID];
@@ -160,13 +180,6 @@
}
--(bool) setupCaptureSession:(NSError *__autoreleasing *)therror
-{
-
- return YES;
-
-}
-
void QTPixelBufferRelease(void *releaseRefCon, const void *baseAddress)
{
diff --git a/CocoaSplit/SyphonCapture.m b/CocoaSplit/SyphonCapture.m
index 686874de..bfff9909 100644
--- a/CocoaSplit/SyphonCapture.m
+++ b/CocoaSplit/SyphonCapture.m
@@ -16,6 +16,24 @@
+@synthesize activeVideoDevice = _activeVideoDevice;
+
+
+
+
+-(AbstractCaptureDevice *)activeVideoDevice
+{
+ return _activeVideoDevice;
+}
+
+-(void)setActiveVideoDevice:(AbstractCaptureDevice *)activeVideoDevice
+{
+ _activeVideoDevice = activeVideoDevice;
+ [self startSyphon];
+}
+
+
+
-(void) setVideoDimensions:(int)width height:(int)height
{
self.width = width;
@@ -65,44 +83,45 @@
}
--(bool) setupCaptureSession:(NSError *__autoreleasing *)therror
+-(id) init
{
- NSOpenGLPixelFormatAttribute glAttributes[] = {
+ if (self = [super init])
+ {
+ NSOpenGLPixelFormatAttribute glAttributes[] = {
+
+ NSOpenGLPFAPixelBuffer,
+ NSOpenGLPFANoRecovery,
+ NSOpenGLPFAAccelerated,
+ NSOpenGLPFADepthSize, 32,
+ (NSOpenGLPixelFormatAttribute) 0
+
+ };
+ NSOpenGLPixelFormat *pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:glAttributes];
+
+ if (!pixelFormat)
+ {
+ return NO;
+ }
+
+ _ogl_ctx = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:nil];
+
+ if (!_ogl_ctx)
+ {
+ return NO;
+ }
+
+ CVReturn result;
+
+ result = CVOpenGLTextureCacheCreate(kCFAllocatorDefault, NULL, [_ogl_ctx CGLContextObj], CGLGetPixelFormat([_ogl_ctx CGLContextObj]), NULL, &_texture_cache);
+
+ if (result != kCVReturnSuccess)
+ {
+ return NO;
+ }
- NSOpenGLPFAPixelBuffer,
- NSOpenGLPFANoRecovery,
- NSOpenGLPFAAccelerated,
- NSOpenGLPFADepthSize, 32,
- (NSOpenGLPixelFormatAttribute) 0
-
- };
- NSOpenGLPixelFormat *pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:glAttributes];
-
- if (!pixelFormat)
- {
- return NO;
}
-
- _ogl_ctx = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:nil];
-
- if (!_ogl_ctx)
- {
- return NO;
- }
-
- CVReturn result;
-
- result = CVOpenGLTextureCacheCreate(kCFAllocatorDefault, NULL, [_ogl_ctx CGLContextObj], CGLGetPixelFormat([_ogl_ctx CGLContextObj]), NULL, &_texture_cache);
-
- if (result != kCVReturnSuccess)
- {
- return NO;
- }
-
- return YES;
-
-
+ return self;
}
@@ -136,7 +155,6 @@
BOOL returnNow = NO;
- BOOL changed = NO;
if (frameSize.width == 0.0f || frameSize.height == 0.0f)
{
@@ -297,22 +315,32 @@
}
--(bool) startCaptureSession:(NSError *__autoreleasing *)error
+-(void) startSyphon
{
+
+ if (_syphon_client)
+ {
+ [_syphon_client stop];
+ _syphon_client = nil;
+ }
+
+
_syphonServer = [self.activeVideoDevice captureDevice];
- NSLog(@"STARTING SYPHON");
- _syphon_client = [[SyphonClient alloc] initWithServerDescription:_syphonServer options:nil newFrameHandler:nil];
+
+ if (_syphonServer)
+ {
+ NSLog(@"STARTING SYPHON");
+ _syphon_client = [[SyphonClient alloc] initWithServerDescription:_syphonServer options:nil newFrameHandler:nil];
+ }
+
/*
_syphon_client = [[SyphonClient alloc] initWithServerDescription:_syphonServer options:nil newFrameHandler:^(SyphonClient *client) {
[self renderNewFrame:client];
}];
*/
-
- return YES;
-
}
diff --git a/CocoaSplit/advancedPrefPanel.xib b/CocoaSplit/advancedPrefPanel.xib
index 52fcb745..dbea2fc5 100644
--- a/CocoaSplit/advancedPrefPanel.xib
+++ b/CocoaSplit/advancedPrefPanel.xib
@@ -1,626 +1,78 @@
-
-
-
- 1080
- 12E55
- 3084
- 1187.39
- 626.00
-
-
- IBNSLayoutConstraint
- NSButton
- NSButtonCell
- NSCustomObject
- NSTextField
- NSTextFieldCell
- NSUserDefaultsController
- NSView
- NSWindowTemplate
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
- YES
- 3
- YES
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CocoaSplit/en.lproj/MainMenu.xib b/CocoaSplit/en.lproj/MainMenu.xib
index 1248bc9a..b34eea3a 100644
--- a/CocoaSplit/en.lproj/MainMenu.xib
+++ b/CocoaSplit/en.lproj/MainMenu.xib
@@ -1,8167 +1,1173 @@
-
-
-
- 1080
- 12E55
- 3084
- 1187.39
- 626.00
-
-
- IBNSLayoutConstraint
- NSArrayController
- NSBox
- NSButton
- NSButtonCell
- NSCustomObject
- NSCustomView
- NSDictionaryController
- NSDrawer
- NSMenu
- NSMenuItem
- NSNumberFormatter
- NSPopUpButton
- NSPopUpButtonCell
- NSScrollView
- NSScroller
- NSSlider
- NSSliderCell
- NSSplitView
- NSTabView
- NSTabViewItem
- NSTableColumn
- NSTableHeaderView
- NSTableView
- NSTextField
- NSTextFieldCell
- NSUserDefaultsController
- NSView
- NSWindowTemplate
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
- YES
- 3
-
- {32, 32}
- {11, 11}
- {10, 3}
- {10, 12}
- {15, 15}
-
- YES
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ NSNegateBoolean
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ name
+ type_name
+ destination
+ active
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/QTCaptureHelper/QTCaptureHelper-Info.plist b/QTCaptureHelper/QTCaptureHelper-Info.plist
index 9dc45c8c..b96d3b18 100644
--- a/QTCaptureHelper/QTCaptureHelper-Info.plist
+++ b/QTCaptureHelper/QTCaptureHelper-Info.plist
@@ -26,6 +26,8 @@
XPCService
+ ProcessType
+ Adaptive
RunLoopType
NSRunLoop
ServiceType
diff --git a/QTCaptureHelper/XPCListenerDelegate.h b/QTCaptureHelper/XPCListenerDelegate.h
index 13aee41a..db9f3495 100644
--- a/QTCaptureHelper/XPCListenerDelegate.h
+++ b/QTCaptureHelper/XPCListenerDelegate.h
@@ -19,6 +19,8 @@
QTCaptureDecompressedVideoOutput *captureOutput;
id xpcProxy;
dispatch_queue_t frameQueue;
+ CVImageBufferRef _currentFrame;
+
}
diff --git a/QTCaptureHelper/XPCListenerDelegate.m b/QTCaptureHelper/XPCListenerDelegate.m
index c19ec542..97a76f96 100644
--- a/QTCaptureHelper/XPCListenerDelegate.m
+++ b/QTCaptureHelper/XPCListenerDelegate.m
@@ -31,6 +31,7 @@
- (void) dealloc
{
+ NSLog(@"HOLY SHIT DEALLOC");
if (self.xpcProxy)
{
[self.xpcProxy release];
@@ -45,6 +46,7 @@
- (BOOL) listener:(NSXPCListener *)listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection
{
+ NSLog(@"SHOULD ACCEPT NEW CONNECTION\n");
NSXPCInterface *helperInterface = [[NSXPCInterface interfaceWithProtocol:@protocol(QTHelperProtocol)] retain];
NSXPCInterface *masterInterface = [[NSXPCInterface interfaceWithProtocol:@protocol(CapturedFrameProtocol)] retain];
@@ -66,6 +68,7 @@
- (void) listCaptureDevices:(void (^)(NSArray *r_devices))reply
{
+
NSArray *devices = [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo];
NSLog(@"DEVICES IN HELPER %@", devices);
@@ -79,7 +82,7 @@
}
- [devices release];
+
reply((NSArray *)retArray);
[retArray release];
}
@@ -141,7 +144,7 @@
NSMutableDictionary *pbAttrs = [NSMutableDictionary dictionaryWithObject:ioAttrs
forKey: (NSString*)kCVPixelBufferIOSurfacePropertiesKey];
- [pbAttrs setObject: @[@(kCVPixelFormatType_422YpCbCr8), @(kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange), @(kCVPixelFormatType_420YpCbCr8BiPlanarFullRange)]
+ [pbAttrs setObject: @[@(kCVPixelFormatType_422YpCbCr8), @(kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange), @(kCVPixelFormatType_420YpCbCr8BiPlanarFullRange)]
forKey:(NSString *)kCVPixelBufferPixelFormatTypeKey];
[self.captureOutput setPixelBufferAttributes:pbAttrs];
@@ -177,7 +180,10 @@
- (void)captureOutput:(QTCaptureOutput *)captureOutput didOutputVideoFrame:(CVImageBufferRef)videoFrame withSampleBuffer:(QTSampleBuffer *)sampleBuffer fromConnection:(QTCaptureConnection *)connection
{
+
CVPixelBufferRetain(videoFrame);
+
+
dispatch_async(frameQueue, ^{
[self sendFrame:videoFrame];
});
diff --git a/StreamServicePanel.xib b/StreamServicePanel.xib
index 8ee83766..51b912d3 100644
--- a/StreamServicePanel.xib
+++ b/StreamServicePanel.xib
@@ -1,1167 +1,146 @@
-
-
-
- 1080
- 12C54
- 2840
- 1187.34
- 625.00
-
-
- IBNSLayoutConstraint
- NSArrayController
- NSButton
- NSButtonCell
- NSCustomObject
- NSMenu
- NSMenuItem
- NSPopUpButton
- NSPopUpButtonCell
- NSTextField
- NSTextFieldCell
- NSUserDefaultsController
- NSView
- NSWindowTemplate
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
- YES
- 3
-
- {11, 11}
- {10, 3}
-
- YES
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file