diff options
| author | Florian Zwoch <fzwoch@gmail.com> | 2015-02-25 13:52:21 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-03-06 10:37:37 +0100 |
| commit | a8ae57480cb031b2effc48064da22f860bde2e4d (patch) | |
| tree | 7e9d58b741e4f964cdb075b17c2fc579a28693a1 /sys/applemedia | |
| parent | 1172e2875d2447d5f783e1aa4f54f38fe8da07d6 (diff) | |
| download | gstreamer-plugins-bad-a8ae57480cb031b2effc48064da22f860bde2e4d.tar.gz | |
avfvideosrc: allow "capture-screen" mode to select which screen to capture via the "device-index" option
https://bugzilla.gnome.org/show_bug.cgi?id=745161
Diffstat (limited to 'sys/applemedia')
| -rw-r--r-- | sys/applemedia/avfvideosrc.m | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/sys/applemedia/avfvideosrc.m b/sys/applemedia/avfvideosrc.m index ec225498f..b0246171e 100644 --- a/sys/applemedia/avfvideosrc.m +++ b/sys/applemedia/avfvideosrc.m @@ -24,6 +24,9 @@ #include "avfvideosrc.h" #import <AVFoundation/AVFoundation.h> +#if !HAVE_IOS +#import <AppKit/AppKit.h> +#endif #include <gst/video/video.h> #include <gst/gl/gstglcontext.h> #include "coremediabuffer.h" @@ -75,9 +78,6 @@ G_DEFINE_TYPE (GstAVFVideoSrc, gst_avf_video_src, GST_TYPE_PUSH_SRC); gint deviceIndex; BOOL doStats; -#if !HAVE_IOS - CGDirectDisplayID displayId; -#endif AVCaptureSession *session; AVCaptureInput *input; @@ -126,6 +126,9 @@ G_DEFINE_TYPE (GstAVFVideoSrc, gst_avf_video_src, GST_TYPE_PUSH_SRC); - (BOOL)openDevice; - (void)closeDevice; - (GstVideoFormat)getGstVideoFormat:(NSNumber *)pixel_format; +#if !HAVE_IOS +- (CGDirectDisplayID)getDisplayIdFromDeviceIndex; +#endif - (BOOL)getDeviceCaps:(GstCaps *)result; - (BOOL)setDeviceCaps:(GstVideoInfo *)info; - (BOOL)getSessionPresetCaps:(GstCaps *)result; @@ -169,9 +172,6 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer captureScreenMouseClicks = NO; useVideoMeta = NO; textureCache = NULL; -#if !HAVE_IOS - displayId = kCGDirectMainDisplay; -#endif mainQueue = dispatch_queue_create ("org.freedesktop.gstreamer.avfvideosrc.main", NULL); @@ -200,7 +200,7 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer NSString *mediaType = AVMediaTypeVideo; NSError *err; - if (deviceIndex == -1) { + if (deviceIndex == DEFAULT_DEVICE_INDEX) { device = [AVCaptureDevice defaultDeviceWithMediaType:mediaType]; if (device == nil) { GST_ELEMENT_ERROR (element, RESOURCE, NOT_FOUND, @@ -241,8 +241,14 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer #if HAVE_IOS return NO; #else + CGDirectDisplayID displayId; + GST_DEBUG_OBJECT (element, "Opening screen input"); + displayId = [self getDisplayIdFromDeviceIndex]; + if (displayId == 0) + return NO; + AVCaptureScreenInput *screenInput = [[AVCaptureScreenInput alloc] initWithDisplayID:displayId]; @@ -368,6 +374,26 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer return gst_format; } +#if !HAVE_IOS +- (CGDirectDisplayID)getDisplayIdFromDeviceIndex +{ + NSDictionary *description; + NSNumber *displayId; + NSArray *screens = [NSScreen screens]; + + if (deviceIndex == DEFAULT_DEVICE_INDEX) + return kCGDirectMainDisplay; + if (deviceIndex >= [screens count]) { + GST_ELEMENT_ERROR (element, RESOURCE, NOT_FOUND, + ("Invalid screen capture device index"), (NULL)); + return 0; + } + description = [[screens objectAtIndex:deviceIndex] deviceDescription]; + displayId = [description objectForKey:@"NSScreenNumber"]; + return [displayId unsignedIntegerValue]; +} +#endif + - (BOOL)getDeviceCaps:(GstCaps *)result { NSArray *formats = [device valueForKey:@"formats"]; @@ -547,7 +573,7 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer if (captureScreen) { #if !HAVE_IOS - CGRect rect = CGDisplayBounds (displayId); + CGRect rect = CGDisplayBounds ([self getDisplayIdFromDeviceIndex]); for (NSNumber *pixel_format in pixel_formats) { GstVideoFormat gst_format = [self getGstVideoFormat:pixel_format]; if (gst_format != GST_VIDEO_FORMAT_UNKNOWN) |