Remove previous cruft and create androidcamera plugin

diff --git a/sys/androidcamera/Makefile.am b/sys/androidcamera/Makefile.am
index fce98c7..9d446e8 100644 (file)
--- a/sys/androidcamera/Makefile.am
+++ b/sys/androidcamera/Makefile.am
@@ -1,25 +1,7 @@
-plugin_LTLIBRARIES = libgstandroidmedia.la
+plugin_LTLIBRARIES = libgstandroidcamera.la
 
-VIDEO_BASE_CLASSES_C =
-       video/video.c \
-       video/gstvideodecoder.c \
-       video/gstvideoencoder.c \
-       video/gstvideoutils.c
-VIDEO_BASE_CLASSES_H = 
-       video/video.h \
-       video/gstvideodecoder.h \
-       video/gstvideoencoder.h \
-       video/gstvideoutils.h
-
-libgstandroidmedia_la_SOURCES = \
-       gst-androidmedia.c \
-       gstamc.c \
-       gstamcaudiodec.c \
-       gstamcvideodec.c \
-       video/video.c \
-       video/gstvideodecoder.c \
-       video/gstvideoencoder.c \
-       video/gstvideoutils.c \
+libgstandroidcamera_la_SOURCES = \
+       gst-androidcamera.c \
        gst-dvm.c \
        gst-android-hardware-camera.c \
        gst-android-graphics-surfacetexture.c \
@@ -27,57 +9,36 @@ libgstandroidmedia_la_SOURCES = \
        gstahcsrc.c
 
 noinst_HEADERS = \
-       gstamc.h \
-       gstamc-constants.h \
-       gstamcaudiodec.h \
-       gstamcvideodec.h \
-       video/video.h \
-       video/gstvideodecoder.h \
-       video/gstvideoencoder.h \
-       video/gstvideoutils.h \
        gst-dvm.h \
        gst-android-hardware-camera.h \
        gst-android-graphics-surfacetexture.h \
        gst-android-graphics-imageformat.h \
        gstahcsrc.h
 
-if !HAVE_GST_0_10_37
-libgstandroidmedia_la_SOURCES += $(VIDEO_BASE_CLASSES_C)
-noinst_HEADERS += $(VIDEO_BASE_CLASSES_H)
-endif
-
-libgstandroidmedia_la_CFLAGS = \
+libgstandroidcamera_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS) \
-       $(ORC_CFLAGS) \
-       $(JAVA_CFLAGS) \
        -I$(srcdir)
-libgstandroidmedia_la_LIBADD = \
+libgstandroidcamera_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
-       -lgstaudio-@GST_MAJORMINOR@ \
-       -lgstpbutils-@GST_MAJORMINOR@ \
-       -lgstvideo-@GST_MAJORMINOR@ \
        $(GST_BASE_LIBS) \
-       $(GST_LIBS) \
-       $(ORC_LIBS)
-libgstandroidmedia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-if !GST_PLUGIN_BUILD_STATIC
-libgstandroidmedia_la_LIBTOOLFLAGS = --tag=disable-static
-endif
+       $(GST_LIBS)
+libgstandroidcamera_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstandroidcamera_la_LIBTOOLFLAGS = --tag=disable-static
 
 EXTRA_DIST = $(VIDEO_BASE_CLASSES_C) $(VIDEO_BASE_CLASSES_H)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
        androgenizer \
-       -:PROJECT libgstandroidmedia -:SHARED libgstandroidmedia \
+       -:PROJECT libgstandroidcamera -:SHARED libgstandroidcamera \
         -:TAGS eng debug \
          -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstandroidmedia_la_SOURCES) \
-                  $(nodist_libgstandroidmedia_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstandroidmedia_la_CFLAGS) \
-        -:LDFLAGS $(libgstandroidmedia_la_LDFLAGS) \
-                  $(libgstandroidmedia_la_LIBADD) \
+        -:SOURCES $(libgstandroidcamera_la_SOURCES) \
+                  $(libgstandroidcamera_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstandroidcamera_la_CFLAGS) \
+        -:LDFLAGS $(libgstandroidcamera_la_LDFLAGS) \
+                  $(libgstandroidcamera_la_LIBADD) \
                   -ldl \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
                       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-@GST_MAJOR_MINOR@' \

diff --git a/sys/androidcamera/gst-androidmedia.c b/sys/androidcamera/gst-androidcamera.c
similarity index 86%
rename from sys/androidcamera/gst-androidmedia.c
rename to sys/androidcamera/gst-androidcamera.c
index ad44149..68c6a6b 100644 (file)
--- a/sys/androidcamera/gst-androidmedia.c
+++ b/sys/androidcamera/gst-androidcamera.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012, Collabora Ltd.
- *   Author: Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * Copyright (C) 2012, Cisco Systems, Inc.
+ *   Author: Youness Alaoui <youness.alaoui@collabora.co.uk>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,6 @@
 
 #include <gst/gst.h>
 
-#include "gstamc.h"
 #include "gst-dvm.h"
 #include "gst-android-hardware-camera.h"
 #include "gstahcsrc.h"
@@ -32,9 +31,6 @@
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_amc_init (plugin))
-    return FALSE;
-
   if (!gst_dvm_init ())
     return FALSE;
 
@@ -58,15 +54,15 @@ plugin_init (GstPlugin * plugin)
 #ifdef GST_PLUGIN_DEFINE2
 GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    androidmedia,
-    "Android Media plugin",
+    androidcamera,
+    "Android Camera plugin",
     plugin_init,
     PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
 #else
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    "androidmedia",
-    "Android Media plugin",
+    "androidcamera",
+    "Android Camera plugin",
     plugin_init,
     PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
 #endif