From dd19715961b9f5af270008f3d56b890574802c97 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 23 Sep 2013 11:35:56 +0200 Subject: [PATCH] applemedia: avfvideosrc is not ported to 1.0 yet --- sys/applemedia-nonpublic/Makefile.am | 8 ++++---- sys/applemedia-nonpublic/coremediactx.c | 2 ++ sys/applemedia-nonpublic/plugin.m | 2 ++ sys/applemedia/Makefile.am | 12 ++++++------ sys/applemedia/plugin.m | 4 ++++ 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/sys/applemedia-nonpublic/Makefile.am b/sys/applemedia-nonpublic/Makefile.am index aa2a03c..000f442 100644 --- a/sys/applemedia-nonpublic/Makefile.am +++ b/sys/applemedia-nonpublic/Makefile.am @@ -69,10 +69,10 @@ noinst_HEADERS = \ if HAVE_IOS -libgstapplemedia_nonpublic_la_SOURCES += \ - celvideosrc.c \ - mtapi.c \ - celapi.c +#libgstapplemedia_nonpublic_la_SOURCES += \ +# celvideosrc.c \ +# mtapi.c \ +# celapi.c else diff --git a/sys/applemedia-nonpublic/coremediactx.c b/sys/applemedia-nonpublic/coremediactx.c index ba02e4b..2890205 100644 --- a/sys/applemedia-nonpublic/coremediactx.c +++ b/sys/applemedia-nonpublic/coremediactx.c @@ -44,8 +44,10 @@ static const GstApiProvider api_provider[] = { API_PROVIDER (CORE_VIDEO, cv), API_PROVIDER (CORE_MEDIA, cm), #ifdef HAVE_IOS +#if 0 API_PROVIDER (MEDIA_TOOLBOX, mt), API_PROVIDER (CELESTIAL, cel) +#endif #else API_PROVIDER (MIO, mio), #endif diff --git a/sys/applemedia-nonpublic/plugin.m b/sys/applemedia-nonpublic/plugin.m index 5ece9a5..83742cb 100644 --- a/sys/applemedia-nonpublic/plugin.m +++ b/sys/applemedia-nonpublic/plugin.m @@ -45,8 +45,10 @@ plugin_init (GstPlugin * plugin) gboolean res = TRUE; #ifdef HAVE_IOS +#if 0 res &= gst_element_register (plugin, "celvideosrc", GST_RANK_NONE, GST_TYPE_CEL_VIDEO_SRC); +#endif #else enable_mt_mode (); diff --git a/sys/applemedia/Makefile.am b/sys/applemedia/Makefile.am index 13f7994..f8cdd19 100644 --- a/sys/applemedia/Makefile.am +++ b/sys/applemedia/Makefile.am @@ -71,13 +71,13 @@ noinst_HEADERS = \ if HAVE_IOS -libgstapplemedia_la_SOURCES += \ - avfvideosrc.m +#libgstapplemedia_la_SOURCES += \ +# avfvideosrc.m -libgstapplemedia_la_LDFLAGS += \ - -Wl,-framework -Wl,CoreMedia \ - -Wl,-framework -Wl,Foundation \ - -Wl,-framework -Wl,AVFoundation +#libgstapplemedia_la_LDFLAGS += \ +# -Wl,-framework -Wl,CoreMedia \ +# -Wl,-framework -Wl,Foundation \ +# -Wl,-framework -Wl,AVFoundation else diff --git a/sys/applemedia/plugin.m b/sys/applemedia/plugin.m index 4548b14..de7f3a6 100644 --- a/sys/applemedia/plugin.m +++ b/sys/applemedia/plugin.m @@ -50,8 +50,10 @@ plugin_init (GstPlugin * plugin) gboolean res = TRUE; #ifdef HAVE_IOS +#if 0 res = gst_element_register (plugin, "avfvideosrc", GST_RANK_NONE, GST_TYPE_AVF_VIDEO_SRC); +#endif #else enable_mt_mode (); @@ -67,8 +69,10 @@ plugin_init (GstPlugin * plugin) #endif res &= gst_element_register (plugin, "atdec", GST_RANK_PRIMARY, GST_TYPE_ATDEC); +#ifndef HAVE_IOS gst_vtenc_register_elements (plugin); gst_vtdec_register_elements (plugin); +#endif return res; } -- 2.7.4