diff --git a/subprojects/gst-plugins-bad/sys/applemedia/avfdeviceprovider.m b/subprojects/gst-plugins-bad/sys/applemedia/avfdeviceprovider.m index a6279dff56..24b5aac0af 100644 --- a/subprojects/gst-plugins-bad/sys/applemedia/avfdeviceprovider.m +++ b/subprojects/gst-plugins-bad/sys/applemedia/avfdeviceprovider.m @@ -97,8 +97,9 @@ gst_avf_device_provider_probe (GstDeviceProvider * provider) GList *result; result = NULL; - +G_GNUC_BEGIN_IGNORE_DEPRECATIONS NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]; +G_GNUC_END_IGNORE_DEPRECATIONS AVCaptureVideoDataOutput *output = [[AVCaptureVideoDataOutput alloc] init]; for (int i = 0; i < [devices count]; i++) { AVCaptureDevice *device = [devices objectAtIndex:i]; diff --git a/subprojects/gst-plugins-bad/sys/applemedia/avfvideosrc.m b/subprojects/gst-plugins-bad/sys/applemedia/avfvideosrc.m index 28d9493a80..19dbd68f3c 100644 --- a/subprojects/gst-plugins-bad/sys/applemedia/avfvideosrc.m +++ b/subprojects/gst-plugins-bad/sys/applemedia/avfvideosrc.m @@ -266,7 +266,7 @@ static AVCaptureDeviceType GstAVFVideoSourceDeviceType2AVCaptureDeviceType(GstAV case GST_AVF_VIDEO_SOURCE_DEVICE_TYPE_BUILT_IN_TELEPHOTO_CAMERA: return AVCaptureDeviceTypeBuiltInTelephotoCamera; case GST_AVF_VIDEO_SOURCE_DEVICE_TYPE_BUILT_IN_DUAL_CAMERA: - return AVCaptureDeviceTypeBuiltInDuoCamera; + return AVCaptureDeviceTypeBuiltInDualCamera; case GST_AVF_VIDEO_SOURCE_DEVICE_TYPE_DEFAULT: g_assert_not_reached(); } @@ -421,7 +421,9 @@ static AVCaptureVideoOrientation GstAVFVideoSourceOrientation2AVCaptureVideoOrie return NO; } } else { // deviceIndex takes priority over position and deviceType +G_GNUC_BEGIN_IGNORE_DEPRECATIONS NSArray *devices = [AVCaptureDevice devicesWithMediaType:mediaType]; +G_GNUC_END_IGNORE_DEPRECATIONS if (deviceIndex >= [devices count]) { GST_ELEMENT_ERROR (element, RESOURCE, NOT_FOUND, ("Invalid video capture device index"), (NULL)); @@ -717,6 +719,7 @@ static AVCaptureVideoOrientation GstAVFVideoSourceOrientation2AVCaptureVideoOrie NULL)); } #else + (void) pixel_formats; GST_WARNING ("Screen capture is not supported by iOS"); #endif return result; diff --git a/subprojects/gst-plugins-bad/sys/applemedia/iosassetsrc.h b/subprojects/gst-plugins-bad/sys/applemedia/iosassetsrc.h index f215ab7299..bfe380950d 100644 --- a/subprojects/gst-plugins-bad/sys/applemedia/iosassetsrc.h +++ b/subprojects/gst-plugins-bad/sys/applemedia/iosassetsrc.h @@ -28,6 +28,9 @@ #include #include + +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + #include #include @@ -63,6 +66,7 @@ typedef struct _GstIOSAssetSrcClass GstIOSAssetSrcClass; - (ALAssetRepresentation *) assetForURLSync:(NSURL*) uri; @end +G_GNUC_END_IGNORE_DEPRECATIONS /** * GstIOSAssetSrc: diff --git a/subprojects/gst-plugins-bad/sys/applemedia/iosassetsrc.m b/subprojects/gst-plugins-bad/sys/applemedia/iosassetsrc.m index 8e7bf9b22c..f5fe2189d2 100644 --- a/subprojects/gst-plugins-bad/sys/applemedia/iosassetsrc.m +++ b/subprojects/gst-plugins-bad/sys/applemedia/iosassetsrc.m @@ -436,6 +436,7 @@ gst_ios_asset_src_uri_handler_init (gpointer g_iface, gpointer iface_data) iface->set_uri = gst_ios_asset_src_uri_set_uri; } +G_GNUC_BEGIN_IGNORE_DEPRECATIONS @implementation GstAssetsLibrary @@ -477,3 +478,5 @@ gst_ios_asset_src_uri_handler_init (gpointer g_iface, gpointer iface_data) return self.result; } @end + +G_GNUC_END_IGNORE_DEPRECATIONS diff --git a/subprojects/gst-plugins-bad/sys/applemedia/videotexturecache-gl.m b/subprojects/gst-plugins-bad/sys/applemedia/videotexturecache-gl.m index 6315041b16..95ac194c54 100644 --- a/subprojects/gst-plugins-bad/sys/applemedia/videotexturecache-gl.m +++ b/subprojects/gst-plugins-bad/sys/applemedia/videotexturecache-gl.m @@ -21,6 +21,10 @@ # include "config.h" #endif +#include + +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + #if !HAVE_IOS #import #include "iosurfaceglmemory.h" @@ -203,7 +207,7 @@ _do_create_memory (GstGLContext * context, ContextThreadData * data) plane = 0; goto success; case GST_VIDEO_FORMAT_NV12: { - GstGLFormat texifmt, texfmt; + GstGLFormat texfmt; if (plane == 0) texformat = GST_GL_LUMINANCE; @@ -260,3 +264,5 @@ gst_video_texture_cache_gl_create_memory (GstVideoTextureCache * cache, return data.memory; } + +G_GNUC_END_IGNORE_DEPRECATIONS