From 82c132aa508d5acfa038b509bd6a7f7963118c5f Mon Sep 17 00:00:00 2001 From: Nick Kallen Date: Wed, 8 Mar 2017 14:16:43 +0100 Subject: [PATCH] applemedia/gl: Fix compile issues for OSX https://bugzilla.gnome.org/show_bug.cgi?id=778333 --- ext/gl/Makefile.am | 1 + sys/applemedia/avfvideosrc.m | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/ext/gl/Makefile.am b/ext/gl/Makefile.am index 11734bfb2b..eb31aeb6c1 100644 --- a/ext/gl/Makefile.am +++ b/ext/gl/Makefile.am @@ -125,6 +125,7 @@ endif libgstopengl_la_OBJCFLAGS = \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ + -fobjc-arc \ $(GST_OBJCFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ diff --git a/sys/applemedia/avfvideosrc.m b/sys/applemedia/avfvideosrc.m index a362f6a8ea..c4f3e7e4a6 100644 --- a/sys/applemedia/avfvideosrc.m +++ b/sys/applemedia/avfvideosrc.m @@ -241,6 +241,8 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer @end +#if HAVE_IOS + static AVCaptureDeviceType GstAVFVideoSourceDeviceType2AVCaptureDeviceType(GstAVFVideoSourceDeviceType deviceType) { switch (deviceType) { case GST_AVF_VIDEO_SOURCE_DEVICE_TYPE_BUILT_IN_WIDE_ANGLE_CAMERA: @@ -281,6 +283,8 @@ static AVCaptureVideoOrientation GstAVFVideoSourceOrientation2AVCaptureVideoOrie } } +#endif + @implementation GstAVFVideoSrcImpl @synthesize deviceIndex, position, orientation, deviceType, doStats, @@ -332,6 +336,7 @@ static AVCaptureVideoOrientation GstAVFVideoSourceOrientation2AVCaptureVideoOrie NSError *err; if (deviceIndex == DEFAULT_DEVICE_INDEX) { +#ifdef HAVE_IOS if (deviceType != DEFAULT_DEVICE_TYPE && position != DEFAULT_POSITION) { device = [AVCaptureDevice defaultDeviceWithDeviceType:GstAVFVideoSourceDeviceType2AVCaptureDeviceType(deviceType) @@ -340,6 +345,9 @@ static AVCaptureVideoOrientation GstAVFVideoSourceOrientation2AVCaptureVideoOrie } else { device = [AVCaptureDevice defaultDeviceWithMediaType:mediaType]; } +#else + device = [AVCaptureDevice defaultDeviceWithMediaType:mediaType]; +#endif if (device == nil) { GST_ELEMENT_ERROR (element, RESOURCE, NOT_FOUND, ("No video capture devices found"), (NULL)); @@ -434,8 +442,10 @@ static AVCaptureVideoOrientation GstAVFVideoSourceOrientation2AVCaptureVideoOrie /* retained by session */ connection = [[output connections] firstObject]; +#ifdef HAVE_IOS if (orientation != DEFAULT_ORIENTATION) connection.videoOrientation = GstAVFVideoSourceOrientation2AVCaptureVideoOrientation(orientation); +#endif inputClock = ((AVCaptureInputPort *)connection.inputPorts[0]).clock; *successPtr = YES;