Remove unported and useless osxvideosrc element

There are other elements for this now.
This commit is contained in:
Tim-Philipp Müller 2015-03-14 14:43:37 +00:00
parent f532a72406
commit bcde1a015c
6 changed files with 3 additions and 1558 deletions

View file

@ -422,7 +422,7 @@ GST_PLUGINS_NONPORTED=" cdxaparse \
gsettings \
musepack nas sdl timidity \
acm wininet \
xvid lv2 teletextdec sndio osx_video libvisual"
xvid lv2 teletextdec sndio libvisual"
AC_SUBST(GST_PLUGINS_NONPORTED)
dnl these are all the gst plug-ins, compilable without additional libs
@ -1631,22 +1631,6 @@ AG_GST_CHECK_FEATURE(BLUEZ, [Bluez], bluez, [
])
])
dnl *** OS X videosrc ***
translit(dnm, m, l) AM_CONDITIONAL(USE_OSX_VIDEO, true)
HAVE_OSX_VIDEO="no"
AG_GST_CHECK_FEATURE(OSX_VIDEO, [OSX video], osxvideosrc, [
AC_CHECK_TYPE([SeqGrabComponent], HAVE_OSX_VIDEO="yes", HAVE_OSX_VIDEO="no",
[#include <Quicktime/Quicktime.h>])
])
dnl in case header Quicktime/Quicktime.h is found on other platforms
case "$host" in
*-*darwin*)
;;
*)
HAVE_OSX_VIDEO="no"
;;
esac
dnl *** OS/X AVCVideoServices ***
translit(dnm, m, l) AM_CONDITIONAL(USE_AVC, true)
HAVE_AVC="no"

View file

@ -88,12 +88,6 @@ else
LINSYS_DIR=
endif
if USE_OSX_VIDEO
OSX_VIDEO_DIR=osxvideo
else
OSX_VIDEO_DIR=
endif
if USE_PVR
PVR_DIR=pvr2d
else
@ -148,9 +142,9 @@ else
UVCH264_DIR=
endif
SUBDIRS = $(ACM_DIR) $(ANDROID_MEDIA_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(BLUEZ_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTSOUND_DIR) $(WINKS_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OPENSLES_DIR) $(OSX_VIDEO_DIR) $(PVR_DIR) $(SHM_DIR) $(UVCH264_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR) $(WASAPI_DIR)
SUBDIRS = $(ACM_DIR) $(ANDROID_MEDIA_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(BLUEZ_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTSOUND_DIR) $(WINKS_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OPENSLES_DIR) $(PVR_DIR) $(SHM_DIR) $(UVCH264_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR) $(WASAPI_DIR)
DIST_SUBDIRS = acmenc acmmp3dec androidmedia applemedia applemedia-nonpublic avc bluez d3dvideosink decklink directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \
opensles osxvideo pvr2d shm uvch264 vcd vdpau wasapi wininet winks winscreencap
opensles pvr2d shm uvch264 vcd vdpau wasapi wininet winks winscreencap
include $(top_srcdir)/common/parallel-subdirs.mak

View file

@ -1,16 +0,0 @@
plugin_LTLIBRARIES = libgstosxvideosrc.la
libgstosxvideosrc_la_SOURCES = osxvideoplugin.c osxvideosrc.c
libgstosxvideosrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) -Wno-deprecated-declarations
libgstosxvideosrc_la_LIBADD = \
$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
-lgstinterfaces-$(GST_API_VERSION)
libgstosxvideosrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
libgstosxvideosrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \
-Wl,-framework -Wl,Cocoa -Wl,-framework -Wl,QuickTime
noinst_HEADERS = osxvideosrc.h

View file

@ -1,50 +0,0 @@
/* GStreamer
* OSX video src
* Copyright (C) 2004-6 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
* The development of this code was made possible due to the involvement of
* Pioneers of the Inevitable, the creators of the Songbird Music player.
*
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/* Object header */
#include "osxvideosrc.h"
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "osxvideosrc",
GST_RANK_PRIMARY, GST_TYPE_OSX_VIDEO_SRC))
return FALSE;
GST_DEBUG_CATEGORY_INIT (gst_debug_osx_video_src, "osxvideosrc", 0,
"osxvideosrc element");
return TRUE;
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
osxvideosrc,
"OSX native video input plugin",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

File diff suppressed because it is too large Load diff

View file

@ -1,74 +0,0 @@
/*
* GStreamer
* Copyright 2007 Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
* Copyright 2007 Ali Sabil <ali.sabil@tandberg.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_OSX_VIDEO_SRC_H__
#define __GST_OSX_VIDEO_SRC_H__
#include <gst/gst.h>
#include <gst/base/gstpushsrc.h>
#include <Quicktime/Quicktime.h>
GST_DEBUG_CATEGORY_EXTERN (gst_debug_osx_video_src);
G_BEGIN_DECLS
/* #defines don't like whitespacey bits */
#define GST_TYPE_OSX_VIDEO_SRC \
(gst_osx_video_src_get_type())
#define GST_OSX_VIDEO_SRC(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSX_VIDEO_SRC,GstOSXVideoSrc))
#define GST_OSX_VIDEO_SRC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSX_VIDEO_SRC,GstOSXVideoSrcClass))
#define GST_IS_OSX_VIDEO_SRC(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSX_VIDEO_SRC))
#define GST_IS_OSX_VIDEO_SRC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSX_VIDEO_SRC))
typedef struct _GstOSXVideoSrc GstOSXVideoSrc;
typedef struct _GstOSXVideoSrcClass GstOSXVideoSrcClass;
struct _GstOSXVideoSrc
{
GstPushSrc pushsrc;
gchar * device_id;
gchar * device_name;
SeqGrabComponent seq_grab;
SGChannel video_chan;
GWorldPtr world;
Rect rect;
ImageSequence dec_seq;
GstBuffer * buffer;
guint seq_num;
};
struct _GstOSXVideoSrcClass
{
GstPushSrcClass parent_class;
gboolean movies_enabled;
};
GType gst_osx_video_src_get_type (void);
G_END_DECLS
#endif /* __GST_OSX_VIDEO_SRC_H__ */