Adding audio to opencv

diff --git a/modules/highgui/include/opencv2/highgui/cap_ios.h b/modules/highgui/include/opencv2/highgui/cap_ios.h
index bf20174..e031764 100644 (file)
--- a/modules/highgui/include/opencv2/highgui/cap_ios.h
+++ b/modules/highgui/include/opencv2/highgui/cap_ios.h
@@ -40,6 +40,7 @@
 {
     AVCaptureSession* captureSession;
     AVCaptureConnection* videoCaptureConnection;
+    AVCaptureConnection* audioCaptureConnection;
     AVCaptureVideoPreviewLayer *captureVideoPreviewLayer;
 
     UIDeviceOrientation currentDeviceOrientation;
@@ -63,6 +64,7 @@
 
 @property (nonatomic, retain) AVCaptureSession* captureSession;
 @property (nonatomic, retain) AVCaptureConnection* videoCaptureConnection;
+@property (nonatomic, retain) AVCaptureConnection* audioCaptureConnection;
 
 @property (nonatomic, readonly) BOOL running;
 @property (nonatomic, readonly) BOOL captureSessionLoaded;

diff --git a/modules/highgui/src/cap_ios_abstract_camera.mm b/modules/highgui/src/cap_ios_abstract_camera.mm
index 6073a31..f4f706a 100644 (file)
--- a/modules/highgui/src/cap_ios_abstract_camera.mm
+++ b/modules/highgui/src/cap_ios_abstract_camera.mm
@@ -35,7 +35,9 @@
 
 #pragma mark - Private Interface
 
-@interface CvAbstractCamera ()
+@interface CvAbstractCamera () {
+    AVCaptureAudioDataOutput *audioOut; 
+}
 
 @property (nonatomic, retain) AVCaptureVideoPreviewLayer* captureVideoPreviewLayer;
 
@@ -72,6 +74,7 @@
 @synthesize captureSession;
 @synthesize captureVideoPreviewLayer;
 @synthesize videoCaptureConnection;
+@synthesize audioCaptureConnection;
 @synthesize running;
 @synthesize captureSessionLoaded;
 @synthesize useAVCaptureVideoPreviewLayer;
@@ -206,6 +209,7 @@
     self.captureSession = nil;
     self.captureVideoPreviewLayer = nil;
     self.videoCaptureConnection = nil;
+    self.audioCaptureConnection = nil;
     captureSessionLoaded = NO;
 }
 
@@ -273,14 +277,121 @@
         NSLog(@"[Camera] Error: could not set session preset");
     }
 
-    AVCaptureDevice *audioCaptureDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeAudio];
+}
+
+#if 0
+- (void)sampleCaptureSessionSetup {
+
+    if ( _captureSession ) {
+        return;
+    }
+
+    _captureSession = [[AVCaptureSession alloc] init];  
+
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(captureSessionNotification:) name:nil object:_captureSession];
+    _applicationWillEnterForegroundNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationWillEnterForegroundNotification object:[UIApplication sharedApplication] queue:nil usingBlock:^(NSNotification *note) {
+        // Retain self while the capture session is alive by referencing it in this observer block which is tied to the session lifetime
+        // Client must stop us running before we can be deallocated
+        [self applicationWillEnterForeground];
+    }];
+
+#if RECORD_AUDIO
+    /* Audio */
+    AVCaptureDevice *audioDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeAudio];
+    AVCaptureDeviceInput *audioIn = [[AVCaptureDeviceInput alloc] initWithDevice:audioDevice error:nil];
+    if ( [_captureSession canAddInput:audioIn] ) {
+        [_captureSession addInput:audioIn];
+    }
+    [audioIn release];
+
+    AVCaptureAudioDataOutput *audioOut = [[AVCaptureAudioDataOutput alloc] init];
+    // Put audio on its own queue to ensure that our video processing doesn't cause us to drop audio
+    dispatch_queue_t audioCaptureQueue = dispatch_queue_create( "com.apple.sample.capturepipeline.audio", DISPATCH_QUEUE_SERIAL );
+    [audioOut setSampleBufferDelegate:self queue:audioCaptureQueue];
+    [audioCaptureQueue release];
+
+    if ( [_captureSession canAddOutput:audioOut] ) {
+        [_captureSession addOutput:audioOut];
+    }
+    self.audioConnection = [audioOut connectionWithMediaType:AVMediaTypeAudio];
+    [audioOut release];
+#endif // RECORD_AUDIO
+
+    /* Video */
+    AVCaptureDevice *videoDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
+    _videoDevice = videoDevice;
+    AVCaptureDeviceInput *videoIn = [[AVCaptureDeviceInput alloc] initWithDevice:videoDevice error:nil];
+    if ( [_captureSession canAddInput:videoIn] ) {
+        [_captureSession addInput:videoIn];
+    }
+    [videoIn release];
+
+    AVCaptureVideoDataOutput *videoOut = [[AVCaptureVideoDataOutput alloc] init];
+    videoOut.videoSettings = @{ (id)kCVPixelBufferPixelFormatTypeKey : @(_renderer.inputPixelFormat) };
+    [videoOut setSampleBufferDelegate:self queue:_videoDataOutputQueue];
+
+    // RosyWriter records videos and we prefer not to have any dropped frames in the video recording.
+    // By setting alwaysDiscardsLateVideoFrames to NO we ensure that minor fluctuations in system load or in our processing time for a given frame won't cause framedrops.
+    // We do however need to ensure that on average we can process frames in realtime.
+    // If we were doing preview only we would probably want to set alwaysDiscardsLateVideoFrames to YES.
+    videoOut.alwaysDiscardsLateVideoFrames = NO;
+
+    if ( [_captureSession canAddOutput:videoOut] ) {
+        [_captureSession addOutput:videoOut];
+    }
+
+    _videoConnection = [videoOut connectionWithMediaType:AVMediaTypeVideo];
+
+    int frameRate;
+    NSString *sessionPreset = AVCaptureSessionPresetHigh;
+    CMTime frameDuration = kCMTimeInvalid;
+    // For single core systems like iPhone 4 and iPod Touch 4th Generation we use a lower resolution and framerate to maintain real-time performance.
+    if ( [NSProcessInfo processInfo].processorCount == 1 )
+    {
+        if ( [_captureSession canSetSessionPreset:AVCaptureSessionPreset640x480] ) {
+            sessionPreset = AVCaptureSessionPreset640x480;
+        }
+        frameRate = 15;
+    }
+    else
+    {
+#if ! USE_OPENGL_RENDERER
+        // When using the CPU renderers or the CoreImage renderer we lower the resolution to 720p so that all devices can maintain real-time performance (this is primarily for A5 based devices like iPhone 4s and iPod Touch 5th Generation).
+        if ( [_captureSession canSetSessionPreset:AVCaptureSessionPreset1280x720] ) {
+            sessionPreset = AVCaptureSessionPreset1280x720;
+        }
+#endif // ! USE_OPENGL_RENDERER
+
+        frameRate = 30;
+    }
+
+    _captureSession.sessionPreset = sessionPreset;
+
+    frameDuration = CMTimeMake( 1, frameRate );
+
     NSError *error = nil;
-    AVCaptureDeviceInput *audioInput = [AVCaptureDeviceInput deviceInputWithDevice:audioCaptureDevice error:&error];
-    if (audioInput) {
-        NSLog(@"Adding audio capture devices ");
-        [self.captureSession addInput:audioInput];
+    if ( [videoDevice lockForConfiguration:&error] ) {
+        videoDevice.activeVideoMaxFrameDuration = frameDuration;
+        videoDevice.activeVideoMinFrameDuration = frameDuration;
+        [videoDevice unlockForConfiguration];
     }
+    else {
+        NSLog( @"videoDevice lockForConfiguration returned error %@", error );
+    }
+
+    // Get the recommended compression settings after configuring the session/device.
+#if RECORD_AUDIO
+    _audioCompressionSettings = [[audioOut recommendedAudioSettingsForAssetWriterWithOutputFileType:AVFileTypeQuickTimeMovie] copy];
+#endif
+    _videoCompressionSettings = [[videoOut recommendedVideoSettingsForAssetWriterWithOutputFileType:AVFileTypeQuickTimeMovie] copy];
+
+    self.videoOrientation = _videoConnection.videoOrientation;
+
+    [videoOut release];
+
+    return;
 }
+#endif
 
 - (void)createCaptureDevice;
 {
@@ -289,6 +400,34 @@
     [self setDesiredCameraPosition:self.defaultAVCaptureDevicePosition];
     NSLog(@"[Camera] device connected? %@", device.connected ? @"YES" : @"NO");
     NSLog(@"[Camera] device position %@", (device.position == AVCaptureDevicePositionBack) ? @"back" : @"front");
+
+    AVCaptureDevice *audioCaptureDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeAudio];
+    NSError *error = nil;
+    //AVCaptureDeviceInput *audioInput = [AVCaptureDeviceInput deviceInputWithDevice:audioCaptureDevice error:&error];
+    AVCaptureDeviceInput *audioInput = [[AVCaptureDeviceInput alloc] initWithDevice:audioCaptureDevice error:nil];
+    if (audioInput) {
+        NSLog(@"Adding audio capture devices ");
+        [self.captureSession addInput:audioInput];
+        [audioInput release];
+    }
+
+    
+    // Put audio on its own queue to ensure that our video processing doesn't cause us to drop audio
+    audioOut = [[AVCaptureAudioDataOutput alloc] init];
+    dispatch_queue_t audioCaptureQueue = dispatch_queue_create("opencv.ios.audio", DISPATCH_QUEUE_SERIAL );
+    [audioOut setSampleBufferDelegate:self queue:audioCaptureQueue];
+
+    if ( [self.captureSession canAddOutput:audioOut] ) {
+        [self.captureSession addOutput:audioOut];
+        NSLog(@"audioOut added ");
+    }
+
+    [audioCaptureQueue release];
+
+    self.audioCaptureConnection = [audioOut connectionWithMediaType:AVMediaTypeAudio];
+
+    NSLog(@"Audio has been setup with callback ");
+
 }
 
 

diff --git a/modules/highgui/src/cap_ios_video_camera.mm b/modules/highgui/src/cap_ios_video_camera.mm
index 50c515b..343ffde 100644 (file)
--- a/modules/highgui/src/cap_ios_video_camera.mm
+++ b/modules/highgui/src/cap_ios_video_camera.mm
@@ -117,13 +117,9 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;};
             NSLog(@"[Camera] Delete file %@", [self videoFileString]);
         }
 
-#if 0
         if ([[NSFileManager defaultManager] fileExistsAtPath:[self mediaFileString]]) {
             [[NSFileManager defaultManager] removeItemAtPath:[self mediaFileString] error:&error];
         }
-        
-        [self.movieFileOutput startRecordingToOutputFileURL:[self mediaFileURL] recordingDelegate:self];
-#endif
     }
 }
 
@@ -309,6 +305,9 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;};
     }
     [[self.videoDataOutput connectionWithMediaType:AVMediaTypeVideo] setEnabled:YES];
 
+    //self.videoCaptureConnection = [self.videoDataOutput connectionWithMediaType:AVMediaTypeVideo];
+    //[self.videoCaptureConnection setEnabled:YES];
+
 
     // set default FPS
     if ([self.videoDataOutput connectionWithMediaType:AVMediaTypeVideo].supportsVideoMinFrameDuration) {
@@ -351,13 +350,13 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;};
 
 - (void)createMovieFileOutput; 
 {
+    NSLog(@"createVideoFileOutput...");
     self.movieFileOutput  = [[AVCaptureMovieFileOutput alloc] init];
     CMTime maxDuration = CMTimeMake(30*60, 1);
     movieFileOutput.maxRecordedDuration = maxDuration;
     movieFileOutput.minFreeDiskSpaceLimit = (1024L)*(1024L*1024L);
     movieFileOutput.maxRecordedFileSize = (400L)*(1024L*1024L);
 
-    NSLog(@"createVideoFileOutput...");
 
     if ([self.captureSession canAddOutput:movieFileOutput]) {
         [captureSession addOutput:movieFileOutput];
@@ -366,6 +365,9 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;};
     else {
         NSLog(@"Couldn't add movie output ");
     }
+
+    if (self.recordVideo == YES)
+        [self.movieFileOutput startRecordingToOutputFileURL:[self mediaFileURL] recordingDelegate:self];
 }
 
 
@@ -480,6 +482,13 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;};
 {
     (void)captureOutput;
     (void)connection;
+
+    if (connection == self.audioCaptureConnection) {
+        NSLog(@"Audio Sample came in ");
+        return;
+    }
+
+    //NSLog(@"Video sample came in ");
     if (self.delegate) {
 
         // convert from Core Media to Core Video
@@ -674,6 +683,7 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;};
     if ([fileManager fileExistsAtPath:outputPath]) {
         NSLog(@"file exists");
     }
+    NSLog(@"media URL %@", outputURL);
     return outputURL;
 }
 
@@ -685,7 +695,7 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;};
 
 
 - (NSString*) mediaFileString {
-    NSString *outputPath = [[NSString alloc] initWithFormat:@"%@-%@", NSTemporaryDirectory(), @"media.mov"];
+    NSString *outputPath = [[NSString alloc] initWithFormat:@"%@%@", NSTemporaryDirectory(), @"media.mov"];
     return outputPath;
 }
 @end