From 030f639a8e4eb1ab2fcf03301d0a39168e7e3ab7 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Thu, 27 Jan 2011 17:28:51 +0100 Subject: [PATCH] android: make it ready for androgenizer Remove the android/ top dir Fixe the Makefile.am to be androgenized To build gstreamer for android we are now using androgenizer which generates the needed Android.mk files. Androgenizer can be found here: http://git.collabora.co.uk/?p=user/derek/androgenizer.git --- Android.mk | 140 ++++-- android/alsa.mk | 18 +- android/app.mk | 26 +- android/app_plugin.mk | 19 +- android/audio.mk | 31 +- android/audioconvert.mk | 21 +- android/audioresample.mk | 38 ++ android/audiotestsrc.mk | 35 ++ android/decodebin.mk | 26 +- android/decodebin2.mk | 27 +- android/ffmpegcolorspace.mk | 40 ++ android/gdp.mk | 20 +- android/gst-libs/gst/app/gstapp-marshal.c | 152 ------- android/gst-libs/gst/app/gstapp-marshal.h | 39 -- android/gst-libs/gst/audio/audio-enumtypes.c | 175 -------- android/gst-libs/gst/audio/audio-enumtypes.h | 29 -- .../gst-libs/gst/interfaces/interfaces-enumtypes.c | 276 ------------ .../gst-libs/gst/interfaces/interfaces-enumtypes.h | 49 --- .../gst-libs/gst/interfaces/interfaces-marshal.c | 209 --------- .../gst-libs/gst/interfaces/interfaces-marshal.h | 52 --- android/gst-libs/gst/pbutils/pbutils-enumtypes.c | 45 -- android/gst-libs/gst/pbutils/pbutils-enumtypes.h | 19 - android/gst-libs/gst/rtsp/gstrtsp-enumtypes.c | 391 ----------------- android/gst-libs/gst/rtsp/gstrtsp-enumtypes.h | 35 -- android/gst-libs/gst/rtsp/gstrtsp-marshal.c | 85 ---- android/gst-libs/gst/rtsp/gstrtsp-marshal.h | 20 - android/gst-libs/gst/video/video-enumtypes.c | 45 -- android/gst-libs/gst/video/video-enumtypes.h | 19 - android/gst/playback/gstplay-marshal.c | 468 --------------------- android/gst/playback/gstplay-marshal.h | 108 ----- android/gst/tcp/gsttcp-enumtypes.c | 25 -- android/gst/tcp/gsttcp-enumtypes.h | 19 - android/gst/tcp/gsttcp-marshal.c | 186 -------- android/gst/tcp/gsttcp-marshal.h | 47 --- android/interfaces.mk | 30 +- android/netbuffer.mk | 21 +- android/pbutils.mk | 69 ++- android/playbin.mk | 31 +- android/queue2.mk | 25 +- android/riff.mk | 20 +- android/rtp.mk | 21 +- android/rtsp.mk | 32 +- android/sdp.mk | 21 +- android/tag.mk | 21 +- android/tcp.mk | 26 +- android/typefindfunctions.mk | 21 +- android/video.mk | 34 +- android/videoscale.mk | 40 ++ android/videotestsrc.mk | 38 ++ ext/ogg/Makefile.am | 14 + gst-libs/gst/app/Makefile.am | 15 + gst-libs/gst/audio/Makefile.am | 16 + gst-libs/gst/fft/Makefile.am | 14 + gst-libs/gst/interfaces/Makefile.am | 16 + gst-libs/gst/netbuffer/Makefile.am | 14 + gst-libs/gst/pbutils/Makefile.am | 16 + gst-libs/gst/riff/Makefile.am | 14 + gst-libs/gst/rtp/Makefile.am | 14 + gst-libs/gst/rtsp/Makefile.am | 16 + gst-libs/gst/sdp/Makefile.am | 14 + gst-libs/gst/tag/Makefile.am | 14 + gst-libs/gst/video/Makefile.am | 16 + gst/adder/Makefile.am | 16 +- gst/app/Makefile.am | 13 + gst/audioconvert/Makefile.am | 15 + gst/audiorate/Makefile.am | 13 + gst/audioresample/Makefile.am | 13 + gst/audiotestsrc/Makefile.am | 14 + gst/encoding/Makefile.am | 14 + gst/ffmpegcolorspace/Makefile.am | 14 + gst/ffmpegcolorspace/gstffmpegcodecmap.h | 2 +- gst/gdp/Makefile.am | 14 + gst/playback/Makefile.am | 38 ++ gst/tcp/Makefile.am | 15 + gst/typefind/Makefile.am | 14 + gst/videorate/Makefile.am | 13 + gst/videoscale/Makefile.am | 14 + gst/videotestsrc/Makefile.am | 14 + gst/volume/Makefile.am | 15 +- tools/Makefile.am | 11 + 80 files changed, 883 insertions(+), 2956 deletions(-) create mode 100644 android/audioresample.mk create mode 100644 android/audiotestsrc.mk create mode 100644 android/ffmpegcolorspace.mk delete mode 100644 android/gst-libs/gst/app/gstapp-marshal.c delete mode 100644 android/gst-libs/gst/app/gstapp-marshal.h delete mode 100644 android/gst-libs/gst/audio/audio-enumtypes.c delete mode 100644 android/gst-libs/gst/audio/audio-enumtypes.h delete mode 100644 android/gst-libs/gst/interfaces/interfaces-enumtypes.c delete mode 100644 android/gst-libs/gst/interfaces/interfaces-enumtypes.h delete mode 100644 android/gst-libs/gst/interfaces/interfaces-marshal.c delete mode 100644 android/gst-libs/gst/interfaces/interfaces-marshal.h delete mode 100644 android/gst-libs/gst/pbutils/pbutils-enumtypes.c delete mode 100644 android/gst-libs/gst/pbutils/pbutils-enumtypes.h delete mode 100644 android/gst-libs/gst/rtsp/gstrtsp-enumtypes.c delete mode 100644 android/gst-libs/gst/rtsp/gstrtsp-enumtypes.h delete mode 100644 android/gst-libs/gst/rtsp/gstrtsp-marshal.c delete mode 100644 android/gst-libs/gst/rtsp/gstrtsp-marshal.h delete mode 100644 android/gst-libs/gst/video/video-enumtypes.c delete mode 100644 android/gst-libs/gst/video/video-enumtypes.h delete mode 100644 android/gst/playback/gstplay-marshal.c delete mode 100644 android/gst/playback/gstplay-marshal.h delete mode 100644 android/gst/tcp/gsttcp-enumtypes.c delete mode 100644 android/gst/tcp/gsttcp-enumtypes.h delete mode 100644 android/gst/tcp/gsttcp-marshal.c delete mode 100644 android/gst/tcp/gsttcp-marshal.h create mode 100644 android/videoscale.mk create mode 100644 android/videotestsrc.mk diff --git a/Android.mk b/Android.mk index 17622da..eb3b374 100644 --- a/Android.mk +++ b/Android.mk @@ -1,29 +1,121 @@ LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) -GSTREAMER_TOP := $(LOCAL_PATH) +GST_PLUGINS_BASE_TOP := $(LOCAL_PATH) -include $(CLEAR_VARS) +GST_PLUGINS_BASE_BUILT_SOURCES := \ + pkgconfig/gstreamer-app-0.10.pc \ + pkgconfig/gstreamer-audio-0.10.pc \ + pkgconfig/gstreamer-cdda-0.10.pc \ + pkgconfig/gstreamer-fft-0.10.pc \ + pkgconfig/gstreamer-floatcast-0.10.pc \ + pkgconfig/gstreamer-interfaces-0.10.pc \ + pkgconfig/gstreamer-netbuffer-0.10.pc \ + pkgconfig/gstreamer-pbutils-0.10.pc \ + pkgconfig/gstreamer-plugins-base-0.10.pc \ + pkgconfig/gstreamer-riff-0.10.pc \ + pkgconfig/gstreamer-rtp-0.10.pc \ + pkgconfig/gstreamer-rtsp-0.10.pc \ + pkgconfig/gstreamer-sdp-0.10.pc \ + pkgconfig/gstreamer-tag-0.10.pc \ + pkgconfig/gstreamer-video-0.10.pc \ + pkgconfig/gstreamer-app-0.10-uninstalled.pc \ + pkgconfig/gstreamer-audio-0.10-uninstalled.pc \ + pkgconfig/gstreamer-cdda-0.10-uninstalled.pc \ + pkgconfig/gstreamer-fft-0.10-uninstalled.pc \ + pkgconfig/gstreamer-floatcast-0.10-uninstalled.pc \ + pkgconfig/gstreamer-interfaces-0.10-uninstalled.pc \ + pkgconfig/gstreamer-netbuffer-0.10-uninstalled.pc \ + pkgconfig/gstreamer-pbutils-0.10-uninstalled.pc \ + pkgconfig/gstreamer-plugins-base-0.10-uninstalled.pc \ + pkgconfig/gstreamer-riff-0.10-uninstalled.pc \ + pkgconfig/gstreamer-rtp-0.10-uninstalled.pc \ + pkgconfig/gstreamer-rtsp-0.10-uninstalled.pc \ + pkgconfig/gstreamer-sdp-0.10-uninstalled.pc \ + pkgconfig/gstreamer-tag-0.10-uninstalled.pc \ + pkgconfig/gstreamer-video-0.10-uninstalled.pc \ + gst-libs/gst/interfaces/Android.mk \ + gst-libs/gst/tag/Android.mk \ + gst-libs/gst/audio/Android.mk \ + gst-libs/gst/video/Android.mk \ + gst-libs/gst/riff/Android.mk \ + gst-libs/gst/pbutils/Android.mk \ + gst-libs/gst/rtp/Android.mk \ + gst-libs/gst/rtsp/Android.mk \ + gst-libs/gst/netbuffer/Android.mk \ + gst-libs/gst/sdp/Android.mk \ + gst-libs/gst/app/Android.mk \ + gst-libs/gst/fft/Android.mk \ + gst/playback/Android.mk \ + gst/typefind/Android.mk \ + gst/app/Android.mk \ + gst/gdp/Android.mk \ + gst/tcp/Android.mk \ + gst/audioconvert/Android.mk \ + gst/audioresample/Android.mk \ + gst/audiotestsrc/Android.mk \ + gst/videotestsrc/Android.mk \ + gst/videoscale/Android.mk \ + gst/ffmpegcolorspace/Android.mk \ + gst/videorate/Android.mk \ + gst/encoding/Android.mk \ + gst/adder/Android.mk \ + gst/audiorate/Android.mk \ + gst/volume/Android.mk \ + tools/Android.mk \ + ext/ogg/Android.mk + +GST_PLUGINS_BASE_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BASE_TOP))/%, $(GST_PLUGINS_BASE_BUILT_SOURCES)) + + +.PHONY: gst-plugins-base-configure +gst-plugins-base-configure: + cd $(GST_PLUGINS_BASE_TOP) ; \ + CC="$(CONFIGURE_CC)" \ + CFLAGS="$(CONFIGURE_CFLAGS)" \ + LD=$(TARGET_LD) \ + LDFLAGS="$(CONFIGURE_LDFLAGS)" \ + CPP=$(CONFIGURE_CPP) \ + CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \ + PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" \ + PKG_CONFIG_TOP_BUILD_DIR=/ \ + $(abspath $(GST_PLUGINS_BASE_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \ + --prefix=/system --disable-orc --disable-gio \ + --disable-valgrind --disable-gtk-doc && \ + for file in $(GST_PLUGINS_BASE_BUILT_SOURCES); do \ + rm -f $$file && \ + make -C $$(dirname $$file) $$(basename $$file) ; \ + done -include $(GSTREAMER_TOP)/android/tag.mk -include $(GSTREAMER_TOP)/android/audio.mk -include $(GSTREAMER_TOP)/android/video.mk -include $(GSTREAMER_TOP)/android/riff.mk -include $(GSTREAMER_TOP)/android/interfaces.mk -include $(GSTREAMER_TOP)/android/pbutils.mk -include $(GSTREAMER_TOP)/android/rtp.mk -include $(GSTREAMER_TOP)/android/rtsp.mk -include $(GSTREAMER_TOP)/android/netbuffer.mk -include $(GSTREAMER_TOP)/android/sdp.mk -include $(GSTREAMER_TOP)/android/app.mk -#plugins -include $(GSTREAMER_TOP)/android/alsa.mk -include $(GSTREAMER_TOP)/android/decodebin.mk -include $(GSTREAMER_TOP)/android/decodebin2.mk -#include $(GSTREAMER_TOP)/android/queue2.mk -include $(GSTREAMER_TOP)/android/playbin.mk -include $(GSTREAMER_TOP)/android/typefindfunctions.mk -include $(GSTREAMER_TOP)/android/app_plugin.mk -include $(GSTREAMER_TOP)/android/gdp.mk -include $(GSTREAMER_TOP)/android/tcp.mk -include $(GSTREAMER_TOP)/android/audioconvert.mk +CONFIGURE_TARGETS += gst-plugins-base-configure +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/interfaces/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/fft/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/tag/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/audio/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/video/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/riff/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/pbutils/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/rtp/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/rtsp/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/netbuffer/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/sdp/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/app/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/playback/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/typefind/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/app/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/gdp/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/tcp/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/audioconvert/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/audioresample/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/audiotestsrc/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/videotestsrc/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/videoscale/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/ffmpegcolorspace/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/videorate/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/encoding/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/adder/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/audiorate/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/volume/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/ext/ogg/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/tools/Android.mk diff --git a/android/alsa.mk b/android/alsa.mk index 3815a0e..c67a1df 100644 --- a/android/alsa.mk +++ b/android/alsa.mk @@ -32,22 +32,8 @@ LOCAL_MODULE:= libgstalsa LOCAL_WHOLE_STATIC_LIBRARIES := libasound -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../ext/alsa \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include \ - external/alsa-lib/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # diff --git a/android/app.mk b/android/app.mk index 8ce87f8..88dfb7d 100644 --- a/android/app.mk +++ b/android/app.mk @@ -14,12 +14,10 @@ LOCAL_ARM_MODE := arm app_LOCAL_SRC_FILES_BASE:= \ gst-libs/gst/app/gstappsrc.c \ gst-libs/gst/app/gstappbuffer.c \ - gst-libs/gst/app/gstappsink.c -app_LOCAL_SRC_FILES_ANDROID:= \ + gst-libs/gst/app/gstappsink.c \ gst-libs/gst/app/gstapp-marshal.c -LOCAL_SRC_FILES:= $(addprefix ../,$(app_LOCAL_SRC_FILES_BASE)) \ - $(addprefix ../android/,$(app_LOCAL_SRC_FILES_ANDROID)) +LOCAL_SRC_FILES:= $(addprefix ../,$(app_LOCAL_SRC_FILES_BASE)) LOCAL_SHARED_LIBRARIES := \ libgstreamer-0.10 \ @@ -31,23 +29,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstapp-0.10 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/app \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst-libs/gst/app \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -55,5 +38,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_app_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_app_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/app_plugin.mk b/android/app_plugin.mk index a4cfeb8..8e067fc 100644 --- a/android/app_plugin.mk +++ b/android/app_plugin.mk @@ -20,22 +20,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstapp -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/app \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -43,5 +29,6 @@ LOCAL_PRELINK_MODULE := false #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/audio.mk b/android/audio.mk index 7111b98..fa24286 100644 --- a/android/audio.mk +++ b/android/audio.mk @@ -12,13 +12,10 @@ gst_audio_COPY_HEADERS_BASE := \ gst-libs/gst/audio/gstbaseaudiosrc.h \ gst-libs/gst/audio/gstringbuffer.h \ gst-libs/gst/audio/mixerutils.h \ - gst-libs/gst/audio/multichannel.h - -gst_audio_COPY_HEADERS_ANDROID := \ + gst-libs/gst/audio/multichannel.h \ gst-libs/gst/audio/audio-enumtypes.h gst_audio_COPY_HEADERS := $(addprefix ../,$(gst_audio_COPY_HEADERS_BASE)) \ - $(addprefix ../android/,$(gst_audio_COPY_HEADERS_ANDROID)) include $(CLEAR_VARS) @@ -36,12 +33,10 @@ audio_LOCAL_SRC_FILES_BASE:= \ gst-libs/gst/audio/gstaudiosrc.c \ gst-libs/gst/audio/gstbaseaudiosink.c \ gst-libs/gst/audio/gstbaseaudiosrc.c \ - gst-libs/gst/audio/gstringbuffer.c -audio_LOCAL_SRC_FILES_ANDROID:= \ + gst-libs/gst/audio/gstringbuffer.c \ gst-libs/gst/audio/audio-enumtypes.c -LOCAL_SRC_FILES:= $(addprefix ../,$(audio_LOCAL_SRC_FILES_BASE)) \ - $(addprefix ../android/,$(audio_LOCAL_SRC_FILES_ANDROID)) +LOCAL_SRC_FILES:= $(addprefix ../,$(audio_LOCAL_SRC_FILES_BASE)) LOCAL_SHARED_LIBRARIES := \ libgstreamer-0.10 \ @@ -54,23 +49,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstaudio-0.10 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/audio \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst-libs/gst/audio \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -78,5 +58,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_audio_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_audio_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/audioconvert.mk b/android/audioconvert.mk index 5b69254..015f39c 100644 --- a/android/audioconvert.mk +++ b/android/audioconvert.mk @@ -7,6 +7,7 @@ LOCAL_ARM_MODE := arm audioconvert_LOCAL_SRC_FILES:= \ gst/audioconvert/gstaudioconvert.c \ gst/audioconvert/audioconvert.c \ + gst/audioconvert/gstaudioconvertorc-dist.c \ gst/audioconvert/gstchannelmix.c \ gst/audioconvert/gstaudioquantize.c \ gst/audioconvert/plugin.c @@ -25,23 +26,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstaudioconvert -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/audioconvert \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst-libs/gst/audio \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -49,5 +35,6 @@ LOCAL_PRELINK_MODULE := false #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/audioresample.mk b/android/audioresample.mk new file mode 100644 index 0000000..8421511 --- /dev/null +++ b/android/audioresample.mk @@ -0,0 +1,38 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_ARM_MODE := arm + +audioresample_LOCAL_SRC_FILES:= \ + gst/audioresample/gstaudioresample.c \ + gst/audioresample/resample.c \ + gst/audioresample/speex_resampler_float.c \ + gst/audioresample/speex_resampler_double.c + +audioresample_C_INCLUDES := $(LOCAL_PATH)/ \ + +LOCAL_SRC_FILES := $(addprefix ../,$(audioresample_LOCAL_SRC_FILES)) +LOCAL_C_INCLUDES := $(audioresample_C_INCLUDES) + +LOCAL_SHARED_LIBRARIES := \ + libgstaudio-0.10 \ + libgstreamer-0.10 \ + libgstbase-0.10 \ + libglib-2.0 \ + libgthread-2.0 \ + libgmodule-2.0 \ + libgobject-2.0 \ + libgstpbutils-0.10 + +LOCAL_MODULE:= libgstaudioresample + +LOCAL_CFLAGS := -DFLOATING_POINT -DOUTSIDE_SPEEX -DRANDOM_PREFIX=gst -DDISABLE_ORC -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) +LOCAL_PRELINK_MODULE := false + +#It's a gstreamer plugin so it should be installed in /lib/gstreamer-0.10 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) diff --git a/android/audiotestsrc.mk b/android/audiotestsrc.mk new file mode 100644 index 0000000..06a76c3 --- /dev/null +++ b/android/audiotestsrc.mk @@ -0,0 +1,35 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_ARM_MODE := arm + +audiotestsrc_LOCAL_SRC_FILES:= \ + gst/audiotestsrc/gstaudiotestsrc.c + +LOCAL_SRC_FILES:= $(addprefix ../,$(audiotestsrc_LOCAL_SRC_FILES)) + +LOCAL_SHARED_LIBRARIES := \ + libgstcontroller-0.10 \ + libgstaudio-0.10 \ + libgstreamer-0.10 \ + libgstbase-0.10 \ + libglib-2.0 \ + libgthread-2.0 \ + libgmodule-2.0 \ + libgobject-2.0 + +LOCAL_MODULE:= libgstaudiotestsrc + +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) +# +# define LOCAL_PRELINK_MODULE to false to not use pre-link map +# +LOCAL_PRELINK_MODULE := false + +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) diff --git a/android/decodebin.mk b/android/decodebin.mk index b67f686..2d20164 100644 --- a/android/decodebin.mk +++ b/android/decodebin.mk @@ -5,12 +5,10 @@ include $(CLEAR_VARS) LOCAL_ARM_MODE := arm decodebin_LOCAL_SRC_FILES_BASE:= \ - gst/playback/gstdecodebin.c -decodebin_LOCAL_SRC_FILES_ANDROID:= \ + gst/playback/gstdecodebin.c \ gst/playback/gstplay-marshal.c -LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin_LOCAL_SRC_FILES_BASE)) \ - $(addprefix ../android/,$(decodebin_LOCAL_SRC_FILES_ANDROID)) +LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin_LOCAL_SRC_FILES_BASE)) LOCAL_SHARED_LIBRARIES := \ libgstreamer-0.10 \ @@ -23,23 +21,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstdecodebin -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/playback \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst/playback \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -47,5 +30,6 @@ LOCAL_PRELINK_MODULE := false #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/decodebin2.mk b/android/decodebin2.mk index b44ce11..30f0ace 100644 --- a/android/decodebin2.mk +++ b/android/decodebin2.mk @@ -7,13 +7,10 @@ LOCAL_ARM_MODE := arm decodebin2_LOCAL_SRC_FILES_BASE:= \ gst/playback/gstdecodebin2.c \ gst/playback/gsturidecodebin.c \ - gst/playback/gstfactorylists.c \ - gst/playback/gstplay-enum.c -decodebin2_LOCAL_SRC_FILES_ANDROID:= \ + gst/playback/gstplay-enum.c \ gst/playback/gstplay-marshal.c -LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin2_LOCAL_SRC_FILES_BASE)) \ - $(addprefix ../android/,$(decodebin2_LOCAL_SRC_FILES_ANDROID)) +LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin2_LOCAL_SRC_FILES_BASE)) LOCAL_SHARED_LIBRARIES := \ libgstreamer-0.10 \ @@ -26,23 +23,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstdecodebin2 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/playback \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst/playback \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := -DHAVE_CONFIG_H \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -50,5 +32,6 @@ LOCAL_PRELINK_MODULE := false #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/ffmpegcolorspace.mk b/android/ffmpegcolorspace.mk new file mode 100644 index 0000000..c197a64 --- /dev/null +++ b/android/ffmpegcolorspace.mk @@ -0,0 +1,40 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_ARM_MODE := arm + +ffmpegcolorspace_LOCAL_SRC_FILES:= \ + gst/ffmpegcolorspace/gstffmpegcolorspace.c \ + gst/ffmpegcolorspace/gstffmpegcodecmap.c \ + gst/ffmpegcolorspace/dsputil.c \ + gst/ffmpegcolorspace/imgconvert.c \ + gst/ffmpegcolorspace/mem.c \ + gst/ffmpegcolorspace/utils.c + +LOCAL_SRC_FILES:= $(addprefix ../,$(ffmpegcolorspace_LOCAL_SRC_FILES)) + +LOCAL_SHARED_LIBRARIES := \ + libgstvideo-0.10 \ + libgstreamer-0.10 \ + libgstbase-0.10 \ + libglib-2.0 \ + libgthread-2.0 \ + libgmodule-2.0 \ + libgobject-2.0 \ + libgstpbutils-0.10 + +LOCAL_MODULE:= libgstffmpegcolorspace + +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) +# +# define LOCAL_PRELINK_MODULE to false to not use pre-link map +# +LOCAL_PRELINK_MODULE := false + +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) diff --git a/android/gdp.mk b/android/gdp.mk index 67fc649..156bf28 100644 --- a/android/gdp.mk +++ b/android/gdp.mk @@ -22,23 +22,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstgdp -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/gdp \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -46,5 +31,6 @@ LOCAL_PRELINK_MODULE := false #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/gst-libs/gst/app/gstapp-marshal.c b/android/gst-libs/gst/app/gstapp-marshal.c deleted file mode 100644 index bb4047c..0000000 --- a/android/gst-libs/gst/app/gstapp-marshal.c +++ /dev/null @@ -1,152 +0,0 @@ -#include "gstapp-marshal.h" - -#include - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* BOOLEAN:UINT64 (gstapp-marshal.list:1) */ -void -__gst_app_marshal_BOOLEAN__UINT64 (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gboolean (*GMarshalFunc_BOOLEAN__UINT64) (gpointer data1, - guint64 arg_1, gpointer data2); - register GMarshalFunc_BOOLEAN__UINT64 callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gboolean v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_BOOLEAN__UINT64) (marshal_data ? marshal_data : - cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_uint64 (param_values + 1), data2); - - g_value_set_boolean (return_value, v_return); -} - -/* ENUM:OBJECT (gstapp-marshal.list:2) */ -void -__gst_app_marshal_ENUM__OBJECT (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gint (*GMarshalFunc_ENUM__OBJECT) (gpointer data1, - gpointer arg_1, gpointer data2); - register GMarshalFunc_ENUM__OBJECT callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gint v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_ENUM__OBJECT) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_object (param_values + 1), data2); - - g_value_set_enum (return_value, v_return); -} - -/* ENUM:VOID (gstapp-marshal.list:3) */ -void -__gst_app_marshal_ENUM__VOID (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gint (*GMarshalFunc_ENUM__VOID) (gpointer data1, gpointer data2); - register GMarshalFunc_ENUM__VOID callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gint v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 1); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_ENUM__VOID) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, data2); - - g_value_set_enum (return_value, v_return); -} - -/* VOID:UINT (gstapp-marshal.list:4) */ diff --git a/android/gst-libs/gst/app/gstapp-marshal.h b/android/gst-libs/gst/app/gstapp-marshal.h deleted file mode 100644 index 621b13d..0000000 --- a/android/gst-libs/gst/app/gstapp-marshal.h +++ /dev/null @@ -1,39 +0,0 @@ - -#ifndef ____gst_app_marshal_MARSHAL_H__ -#define ____gst_app_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* BOOLEAN:UINT64 (gstapp-marshal.list:1) */ -extern void __gst_app_marshal_BOOLEAN__UINT64 (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* ENUM:OBJECT (gstapp-marshal.list:2) */ -extern void __gst_app_marshal_ENUM__OBJECT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* ENUM:VOID (gstapp-marshal.list:3) */ -extern void __gst_app_marshal_ENUM__VOID (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:UINT (gstapp-marshal.list:4) */ -#define __gst_app_marshal_VOID__UINT g_cclosure_marshal_VOID__UINT - -G_END_DECLS - -#endif /* ____gst_app_marshal_MARSHAL_H__ */ - diff --git a/android/gst-libs/gst/audio/audio-enumtypes.c b/android/gst-libs/gst/audio/audio-enumtypes.c deleted file mode 100644 index b87241d..0000000 --- a/android/gst-libs/gst/audio/audio-enumtypes.c +++ /dev/null @@ -1,175 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#include "audio-enumtypes.h" - -#include "multichannel.h" -#include "gstringbuffer.h" - -/* enumerations from "multichannel.h" */ -GType -gst_audio_channel_position_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_AUDIO_CHANNEL_POSITION_INVALID, "GST_AUDIO_CHANNEL_POSITION_INVALID", - "invalid"}, - {GST_AUDIO_CHANNEL_POSITION_FRONT_MONO, - "GST_AUDIO_CHANNEL_POSITION_FRONT_MONO", "front-mono"}, - {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - "GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT", "front-left"}, - {GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - "GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT", "front-right"}, - {GST_AUDIO_CHANNEL_POSITION_REAR_CENTER, - "GST_AUDIO_CHANNEL_POSITION_REAR_CENTER", "rear-center"}, - {GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, - "GST_AUDIO_CHANNEL_POSITION_REAR_LEFT", "rear-left"}, - {GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT, - "GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT", "rear-right"}, - {GST_AUDIO_CHANNEL_POSITION_LFE, "GST_AUDIO_CHANNEL_POSITION_LFE", "lfe"}, - {GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - "GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER", "front-center"}, - {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER, - "GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER", - "front-left-of-center"}, - {GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER, - "GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER", - "front-right-of-center"}, - {GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, - "GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT", "side-left"}, - {GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, - "GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT", "side-right"}, - {GST_AUDIO_CHANNEL_POSITION_NONE, "GST_AUDIO_CHANNEL_POSITION_NONE", - "none"}, - {GST_AUDIO_CHANNEL_POSITION_NUM, "GST_AUDIO_CHANNEL_POSITION_NUM", "num"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstAudioChannelPosition", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* enumerations from "gstringbuffer.h" */ -GType -gst_ring_buffer_state_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_RING_BUFFER_STATE_STOPPED, "GST_RING_BUFFER_STATE_STOPPED", - "stopped"}, - {GST_RING_BUFFER_STATE_PAUSED, "GST_RING_BUFFER_STATE_PAUSED", "paused"}, - {GST_RING_BUFFER_STATE_STARTED, "GST_RING_BUFFER_STATE_STARTED", - "started"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstRingBufferState", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_ring_buffer_seg_state_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_SEGSTATE_INVALID, "GST_SEGSTATE_INVALID", "invalid"}, - {GST_SEGSTATE_EMPTY, "GST_SEGSTATE_EMPTY", "empty"}, - {GST_SEGSTATE_FILLED, "GST_SEGSTATE_FILLED", "filled"}, - {GST_SEGSTATE_PARTIAL, "GST_SEGSTATE_PARTIAL", "partial"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstRingBufferSegState", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_buffer_format_type_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_BUFTYPE_LINEAR, "GST_BUFTYPE_LINEAR", "linear"}, - {GST_BUFTYPE_FLOAT, "GST_BUFTYPE_FLOAT", "float"}, - {GST_BUFTYPE_MU_LAW, "GST_BUFTYPE_MU_LAW", "mu-law"}, - {GST_BUFTYPE_A_LAW, "GST_BUFTYPE_A_LAW", "a-law"}, - {GST_BUFTYPE_IMA_ADPCM, "GST_BUFTYPE_IMA_ADPCM", "ima-adpcm"}, - {GST_BUFTYPE_MPEG, "GST_BUFTYPE_MPEG", "mpeg"}, - {GST_BUFTYPE_GSM, "GST_BUFTYPE_GSM", "gsm"}, - {GST_BUFTYPE_IEC958, "GST_BUFTYPE_IEC958", "iec958"}, - {GST_BUFTYPE_AC3, "GST_BUFTYPE_AC3", "ac3"}, - {GST_BUFTYPE_EAC3, "GST_BUFTYPE_EAC3", "eac3"}, - {GST_BUFTYPE_DTS, "GST_BUFTYPE_DTS", "dts"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstBufferFormatType", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_buffer_format_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_UNKNOWN, "GST_UNKNOWN", "unknown"}, - {GST_S8, "GST_S8", "s8"}, - {GST_U8, "GST_U8", "u8"}, - {GST_S16_LE, "GST_S16_LE", "s16-le"}, - {GST_S16_BE, "GST_S16_BE", "s16-be"}, - {GST_U16_LE, "GST_U16_LE", "u16-le"}, - {GST_U16_BE, "GST_U16_BE", "u16-be"}, - {GST_S24_LE, "GST_S24_LE", "s24-le"}, - {GST_S24_BE, "GST_S24_BE", "s24-be"}, - {GST_U24_LE, "GST_U24_LE", "u24-le"}, - {GST_U24_BE, "GST_U24_BE", "u24-be"}, - {GST_S32_LE, "GST_S32_LE", "s32-le"}, - {GST_S32_BE, "GST_S32_BE", "s32-be"}, - {GST_U32_LE, "GST_U32_LE", "u32-le"}, - {GST_U32_BE, "GST_U32_BE", "u32-be"}, - {GST_S24_3LE, "GST_S24_3LE", "s24-3le"}, - {GST_S24_3BE, "GST_S24_3BE", "s24-3be"}, - {GST_U24_3LE, "GST_U24_3LE", "u24-3le"}, - {GST_U24_3BE, "GST_U24_3BE", "u24-3be"}, - {GST_S20_3LE, "GST_S20_3LE", "s20-3le"}, - {GST_S20_3BE, "GST_S20_3BE", "s20-3be"}, - {GST_U20_3LE, "GST_U20_3LE", "u20-3le"}, - {GST_U20_3BE, "GST_U20_3BE", "u20-3be"}, - {GST_S18_3LE, "GST_S18_3LE", "s18-3le"}, - {GST_S18_3BE, "GST_S18_3BE", "s18-3be"}, - {GST_U18_3LE, "GST_U18_3LE", "u18-3le"}, - {GST_U18_3BE, "GST_U18_3BE", "u18-3be"}, - {GST_FLOAT32_LE, "GST_FLOAT32_LE", "float32-le"}, - {GST_FLOAT32_BE, "GST_FLOAT32_BE", "float32-be"}, - {GST_FLOAT64_LE, "GST_FLOAT64_LE", "float64-le"}, - {GST_FLOAT64_BE, "GST_FLOAT64_BE", "float64-be"}, - {GST_MU_LAW, "GST_MU_LAW", "mu-law"}, - {GST_A_LAW, "GST_A_LAW", "a-law"}, - {GST_IMA_ADPCM, "GST_IMA_ADPCM", "ima-adpcm"}, - {GST_MPEG, "GST_MPEG", "mpeg"}, - {GST_GSM, "GST_GSM", "gsm"}, - {GST_IEC958, "GST_IEC958", "iec958"}, - {GST_AC3, "GST_AC3", "ac3"}, - {GST_EAC3, "GST_EAC3", "eac3"}, - {GST_DTS, "GST_DTS", "dts"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_enum_register_static ("GstBufferFormat", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* Generated data ends here */ diff --git a/android/gst-libs/gst/audio/audio-enumtypes.h b/android/gst-libs/gst/audio/audio-enumtypes.h deleted file mode 100644 index b3d1558..0000000 --- a/android/gst-libs/gst/audio/audio-enumtypes.h +++ /dev/null @@ -1,29 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#ifndef __GST_AUDIO_ENUM_TYPES_H__ -#define __GST_AUDIO_ENUM_TYPES_H__ - -#include - -G_BEGIN_DECLS - -/* enumerations from "multichannel.h" */ -GType gst_audio_channel_position_get_type (void); -#define GST_TYPE_AUDIO_CHANNEL_POSITION (gst_audio_channel_position_get_type()) - -/* enumerations from "gstringbuffer.h" */ -GType gst_ring_buffer_state_get_type (void); -#define GST_TYPE_RING_BUFFER_STATE (gst_ring_buffer_state_get_type()) -GType gst_ring_buffer_seg_state_get_type (void); -#define GST_TYPE_RING_BUFFER_SEG_STATE (gst_ring_buffer_seg_state_get_type()) -GType gst_buffer_format_type_get_type (void); -#define GST_TYPE_BUFFER_FORMAT_TYPE (gst_buffer_format_type_get_type()) -GType gst_buffer_format_get_type (void); -#define GST_TYPE_BUFFER_FORMAT (gst_buffer_format_get_type()) -G_END_DECLS - -#endif /* __GST_AUDIO_ENUM_TYPES_H__ */ - -/* Generated data ends here */ - diff --git a/android/gst-libs/gst/interfaces/interfaces-enumtypes.c b/android/gst-libs/gst/interfaces/interfaces-enumtypes.c deleted file mode 100644 index 3213b81..0000000 --- a/android/gst-libs/gst/interfaces/interfaces-enumtypes.c +++ /dev/null @@ -1,276 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#include "interfaces-enumtypes.h" - -#include "colorbalance.h" -#include "colorbalancechannel.h" -#include "mixer.h" -#include "mixeroptions.h" -#include "mixertrack.h" -#include "navigation.h" -#include "propertyprobe.h" -#include "streamvolume.h" -#include "tuner.h" -#include "tunernorm.h" -#include "tunerchannel.h" -#include "videoorientation.h" -#include "xoverlay.h" - -/* enumerations from "colorbalance.h" */ -GType -gst_color_balance_type_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_COLOR_BALANCE_HARDWARE, "GST_COLOR_BALANCE_HARDWARE", "hardware"}, - {GST_COLOR_BALANCE_SOFTWARE, "GST_COLOR_BALANCE_SOFTWARE", "software"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstColorBalanceType", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* enumerations from "mixer.h" */ -GType -gst_mixer_type_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_MIXER_HARDWARE, "GST_MIXER_HARDWARE", "hardware"}, - {GST_MIXER_SOFTWARE, "GST_MIXER_SOFTWARE", "software"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_enum_register_static ("GstMixerType", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_mixer_message_type_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_MIXER_MESSAGE_INVALID, "GST_MIXER_MESSAGE_INVALID", "invalid"}, - {GST_MIXER_MESSAGE_MUTE_TOGGLED, "GST_MIXER_MESSAGE_MUTE_TOGGLED", - "mute-toggled"}, - {GST_MIXER_MESSAGE_RECORD_TOGGLED, "GST_MIXER_MESSAGE_RECORD_TOGGLED", - "record-toggled"}, - {GST_MIXER_MESSAGE_VOLUME_CHANGED, "GST_MIXER_MESSAGE_VOLUME_CHANGED", - "volume-changed"}, - {GST_MIXER_MESSAGE_OPTION_CHANGED, "GST_MIXER_MESSAGE_OPTION_CHANGED", - "option-changed"}, - {GST_MIXER_MESSAGE_OPTIONS_LIST_CHANGED, - "GST_MIXER_MESSAGE_OPTIONS_LIST_CHANGED", "options-list-changed"}, - {GST_MIXER_MESSAGE_MIXER_CHANGED, "GST_MIXER_MESSAGE_MIXER_CHANGED", - "mixer-changed"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstMixerMessageType", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_mixer_flags_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GFlagsValue values[] = { - {GST_MIXER_FLAG_NONE, "GST_MIXER_FLAG_NONE", "none"}, - {GST_MIXER_FLAG_AUTO_NOTIFICATIONS, "GST_MIXER_FLAG_AUTO_NOTIFICATIONS", - "auto-notifications"}, - {GST_MIXER_FLAG_HAS_WHITELIST, "GST_MIXER_FLAG_HAS_WHITELIST", - "has-whitelist"}, - {GST_MIXER_FLAG_GROUPING, "GST_MIXER_FLAG_GROUPING", "grouping"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_flags_register_static ("GstMixerFlags", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* enumerations from "mixertrack.h" */ -GType -gst_mixer_track_flags_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GFlagsValue values[] = { - {GST_MIXER_TRACK_INPUT, "GST_MIXER_TRACK_INPUT", "input"}, - {GST_MIXER_TRACK_OUTPUT, "GST_MIXER_TRACK_OUTPUT", "output"}, - {GST_MIXER_TRACK_MUTE, "GST_MIXER_TRACK_MUTE", "mute"}, - {GST_MIXER_TRACK_RECORD, "GST_MIXER_TRACK_RECORD", "record"}, - {GST_MIXER_TRACK_MASTER, "GST_MIXER_TRACK_MASTER", "master"}, - {GST_MIXER_TRACK_SOFTWARE, "GST_MIXER_TRACK_SOFTWARE", "software"}, - {GST_MIXER_TRACK_NO_RECORD, "GST_MIXER_TRACK_NO_RECORD", "no-record"}, - {GST_MIXER_TRACK_NO_MUTE, "GST_MIXER_TRACK_NO_MUTE", "no-mute"}, - {GST_MIXER_TRACK_WHITELIST, "GST_MIXER_TRACK_WHITELIST", "whitelist"}, - {GST_MIXER_TRACK_READONLY, "GST_MIXER_TRACK_READONLY", "readonly"}, - {GST_MIXER_TRACK_WRITEONLY, "GST_MIXER_TRACK_WRITEONLY", "writeonly"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_flags_register_static ("GstMixerTrackFlags", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* enumerations from "navigation.h" */ -GType -gst_navigation_command_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_NAVIGATION_COMMAND_INVALID, "GST_NAVIGATION_COMMAND_INVALID", - "invalid"}, - {GST_NAVIGATION_COMMAND_MENU1, "GST_NAVIGATION_COMMAND_MENU1", "menu1"}, - {GST_NAVIGATION_COMMAND_MENU2, "GST_NAVIGATION_COMMAND_MENU2", "menu2"}, - {GST_NAVIGATION_COMMAND_MENU3, "GST_NAVIGATION_COMMAND_MENU3", "menu3"}, - {GST_NAVIGATION_COMMAND_MENU4, "GST_NAVIGATION_COMMAND_MENU4", "menu4"}, - {GST_NAVIGATION_COMMAND_MENU5, "GST_NAVIGATION_COMMAND_MENU5", "menu5"}, - {GST_NAVIGATION_COMMAND_MENU6, "GST_NAVIGATION_COMMAND_MENU6", "menu6"}, - {GST_NAVIGATION_COMMAND_MENU7, "GST_NAVIGATION_COMMAND_MENU7", "menu7"}, - {GST_NAVIGATION_COMMAND_LEFT, "GST_NAVIGATION_COMMAND_LEFT", "left"}, - {GST_NAVIGATION_COMMAND_RIGHT, "GST_NAVIGATION_COMMAND_RIGHT", "right"}, - {GST_NAVIGATION_COMMAND_UP, "GST_NAVIGATION_COMMAND_UP", "up"}, - {GST_NAVIGATION_COMMAND_DOWN, "GST_NAVIGATION_COMMAND_DOWN", "down"}, - {GST_NAVIGATION_COMMAND_ACTIVATE, "GST_NAVIGATION_COMMAND_ACTIVATE", - "activate"}, - {GST_NAVIGATION_COMMAND_PREV_ANGLE, "GST_NAVIGATION_COMMAND_PREV_ANGLE", - "prev-angle"}, - {GST_NAVIGATION_COMMAND_NEXT_ANGLE, "GST_NAVIGATION_COMMAND_NEXT_ANGLE", - "next-angle"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstNavigationCommand", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_navigation_query_type_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_NAVIGATION_QUERY_INVALID, "GST_NAVIGATION_QUERY_INVALID", "invalid"}, - {GST_NAVIGATION_QUERY_COMMANDS, "GST_NAVIGATION_QUERY_COMMANDS", - "commands"}, - {GST_NAVIGATION_QUERY_ANGLES, "GST_NAVIGATION_QUERY_ANGLES", "angles"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstNavigationQueryType", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_navigation_message_type_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_NAVIGATION_MESSAGE_INVALID, "GST_NAVIGATION_MESSAGE_INVALID", - "invalid"}, - {GST_NAVIGATION_MESSAGE_MOUSE_OVER, "GST_NAVIGATION_MESSAGE_MOUSE_OVER", - "mouse-over"}, - {GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED, - "GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED", "commands-changed"}, - {GST_NAVIGATION_MESSAGE_ANGLES_CHANGED, - "GST_NAVIGATION_MESSAGE_ANGLES_CHANGED", "angles-changed"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstNavigationMessageType", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_navigation_event_type_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_NAVIGATION_EVENT_INVALID, "GST_NAVIGATION_EVENT_INVALID", "invalid"}, - {GST_NAVIGATION_EVENT_KEY_PRESS, "GST_NAVIGATION_EVENT_KEY_PRESS", - "key-press"}, - {GST_NAVIGATION_EVENT_KEY_RELEASE, "GST_NAVIGATION_EVENT_KEY_RELEASE", - "key-release"}, - {GST_NAVIGATION_EVENT_MOUSE_BUTTON_PRESS, - "GST_NAVIGATION_EVENT_MOUSE_BUTTON_PRESS", "mouse-button-press"}, - {GST_NAVIGATION_EVENT_MOUSE_BUTTON_RELEASE, - "GST_NAVIGATION_EVENT_MOUSE_BUTTON_RELEASE", - "mouse-button-release"}, - {GST_NAVIGATION_EVENT_MOUSE_MOVE, "GST_NAVIGATION_EVENT_MOUSE_MOVE", - "mouse-move"}, - {GST_NAVIGATION_EVENT_COMMAND, "GST_NAVIGATION_EVENT_COMMAND", "command"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstNavigationEventType", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* enumerations from "streamvolume.h" */ -GType -gst_stream_volume_format_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_STREAM_VOLUME_FORMAT_LINEAR, "GST_STREAM_VOLUME_FORMAT_LINEAR", - "linear"}, - {GST_STREAM_VOLUME_FORMAT_CUBIC, "GST_STREAM_VOLUME_FORMAT_CUBIC", - "cubic"}, - {GST_STREAM_VOLUME_FORMAT_DB, "GST_STREAM_VOLUME_FORMAT_DB", "db"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstStreamVolumeFormat", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* enumerations from "tunerchannel.h" */ -GType -gst_tuner_channel_flags_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GFlagsValue values[] = { - {GST_TUNER_CHANNEL_INPUT, "GST_TUNER_CHANNEL_INPUT", "input"}, - {GST_TUNER_CHANNEL_OUTPUT, "GST_TUNER_CHANNEL_OUTPUT", "output"}, - {GST_TUNER_CHANNEL_FREQUENCY, "GST_TUNER_CHANNEL_FREQUENCY", "frequency"}, - {GST_TUNER_CHANNEL_AUDIO, "GST_TUNER_CHANNEL_AUDIO", "audio"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_flags_register_static ("GstTunerChannelFlags", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* Generated data ends here */ diff --git a/android/gst-libs/gst/interfaces/interfaces-enumtypes.h b/android/gst-libs/gst/interfaces/interfaces-enumtypes.h deleted file mode 100644 index 3c6960f..0000000 --- a/android/gst-libs/gst/interfaces/interfaces-enumtypes.h +++ /dev/null @@ -1,49 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#ifndef __GST_INTERFACES_ENUM_TYPES_H__ -#define __GST_INTERFACES_ENUM_TYPES_H__ - -#include - -G_BEGIN_DECLS - -/* enumerations from "colorbalance.h" */ -GType gst_color_balance_type_get_type (void); -#define GST_TYPE_COLOR_BALANCE_TYPE (gst_color_balance_type_get_type()) - -/* enumerations from "mixer.h" */ -GType gst_mixer_type_get_type (void); -#define GST_TYPE_MIXER_TYPE (gst_mixer_type_get_type()) -GType gst_mixer_message_type_get_type (void); -#define GST_TYPE_MIXER_MESSAGE_TYPE (gst_mixer_message_type_get_type()) -GType gst_mixer_flags_get_type (void); -#define GST_TYPE_MIXER_FLAGS (gst_mixer_flags_get_type()) - -/* enumerations from "mixertrack.h" */ -GType gst_mixer_track_flags_get_type (void); -#define GST_TYPE_MIXER_TRACK_FLAGS (gst_mixer_track_flags_get_type()) - -/* enumerations from "navigation.h" */ -GType gst_navigation_command_get_type (void); -#define GST_TYPE_NAVIGATION_COMMAND (gst_navigation_command_get_type()) -GType gst_navigation_query_type_get_type (void); -#define GST_TYPE_NAVIGATION_QUERY_TYPE (gst_navigation_query_type_get_type()) -GType gst_navigation_message_type_get_type (void); -#define GST_TYPE_NAVIGATION_MESSAGE_TYPE (gst_navigation_message_type_get_type()) -GType gst_navigation_event_type_get_type (void); -#define GST_TYPE_NAVIGATION_EVENT_TYPE (gst_navigation_event_type_get_type()) - -/* enumerations from "streamvolume.h" */ -GType gst_stream_volume_format_get_type (void); -#define GST_TYPE_STREAM_VOLUME_FORMAT (gst_stream_volume_format_get_type()) - -/* enumerations from "tunerchannel.h" */ -GType gst_tuner_channel_flags_get_type (void); -#define GST_TYPE_TUNER_CHANNEL_FLAGS (gst_tuner_channel_flags_get_type()) -G_END_DECLS - -#endif /* __GST_INTERFACES_ENUM_TYPES_H__ */ - -/* Generated data ends here */ - diff --git a/android/gst-libs/gst/interfaces/interfaces-marshal.c b/android/gst-libs/gst/interfaces/interfaces-marshal.c deleted file mode 100644 index 10ea009..0000000 --- a/android/gst-libs/gst/interfaces/interfaces-marshal.c +++ /dev/null @@ -1,209 +0,0 @@ -#include "interfaces-marshal.h" - -#include - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:OBJECT,BOOLEAN (interfaces-marshal.list:1) */ -void -gst_interfaces_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__OBJECT_BOOLEAN) (gpointer data1, - gpointer arg_1, gboolean arg_2, gpointer data2); - register GMarshalFunc_VOID__OBJECT_BOOLEAN callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : - cc->callback); - - callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_boolean (param_values + 2), data2); -} - -/* VOID:OBJECT,POINTER (interfaces-marshal.list:2) */ -void -gst_interfaces_marshal_VOID__OBJECT_POINTER (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__OBJECT_POINTER) (gpointer data1, - gpointer arg_1, gpointer arg_2, gpointer data2); - register GMarshalFunc_VOID__OBJECT_POINTER callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_VOID__OBJECT_POINTER) (marshal_data ? marshal_data : - cc->callback); - - callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_pointer (param_values + 2), data2); -} - -/* VOID:OBJECT,STRING (interfaces-marshal.list:3) */ -void -gst_interfaces_marshal_VOID__OBJECT_STRING (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__OBJECT_STRING) (gpointer data1, - gpointer arg_1, gpointer arg_2, gpointer data2); - register GMarshalFunc_VOID__OBJECT_STRING callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : - cc->callback); - - callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_string (param_values + 2), data2); -} - -/* VOID:OBJECT,ULONG (interfaces-marshal.list:4) */ -void -gst_interfaces_marshal_VOID__OBJECT_ULONG (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__OBJECT_ULONG) (gpointer data1, - gpointer arg_1, gulong arg_2, gpointer data2); - register GMarshalFunc_VOID__OBJECT_ULONG callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_VOID__OBJECT_ULONG) (marshal_data ? marshal_data : - cc->callback); - - callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_ulong (param_values + 2), data2); -} - -/* VOID:OBJECT,INT (interfaces-marshal.list:5) */ -void -gst_interfaces_marshal_VOID__OBJECT_INT (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__OBJECT_INT) (gpointer data1, - gpointer arg_1, gint arg_2, gpointer data2); - register GMarshalFunc_VOID__OBJECT_INT callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_VOID__OBJECT_INT) (marshal_data ? marshal_data : - cc->callback); - - callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_int (param_values + 2), data2); -} diff --git a/android/gst-libs/gst/interfaces/interfaces-marshal.h b/android/gst-libs/gst/interfaces/interfaces-marshal.h deleted file mode 100644 index 2c8014e..0000000 --- a/android/gst-libs/gst/interfaces/interfaces-marshal.h +++ /dev/null @@ -1,52 +0,0 @@ - -#ifndef __gst_interfaces_marshal_MARSHAL_H__ -#define __gst_interfaces_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* VOID:OBJECT,BOOLEAN (interfaces-marshal.list:1) */ -extern void gst_interfaces_marshal_VOID__OBJECT_BOOLEAN (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:OBJECT,POINTER (interfaces-marshal.list:2) */ -extern void gst_interfaces_marshal_VOID__OBJECT_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:OBJECT,STRING (interfaces-marshal.list:3) */ -extern void gst_interfaces_marshal_VOID__OBJECT_STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:OBJECT,ULONG (interfaces-marshal.list:4) */ -extern void gst_interfaces_marshal_VOID__OBJECT_ULONG (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:OBJECT,INT (interfaces-marshal.list:5) */ -extern void gst_interfaces_marshal_VOID__OBJECT_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __gst_interfaces_marshal_MARSHAL_H__ */ - diff --git a/android/gst-libs/gst/pbutils/pbutils-enumtypes.c b/android/gst-libs/gst/pbutils/pbutils-enumtypes.c deleted file mode 100644 index 18ae03d..0000000 --- a/android/gst-libs/gst/pbutils/pbutils-enumtypes.c +++ /dev/null @@ -1,45 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#include "pbutils-enumtypes.h" - -#include "pbutils.h" -#include "descriptions.h" -#include "install-plugins.h" -#include "missing-plugins.h" - -/* enumerations from "install-plugins.h" */ -GType -gst_install_plugins_return_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_INSTALL_PLUGINS_SUCCESS, "GST_INSTALL_PLUGINS_SUCCESS", "success"}, - {GST_INSTALL_PLUGINS_NOT_FOUND, "GST_INSTALL_PLUGINS_NOT_FOUND", - "not-found"}, - {GST_INSTALL_PLUGINS_ERROR, "GST_INSTALL_PLUGINS_ERROR", "error"}, - {GST_INSTALL_PLUGINS_PARTIAL_SUCCESS, - "GST_INSTALL_PLUGINS_PARTIAL_SUCCESS", "partial-success"}, - {GST_INSTALL_PLUGINS_USER_ABORT, "GST_INSTALL_PLUGINS_USER_ABORT", - "user-abort"}, - {GST_INSTALL_PLUGINS_CRASHED, "GST_INSTALL_PLUGINS_CRASHED", "crashed"}, - {GST_INSTALL_PLUGINS_INVALID, "GST_INSTALL_PLUGINS_INVALID", "invalid"}, - {GST_INSTALL_PLUGINS_STARTED_OK, "GST_INSTALL_PLUGINS_STARTED_OK", - "started-ok"}, - {GST_INSTALL_PLUGINS_INTERNAL_FAILURE, - "GST_INSTALL_PLUGINS_INTERNAL_FAILURE", "internal-failure"}, - {GST_INSTALL_PLUGINS_HELPER_MISSING, "GST_INSTALL_PLUGINS_HELPER_MISSING", - "helper-missing"}, - {GST_INSTALL_PLUGINS_INSTALL_IN_PROGRESS, - "GST_INSTALL_PLUGINS_INSTALL_IN_PROGRESS", "install-in-progress"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstInstallPluginsReturn", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* Generated data ends here */ diff --git a/android/gst-libs/gst/pbutils/pbutils-enumtypes.h b/android/gst-libs/gst/pbutils/pbutils-enumtypes.h deleted file mode 100644 index 1b2398a..0000000 --- a/android/gst-libs/gst/pbutils/pbutils-enumtypes.h +++ /dev/null @@ -1,19 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#ifndef __GST_INSTALL_ENUM_TYPES_H__ -#define __GST_INSTALL_ENUM_TYPES_H__ - -#include - -G_BEGIN_DECLS - -/* enumerations from "install-plugins.h" */ -GType gst_install_plugins_return_get_type (void); -#define GST_TYPE_INSTALL_PLUGINS_RETURN (gst_install_plugins_return_get_type()) -G_END_DECLS - -#endif /* __GST_INSTALL_ENUM_TYPES_H__ */ - -/* Generated data ends here */ - diff --git a/android/gst-libs/gst/rtsp/gstrtsp-enumtypes.c b/android/gst-libs/gst/rtsp/gstrtsp-enumtypes.c deleted file mode 100644 index 8e47a45..0000000 --- a/android/gst-libs/gst/rtsp/gstrtsp-enumtypes.c +++ /dev/null @@ -1,391 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#include "gstrtsp-enumtypes.h" - -#include "gstrtspdefs.h" - -/* enumerations from "gstrtspdefs.h" */ -GType -gst_rtsp_result_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_RTSP_OK, "GST_RTSP_OK", "ok"}, - {GST_RTSP_ERROR, "GST_RTSP_ERROR", "error"}, - {GST_RTSP_EINVAL, "GST_RTSP_EINVAL", "einval"}, - {GST_RTSP_EINTR, "GST_RTSP_EINTR", "eintr"}, - {GST_RTSP_ENOMEM, "GST_RTSP_ENOMEM", "enomem"}, - {GST_RTSP_ERESOLV, "GST_RTSP_ERESOLV", "eresolv"}, - {GST_RTSP_ENOTIMPL, "GST_RTSP_ENOTIMPL", "enotimpl"}, - {GST_RTSP_ESYS, "GST_RTSP_ESYS", "esys"}, - {GST_RTSP_EPARSE, "GST_RTSP_EPARSE", "eparse"}, - {GST_RTSP_EWSASTART, "GST_RTSP_EWSASTART", "ewsastart"}, - {GST_RTSP_EWSAVERSION, "GST_RTSP_EWSAVERSION", "ewsaversion"}, - {GST_RTSP_EEOF, "GST_RTSP_EEOF", "eeof"}, - {GST_RTSP_ENET, "GST_RTSP_ENET", "enet"}, - {GST_RTSP_ENOTIP, "GST_RTSP_ENOTIP", "enotip"}, - {GST_RTSP_ETIMEOUT, "GST_RTSP_ETIMEOUT", "etimeout"}, - {GST_RTSP_ETGET, "GST_RTSP_ETGET", "etget"}, - {GST_RTSP_ETPOST, "GST_RTSP_ETPOST", "etpost"}, - {GST_RTSP_ELAST, "GST_RTSP_ELAST", "elast"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_enum_register_static ("GstRTSPResult", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_rtsp_event_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GFlagsValue values[] = { - {GST_RTSP_EV_READ, "GST_RTSP_EV_READ", "read"}, - {GST_RTSP_EV_WRITE, "GST_RTSP_EV_WRITE", "write"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_flags_register_static ("GstRTSPEvent", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_rtsp_family_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_RTSP_FAM_NONE, "GST_RTSP_FAM_NONE", "none"}, - {GST_RTSP_FAM_INET, "GST_RTSP_FAM_INET", "inet"}, - {GST_RTSP_FAM_INET6, "GST_RTSP_FAM_INET6", "inet6"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_enum_register_static ("GstRTSPFamily", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_rtsp_state_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_RTSP_STATE_INVALID, "GST_RTSP_STATE_INVALID", "invalid"}, - {GST_RTSP_STATE_INIT, "GST_RTSP_STATE_INIT", "init"}, - {GST_RTSP_STATE_READY, "GST_RTSP_STATE_READY", "ready"}, - {GST_RTSP_STATE_SEEKING, "GST_RTSP_STATE_SEEKING", "seeking"}, - {GST_RTSP_STATE_PLAYING, "GST_RTSP_STATE_PLAYING", "playing"}, - {GST_RTSP_STATE_RECORDING, "GST_RTSP_STATE_RECORDING", "recording"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_enum_register_static ("GstRTSPState", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_rtsp_version_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_RTSP_VERSION_INVALID, "GST_RTSP_VERSION_INVALID", "invalid"}, - {GST_RTSP_VERSION_1_0, "GST_RTSP_VERSION_1_0", "1-0"}, - {GST_RTSP_VERSION_1_1, "GST_RTSP_VERSION_1_1", "1-1"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_enum_register_static ("GstRTSPVersion", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_rtsp_method_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GFlagsValue values[] = { - {GST_RTSP_INVALID, "GST_RTSP_INVALID", "invalid"}, - {GST_RTSP_DESCRIBE, "GST_RTSP_DESCRIBE", "describe"}, - {GST_RTSP_ANNOUNCE, "GST_RTSP_ANNOUNCE", "announce"}, - {GST_RTSP_GET_PARAMETER, "GST_RTSP_GET_PARAMETER", "get-parameter"}, - {GST_RTSP_OPTIONS, "GST_RTSP_OPTIONS", "options"}, - {GST_RTSP_PAUSE, "GST_RTSP_PAUSE", "pause"}, - {GST_RTSP_PLAY, "GST_RTSP_PLAY", "play"}, - {GST_RTSP_RECORD, "GST_RTSP_RECORD", "record"}, - {GST_RTSP_REDIRECT, "GST_RTSP_REDIRECT", "redirect"}, - {GST_RTSP_SETUP, "GST_RTSP_SETUP", "setup"}, - {GST_RTSP_SET_PARAMETER, "GST_RTSP_SET_PARAMETER", "set-parameter"}, - {GST_RTSP_TEARDOWN, "GST_RTSP_TEARDOWN", "teardown"}, - {GST_RTSP_GET, "GST_RTSP_GET", "get"}, - {GST_RTSP_POST, "GST_RTSP_POST", "post"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_flags_register_static ("GstRTSPMethod", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_rtsp_auth_method_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_RTSP_AUTH_NONE, "GST_RTSP_AUTH_NONE", "none"}, - {GST_RTSP_AUTH_BASIC, "GST_RTSP_AUTH_BASIC", "basic"}, - {GST_RTSP_AUTH_DIGEST, "GST_RTSP_AUTH_DIGEST", "digest"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstRTSPAuthMethod", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_rtsp_header_field_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_RTSP_HDR_INVALID, "GST_RTSP_HDR_INVALID", "invalid"}, - {GST_RTSP_HDR_ACCEPT, "GST_RTSP_HDR_ACCEPT", "accept"}, - {GST_RTSP_HDR_ACCEPT_ENCODING, "GST_RTSP_HDR_ACCEPT_ENCODING", - "accept-encoding"}, - {GST_RTSP_HDR_ACCEPT_LANGUAGE, "GST_RTSP_HDR_ACCEPT_LANGUAGE", - "accept-language"}, - {GST_RTSP_HDR_ALLOW, "GST_RTSP_HDR_ALLOW", "allow"}, - {GST_RTSP_HDR_AUTHORIZATION, "GST_RTSP_HDR_AUTHORIZATION", - "authorization"}, - {GST_RTSP_HDR_BANDWIDTH, "GST_RTSP_HDR_BANDWIDTH", "bandwidth"}, - {GST_RTSP_HDR_BLOCKSIZE, "GST_RTSP_HDR_BLOCKSIZE", "blocksize"}, - {GST_RTSP_HDR_CACHE_CONTROL, "GST_RTSP_HDR_CACHE_CONTROL", - "cache-control"}, - {GST_RTSP_HDR_CONFERENCE, "GST_RTSP_HDR_CONFERENCE", "conference"}, - {GST_RTSP_HDR_CONNECTION, "GST_RTSP_HDR_CONNECTION", "connection"}, - {GST_RTSP_HDR_CONTENT_BASE, "GST_RTSP_HDR_CONTENT_BASE", "content-base"}, - {GST_RTSP_HDR_CONTENT_ENCODING, "GST_RTSP_HDR_CONTENT_ENCODING", - "content-encoding"}, - {GST_RTSP_HDR_CONTENT_LANGUAGE, "GST_RTSP_HDR_CONTENT_LANGUAGE", - "content-language"}, - {GST_RTSP_HDR_CONTENT_LENGTH, "GST_RTSP_HDR_CONTENT_LENGTH", - "content-length"}, - {GST_RTSP_HDR_CONTENT_LOCATION, "GST_RTSP_HDR_CONTENT_LOCATION", - "content-location"}, - {GST_RTSP_HDR_CONTENT_TYPE, "GST_RTSP_HDR_CONTENT_TYPE", "content-type"}, - {GST_RTSP_HDR_CSEQ, "GST_RTSP_HDR_CSEQ", "cseq"}, - {GST_RTSP_HDR_DATE, "GST_RTSP_HDR_DATE", "date"}, - {GST_RTSP_HDR_EXPIRES, "GST_RTSP_HDR_EXPIRES", "expires"}, - {GST_RTSP_HDR_FROM, "GST_RTSP_HDR_FROM", "from"}, - {GST_RTSP_HDR_IF_MODIFIED_SINCE, "GST_RTSP_HDR_IF_MODIFIED_SINCE", - "if-modified-since"}, - {GST_RTSP_HDR_LAST_MODIFIED, "GST_RTSP_HDR_LAST_MODIFIED", - "last-modified"}, - {GST_RTSP_HDR_PROXY_AUTHENTICATE, "GST_RTSP_HDR_PROXY_AUTHENTICATE", - "proxy-authenticate"}, - {GST_RTSP_HDR_PROXY_REQUIRE, "GST_RTSP_HDR_PROXY_REQUIRE", - "proxy-require"}, - {GST_RTSP_HDR_PUBLIC, "GST_RTSP_HDR_PUBLIC", "public"}, - {GST_RTSP_HDR_RANGE, "GST_RTSP_HDR_RANGE", "range"}, - {GST_RTSP_HDR_REFERER, "GST_RTSP_HDR_REFERER", "referer"}, - {GST_RTSP_HDR_REQUIRE, "GST_RTSP_HDR_REQUIRE", "require"}, - {GST_RTSP_HDR_RETRY_AFTER, "GST_RTSP_HDR_RETRY_AFTER", "retry-after"}, - {GST_RTSP_HDR_RTP_INFO, "GST_RTSP_HDR_RTP_INFO", "rtp-info"}, - {GST_RTSP_HDR_SCALE, "GST_RTSP_HDR_SCALE", "scale"}, - {GST_RTSP_HDR_SESSION, "GST_RTSP_HDR_SESSION", "session"}, - {GST_RTSP_HDR_SERVER, "GST_RTSP_HDR_SERVER", "server"}, - {GST_RTSP_HDR_SPEED, "GST_RTSP_HDR_SPEED", "speed"}, - {GST_RTSP_HDR_TRANSPORT, "GST_RTSP_HDR_TRANSPORT", "transport"}, - {GST_RTSP_HDR_UNSUPPORTED, "GST_RTSP_HDR_UNSUPPORTED", "unsupported"}, - {GST_RTSP_HDR_USER_AGENT, "GST_RTSP_HDR_USER_AGENT", "user-agent"}, - {GST_RTSP_HDR_VIA, "GST_RTSP_HDR_VIA", "via"}, - {GST_RTSP_HDR_WWW_AUTHENTICATE, "GST_RTSP_HDR_WWW_AUTHENTICATE", - "www-authenticate"}, - {GST_RTSP_HDR_CLIENT_CHALLENGE, "GST_RTSP_HDR_CLIENT_CHALLENGE", - "client-challenge"}, - {GST_RTSP_HDR_REAL_CHALLENGE1, "GST_RTSP_HDR_REAL_CHALLENGE1", - "real-challenge1"}, - {GST_RTSP_HDR_REAL_CHALLENGE2, "GST_RTSP_HDR_REAL_CHALLENGE2", - "real-challenge2"}, - {GST_RTSP_HDR_REAL_CHALLENGE3, "GST_RTSP_HDR_REAL_CHALLENGE3", - "real-challenge3"}, - {GST_RTSP_HDR_SUBSCRIBE, "GST_RTSP_HDR_SUBSCRIBE", "subscribe"}, - {GST_RTSP_HDR_ALERT, "GST_RTSP_HDR_ALERT", "alert"}, - {GST_RTSP_HDR_CLIENT_ID, "GST_RTSP_HDR_CLIENT_ID", "client-id"}, - {GST_RTSP_HDR_COMPANY_ID, "GST_RTSP_HDR_COMPANY_ID", "company-id"}, - {GST_RTSP_HDR_GUID, "GST_RTSP_HDR_GUID", "guid"}, - {GST_RTSP_HDR_REGION_DATA, "GST_RTSP_HDR_REGION_DATA", "region-data"}, - {GST_RTSP_HDR_MAX_ASM_WIDTH, "GST_RTSP_HDR_MAX_ASM_WIDTH", - "max-asm-width"}, - {GST_RTSP_HDR_LANGUAGE, "GST_RTSP_HDR_LANGUAGE", "language"}, - {GST_RTSP_HDR_PLAYER_START_TIME, "GST_RTSP_HDR_PLAYER_START_TIME", - "player-start-time"}, - {GST_RTSP_HDR_LOCATION, "GST_RTSP_HDR_LOCATION", "location"}, - {GST_RTSP_HDR_ETAG, "GST_RTSP_HDR_ETAG", "etag"}, - {GST_RTSP_HDR_IF_MATCH, "GST_RTSP_HDR_IF_MATCH", "if-match"}, - {GST_RTSP_HDR_ACCEPT_CHARSET, "GST_RTSP_HDR_ACCEPT_CHARSET", - "accept-charset"}, - {GST_RTSP_HDR_SUPPORTED, "GST_RTSP_HDR_SUPPORTED", "supported"}, - {GST_RTSP_HDR_VARY, "GST_RTSP_HDR_VARY", "vary"}, - {GST_RTSP_HDR_X_ACCELERATE_STREAMING, - "GST_RTSP_HDR_X_ACCELERATE_STREAMING", "x-accelerate-streaming"}, - {GST_RTSP_HDR_X_ACCEPT_AUTHENT, "GST_RTSP_HDR_X_ACCEPT_AUTHENT", - "x-accept-authent"}, - {GST_RTSP_HDR_X_ACCEPT_PROXY_AUTHENT, - "GST_RTSP_HDR_X_ACCEPT_PROXY_AUTHENT", "x-accept-proxy-authent"}, - {GST_RTSP_HDR_X_BROADCAST_ID, "GST_RTSP_HDR_X_BROADCAST_ID", - "x-broadcast-id"}, - {GST_RTSP_HDR_X_BURST_STREAMING, "GST_RTSP_HDR_X_BURST_STREAMING", - "x-burst-streaming"}, - {GST_RTSP_HDR_X_NOTICE, "GST_RTSP_HDR_X_NOTICE", "x-notice"}, - {GST_RTSP_HDR_X_PLAYER_LAG_TIME, "GST_RTSP_HDR_X_PLAYER_LAG_TIME", - "x-player-lag-time"}, - {GST_RTSP_HDR_X_PLAYLIST, "GST_RTSP_HDR_X_PLAYLIST", "x-playlist"}, - {GST_RTSP_HDR_X_PLAYLIST_CHANGE_NOTICE, - "GST_RTSP_HDR_X_PLAYLIST_CHANGE_NOTICE", - "x-playlist-change-notice"}, - {GST_RTSP_HDR_X_PLAYLIST_GEN_ID, "GST_RTSP_HDR_X_PLAYLIST_GEN_ID", - "x-playlist-gen-id"}, - {GST_RTSP_HDR_X_PLAYLIST_SEEK_ID, "GST_RTSP_HDR_X_PLAYLIST_SEEK_ID", - "x-playlist-seek-id"}, - {GST_RTSP_HDR_X_PROXY_CLIENT_AGENT, "GST_RTSP_HDR_X_PROXY_CLIENT_AGENT", - "x-proxy-client-agent"}, - {GST_RTSP_HDR_X_PROXY_CLIENT_VERB, "GST_RTSP_HDR_X_PROXY_CLIENT_VERB", - "x-proxy-client-verb"}, - {GST_RTSP_HDR_X_RECEDING_PLAYLISTCHANGE, - "GST_RTSP_HDR_X_RECEDING_PLAYLISTCHANGE", - "x-receding-playlistchange"}, - {GST_RTSP_HDR_X_RTP_INFO, "GST_RTSP_HDR_X_RTP_INFO", "x-rtp-info"}, - {GST_RTSP_HDR_X_STARTUPPROFILE, "GST_RTSP_HDR_X_STARTUPPROFILE", - "x-startupprofile"}, - {GST_RTSP_HDR_TIMESTAMP, "GST_RTSP_HDR_TIMESTAMP", "timestamp"}, - {GST_RTSP_HDR_AUTHENTICATION_INFO, "GST_RTSP_HDR_AUTHENTICATION_INFO", - "authentication-info"}, - {GST_RTSP_HDR_HOST, "GST_RTSP_HDR_HOST", "host"}, - {GST_RTSP_HDR_PRAGMA, "GST_RTSP_HDR_PRAGMA", "pragma"}, - {GST_RTSP_HDR_X_SERVER_IP_ADDRESS, "GST_RTSP_HDR_X_SERVER_IP_ADDRESS", - "x-server-ip-address"}, - {GST_RTSP_HDR_X_SESSIONCOOKIE, "GST_RTSP_HDR_X_SESSIONCOOKIE", - "x-sessioncookie"}, - {GST_RTSP_HDR_LAST, "GST_RTSP_HDR_LAST", "last"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstRTSPHeaderField", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -GType -gst_rtsp_status_code_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_RTSP_STS_INVALID, "GST_RTSP_STS_INVALID", "invalid"}, - {GST_RTSP_STS_CONTINUE, "GST_RTSP_STS_CONTINUE", "continue"}, - {GST_RTSP_STS_OK, "GST_RTSP_STS_OK", "ok"}, - {GST_RTSP_STS_CREATED, "GST_RTSP_STS_CREATED", "created"}, - {GST_RTSP_STS_LOW_ON_STORAGE, "GST_RTSP_STS_LOW_ON_STORAGE", - "low-on-storage"}, - {GST_RTSP_STS_MULTIPLE_CHOICES, "GST_RTSP_STS_MULTIPLE_CHOICES", - "multiple-choices"}, - {GST_RTSP_STS_MOVED_PERMANENTLY, "GST_RTSP_STS_MOVED_PERMANENTLY", - "moved-permanently"}, - {GST_RTSP_STS_MOVE_TEMPORARILY, "GST_RTSP_STS_MOVE_TEMPORARILY", - "move-temporarily"}, - {GST_RTSP_STS_SEE_OTHER, "GST_RTSP_STS_SEE_OTHER", "see-other"}, - {GST_RTSP_STS_NOT_MODIFIED, "GST_RTSP_STS_NOT_MODIFIED", "not-modified"}, - {GST_RTSP_STS_USE_PROXY, "GST_RTSP_STS_USE_PROXY", "use-proxy"}, - {GST_RTSP_STS_BAD_REQUEST, "GST_RTSP_STS_BAD_REQUEST", "bad-request"}, - {GST_RTSP_STS_UNAUTHORIZED, "GST_RTSP_STS_UNAUTHORIZED", "unauthorized"}, - {GST_RTSP_STS_PAYMENT_REQUIRED, "GST_RTSP_STS_PAYMENT_REQUIRED", - "payment-required"}, - {GST_RTSP_STS_FORBIDDEN, "GST_RTSP_STS_FORBIDDEN", "forbidden"}, - {GST_RTSP_STS_NOT_FOUND, "GST_RTSP_STS_NOT_FOUND", "not-found"}, - {GST_RTSP_STS_METHOD_NOT_ALLOWED, "GST_RTSP_STS_METHOD_NOT_ALLOWED", - "method-not-allowed"}, - {GST_RTSP_STS_NOT_ACCEPTABLE, "GST_RTSP_STS_NOT_ACCEPTABLE", - "not-acceptable"}, - {GST_RTSP_STS_PROXY_AUTH_REQUIRED, "GST_RTSP_STS_PROXY_AUTH_REQUIRED", - "proxy-auth-required"}, - {GST_RTSP_STS_REQUEST_TIMEOUT, "GST_RTSP_STS_REQUEST_TIMEOUT", - "request-timeout"}, - {GST_RTSP_STS_GONE, "GST_RTSP_STS_GONE", "gone"}, - {GST_RTSP_STS_LENGTH_REQUIRED, "GST_RTSP_STS_LENGTH_REQUIRED", - "length-required"}, - {GST_RTSP_STS_PRECONDITION_FAILED, "GST_RTSP_STS_PRECONDITION_FAILED", - "precondition-failed"}, - {GST_RTSP_STS_REQUEST_ENTITY_TOO_LARGE, - "GST_RTSP_STS_REQUEST_ENTITY_TOO_LARGE", - "request-entity-too-large"}, - {GST_RTSP_STS_REQUEST_URI_TOO_LARGE, "GST_RTSP_STS_REQUEST_URI_TOO_LARGE", - "request-uri-too-large"}, - {GST_RTSP_STS_UNSUPPORTED_MEDIA_TYPE, - "GST_RTSP_STS_UNSUPPORTED_MEDIA_TYPE", "unsupported-media-type"}, - {GST_RTSP_STS_PARAMETER_NOT_UNDERSTOOD, - "GST_RTSP_STS_PARAMETER_NOT_UNDERSTOOD", - "parameter-not-understood"}, - {GST_RTSP_STS_CONFERENCE_NOT_FOUND, "GST_RTSP_STS_CONFERENCE_NOT_FOUND", - "conference-not-found"}, - {GST_RTSP_STS_NOT_ENOUGH_BANDWIDTH, "GST_RTSP_STS_NOT_ENOUGH_BANDWIDTH", - "not-enough-bandwidth"}, - {GST_RTSP_STS_SESSION_NOT_FOUND, "GST_RTSP_STS_SESSION_NOT_FOUND", - "session-not-found"}, - {GST_RTSP_STS_METHOD_NOT_VALID_IN_THIS_STATE, - "GST_RTSP_STS_METHOD_NOT_VALID_IN_THIS_STATE", - "method-not-valid-in-this-state"}, - {GST_RTSP_STS_HEADER_FIELD_NOT_VALID_FOR_RESOURCE, - "GST_RTSP_STS_HEADER_FIELD_NOT_VALID_FOR_RESOURCE", - "header-field-not-valid-for-resource"}, - {GST_RTSP_STS_INVALID_RANGE, "GST_RTSP_STS_INVALID_RANGE", - "invalid-range"}, - {GST_RTSP_STS_PARAMETER_IS_READONLY, "GST_RTSP_STS_PARAMETER_IS_READONLY", - "parameter-is-readonly"}, - {GST_RTSP_STS_AGGREGATE_OPERATION_NOT_ALLOWED, - "GST_RTSP_STS_AGGREGATE_OPERATION_NOT_ALLOWED", - "aggregate-operation-not-allowed"}, - {GST_RTSP_STS_ONLY_AGGREGATE_OPERATION_ALLOWED, - "GST_RTSP_STS_ONLY_AGGREGATE_OPERATION_ALLOWED", - "only-aggregate-operation-allowed"}, - {GST_RTSP_STS_UNSUPPORTED_TRANSPORT, "GST_RTSP_STS_UNSUPPORTED_TRANSPORT", - "unsupported-transport"}, - {GST_RTSP_STS_DESTINATION_UNREACHABLE, - "GST_RTSP_STS_DESTINATION_UNREACHABLE", "destination-unreachable"}, - {GST_RTSP_STS_INTERNAL_SERVER_ERROR, "GST_RTSP_STS_INTERNAL_SERVER_ERROR", - "internal-server-error"}, - {GST_RTSP_STS_NOT_IMPLEMENTED, "GST_RTSP_STS_NOT_IMPLEMENTED", - "not-implemented"}, - {GST_RTSP_STS_BAD_GATEWAY, "GST_RTSP_STS_BAD_GATEWAY", "bad-gateway"}, - {GST_RTSP_STS_SERVICE_UNAVAILABLE, "GST_RTSP_STS_SERVICE_UNAVAILABLE", - "service-unavailable"}, - {GST_RTSP_STS_GATEWAY_TIMEOUT, "GST_RTSP_STS_GATEWAY_TIMEOUT", - "gateway-timeout"}, - {GST_RTSP_STS_RTSP_VERSION_NOT_SUPPORTED, - "GST_RTSP_STS_RTSP_VERSION_NOT_SUPPORTED", - "rtsp-version-not-supported"}, - {GST_RTSP_STS_OPTION_NOT_SUPPORTED, "GST_RTSP_STS_OPTION_NOT_SUPPORTED", - "option-not-supported"}, - {0, NULL, NULL} - }; - GType g_define_type_id = - g_enum_register_static ("GstRTSPStatusCode", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* Generated data ends here */ diff --git a/android/gst-libs/gst/rtsp/gstrtsp-enumtypes.h b/android/gst-libs/gst/rtsp/gstrtsp-enumtypes.h deleted file mode 100644 index 5a631f6..0000000 --- a/android/gst-libs/gst/rtsp/gstrtsp-enumtypes.h +++ /dev/null @@ -1,35 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#ifndef __gst_rtsp_ENUM_TYPES_H__ -#define __gst_rtsp_ENUM_TYPES_H__ - -#include - -G_BEGIN_DECLS - -/* enumerations from "gstrtspdefs.h" */ -GType gst_rtsp_result_get_type (void); -#define GST_TYPE_RTSP_RESULT (gst_rtsp_result_get_type()) -GType gst_rtsp_event_get_type (void); -#define GST_TYPE_RTSP_EVENT (gst_rtsp_event_get_type()) -GType gst_rtsp_family_get_type (void); -#define GST_TYPE_RTSP_FAMILY (gst_rtsp_family_get_type()) -GType gst_rtsp_state_get_type (void); -#define GST_TYPE_RTSP_STATE (gst_rtsp_state_get_type()) -GType gst_rtsp_version_get_type (void); -#define GST_TYPE_RTSP_VERSION (gst_rtsp_version_get_type()) -GType gst_rtsp_method_get_type (void); -#define GST_TYPE_RTSP_METHOD (gst_rtsp_method_get_type()) -GType gst_rtsp_auth_method_get_type (void); -#define GST_TYPE_RTSP_AUTH_METHOD (gst_rtsp_auth_method_get_type()) -GType gst_rtsp_header_field_get_type (void); -#define GST_TYPE_RTSP_HEADER_FIELD (gst_rtsp_header_field_get_type()) -GType gst_rtsp_status_code_get_type (void); -#define GST_TYPE_RTSP_STATUS_CODE (gst_rtsp_status_code_get_type()) -G_END_DECLS - -#endif /* __gst_rtsp_ENUM_TYPES_H__ */ - -/* Generated data ends here */ - diff --git a/android/gst-libs/gst/rtsp/gstrtsp-marshal.c b/android/gst-libs/gst/rtsp/gstrtsp-marshal.c deleted file mode 100644 index a0177eb..0000000 --- a/android/gst-libs/gst/rtsp/gstrtsp-marshal.c +++ /dev/null @@ -1,85 +0,0 @@ -#include "gstrtsp-marshal.h" - -#include - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* ENUM:POINTER,POINTER (gstrtsp-marshal.list:1) */ -void -gst_rtsp_marshal_ENUM__POINTER_POINTER (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gint (*GMarshalFunc_ENUM__POINTER_POINTER) (gpointer data1, - gpointer arg_1, gpointer arg_2, gpointer data2); - register GMarshalFunc_ENUM__POINTER_POINTER callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gint v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_ENUM__POINTER_POINTER) (marshal_data ? marshal_data : - cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_pointer (param_values + 1), - g_marshal_value_peek_pointer (param_values + 2), data2); - - g_value_set_enum (return_value, v_return); -} diff --git a/android/gst-libs/gst/rtsp/gstrtsp-marshal.h b/android/gst-libs/gst/rtsp/gstrtsp-marshal.h deleted file mode 100644 index e2c5b4b..0000000 --- a/android/gst-libs/gst/rtsp/gstrtsp-marshal.h +++ /dev/null @@ -1,20 +0,0 @@ - -#ifndef __gst_rtsp_marshal_MARSHAL_H__ -#define __gst_rtsp_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* ENUM:POINTER,POINTER (gstrtsp-marshal.list:1) */ -extern void gst_rtsp_marshal_ENUM__POINTER_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __gst_rtsp_marshal_MARSHAL_H__ */ - diff --git a/android/gst-libs/gst/video/video-enumtypes.c b/android/gst-libs/gst/video/video-enumtypes.c deleted file mode 100644 index 13aaef2..0000000 --- a/android/gst-libs/gst/video/video-enumtypes.c +++ /dev/null @@ -1,45 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#include "video-enumtypes.h" - -#include "video.h" - -/* enumerations from "video.h" */ -GType -gst_video_format_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_VIDEO_FORMAT_UNKNOWN, "GST_VIDEO_FORMAT_UNKNOWN", "unknown"}, - {GST_VIDEO_FORMAT_I420, "GST_VIDEO_FORMAT_I420", "i420"}, - {GST_VIDEO_FORMAT_YV12, "GST_VIDEO_FORMAT_YV12", "yv12"}, - {GST_VIDEO_FORMAT_YUY2, "GST_VIDEO_FORMAT_YUY2", "yuy2"}, - {GST_VIDEO_FORMAT_UYVY, "GST_VIDEO_FORMAT_UYVY", "uyvy"}, - {GST_VIDEO_FORMAT_AYUV, "GST_VIDEO_FORMAT_AYUV", "ayuv"}, - {GST_VIDEO_FORMAT_RGBx, "GST_VIDEO_FORMAT_RGBx", "rgbx"}, - {GST_VIDEO_FORMAT_BGRx, "GST_VIDEO_FORMAT_BGRx", "bgrx"}, - {GST_VIDEO_FORMAT_xRGB, "GST_VIDEO_FORMAT_xRGB", "xrgb"}, - {GST_VIDEO_FORMAT_xBGR, "GST_VIDEO_FORMAT_xBGR", "xbgr"}, - {GST_VIDEO_FORMAT_RGBA, "GST_VIDEO_FORMAT_RGBA", "rgba"}, - {GST_VIDEO_FORMAT_BGRA, "GST_VIDEO_FORMAT_BGRA", "bgra"}, - {GST_VIDEO_FORMAT_ARGB, "GST_VIDEO_FORMAT_ARGB", "argb"}, - {GST_VIDEO_FORMAT_ABGR, "GST_VIDEO_FORMAT_ABGR", "abgr"}, - {GST_VIDEO_FORMAT_RGB, "GST_VIDEO_FORMAT_RGB", "rgb"}, - {GST_VIDEO_FORMAT_BGR, "GST_VIDEO_FORMAT_BGR", "bgr"}, - {GST_VIDEO_FORMAT_Y41B, "GST_VIDEO_FORMAT_Y41B", "y41b"}, - {GST_VIDEO_FORMAT_Y42B, "GST_VIDEO_FORMAT_Y42B", "y42b"}, - {GST_VIDEO_FORMAT_YVYU, "GST_VIDEO_FORMAT_YVYU", "yvyu"}, - {GST_VIDEO_FORMAT_Y444, "GST_VIDEO_FORMAT_Y444", "y444"}, - {GST_VIDEO_FORMAT_v210, "GST_VIDEO_FORMAT_v210", "v210"}, - {GST_VIDEO_FORMAT_v216, "GST_VIDEO_FORMAT_v216", "v216"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_enum_register_static ("GstVideoFormat", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* Generated data ends here */ diff --git a/android/gst-libs/gst/video/video-enumtypes.h b/android/gst-libs/gst/video/video-enumtypes.h deleted file mode 100644 index 3f99b47..0000000 --- a/android/gst-libs/gst/video/video-enumtypes.h +++ /dev/null @@ -1,19 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#ifndef __GST_VIDEO_ENUM_TYPES_H__ -#define __GST_VIDEO_ENUM_TYPES_H__ - -#include - -G_BEGIN_DECLS - -/* enumerations from "video.h" */ -GType gst_video_format_get_type (void); -#define GST_TYPE_VIDEO_FORMAT (gst_video_format_get_type()) -G_END_DECLS - -#endif /* __GST_VIDEO_ENUM_TYPES_H__ */ - -/* Generated data ends here */ - diff --git a/android/gst/playback/gstplay-marshal.c b/android/gst/playback/gstplay-marshal.c deleted file mode 100644 index 3154994..0000000 --- a/android/gst/playback/gstplay-marshal.c +++ /dev/null @@ -1,468 +0,0 @@ -#include "gstplay-marshal.h" - -#include - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* BOOLEAN:OBJECT,BOXED (gstplay-marshal.list:1) */ -void -gst_play_marshal_BOOLEAN__OBJECT_BOXED (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT_BOXED) (gpointer data1, - gpointer arg_1, gpointer arg_2, gpointer data2); - register GMarshalFunc_BOOLEAN__OBJECT_BOXED callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gboolean v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_BOOLEAN__OBJECT_BOXED) (marshal_data ? marshal_data : - cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_boxed (param_values + 2), data2); - - g_value_set_boolean (return_value, v_return); -} - -/* BOOLEAN:OBJECT,OBJECT,OBJECT (gstplay-marshal.list:2) */ -void -gst_play_marshal_BOOLEAN__OBJECT_OBJECT_OBJECT (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT_OBJECT_OBJECT) (gpointer - data1, gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); - register GMarshalFunc_BOOLEAN__OBJECT_OBJECT_OBJECT callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gboolean v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_BOOLEAN__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data - : cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_object (param_values + 2), - g_marshal_value_peek_object (param_values + 3), data2); - - g_value_set_boolean (return_value, v_return); -} - -/* BOXED:OBJECT,BOXED (gstplay-marshal.list:3) */ -void -gst_play_marshal_BOXED__OBJECT_BOXED (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gpointer (*GMarshalFunc_BOXED__OBJECT_BOXED) (gpointer data1, - gpointer arg_1, gpointer arg_2, gpointer data2); - register GMarshalFunc_BOXED__OBJECT_BOXED callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gpointer v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_BOXED__OBJECT_BOXED) (marshal_data ? marshal_data : - cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_boxed (param_values + 2), data2); - - g_value_take_boxed (return_value, v_return); -} - -/* VOID:OBJECT,BOOLEAN (gstplay-marshal.list:4) */ -void -gst_play_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__OBJECT_BOOLEAN) (gpointer data1, - gpointer arg_1, gboolean arg_2, gpointer data2); - register GMarshalFunc_VOID__OBJECT_BOOLEAN callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : - cc->callback); - - callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_boolean (param_values + 2), data2); -} - -/* ENUM:OBJECT,OBJECT,BOXED (gstplay-marshal.list:5) */ -void -gst_play_marshal_ENUM__OBJECT_OBJECT_BOXED (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gint (*GMarshalFunc_ENUM__OBJECT_OBJECT_BOXED) (gpointer data1, - gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); - register GMarshalFunc_ENUM__OBJECT_OBJECT_BOXED callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gint v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_ENUM__OBJECT_OBJECT_BOXED) (marshal_data ? marshal_data : - cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_object (param_values + 2), - g_marshal_value_peek_boxed (param_values + 3), data2); - - g_value_set_enum (return_value, v_return); -} - -/* ENUM:OBJECT,BOXED,OBJECT (gstplay-marshal.list:6) */ -void -gst_play_marshal_ENUM__OBJECT_BOXED_OBJECT (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gint (*GMarshalFunc_ENUM__OBJECT_BOXED_OBJECT) (gpointer data1, - gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); - register GMarshalFunc_ENUM__OBJECT_BOXED_OBJECT callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gint v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_ENUM__OBJECT_BOXED_OBJECT) (marshal_data ? marshal_data : - cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_boxed (param_values + 2), - g_marshal_value_peek_object (param_values + 3), data2); - - g_value_set_enum (return_value, v_return); -} - -/* BOXED:OBJECT,BOXED,BOXED (gstplay-marshal.list:7) */ -void -gst_play_marshal_BOXED__OBJECT_BOXED_BOXED (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gpointer (*GMarshalFunc_BOXED__OBJECT_BOXED_BOXED) (gpointer data1, - gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); - register GMarshalFunc_BOXED__OBJECT_BOXED_BOXED callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gpointer v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_BOXED__OBJECT_BOXED_BOXED) (marshal_data ? marshal_data : - cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_boxed (param_values + 2), - g_marshal_value_peek_boxed (param_values + 3), data2); - - g_value_take_boxed (return_value, v_return); -} - -/* BOXED:INT (gstplay-marshal.list:8) */ -void -gst_play_marshal_BOXED__INT (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gpointer (*GMarshalFunc_BOXED__INT) (gpointer data1, - gint arg_1, gpointer data2); - register GMarshalFunc_BOXED__INT callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gpointer v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_BOXED__INT) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_int (param_values + 1), data2); - - g_value_take_boxed (return_value, v_return); -} - -/* OBJECT:BOXED (gstplay-marshal.list:9) */ -void -gst_play_marshal_OBJECT__BOXED (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef GObject *(*GMarshalFunc_OBJECT__BOXED) (gpointer data1, - gpointer arg_1, gpointer data2); - register GMarshalFunc_OBJECT__BOXED callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - GObject *v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_OBJECT__BOXED) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_boxed (param_values + 1), data2); - - g_value_take_object (return_value, v_return); -} - -/* OBJECT:INT (gstplay-marshal.list:10) */ -void -gst_play_marshal_OBJECT__INT (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef GObject *(*GMarshalFunc_OBJECT__INT) (gpointer data1, - gint arg_1, gpointer data2); - register GMarshalFunc_OBJECT__INT callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - GObject *v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_OBJECT__INT) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_int (param_values + 1), data2); - - g_value_take_object (return_value, v_return); -} - -/* INT64:VOID (gstplay-marshal.list:11) */ -void -gst_play_marshal_INT64__VOID (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gint64 (*GMarshalFunc_INT64__VOID) (gpointer data1, gpointer data2); - register GMarshalFunc_INT64__VOID callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gint64 v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 1); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_INT64__VOID) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, data2); - - g_value_set_int64 (return_value, v_return); -} - -/* VOID:OBJECT,INT64,INT64 (gstplay-marshal.list:12) */ -void -gst_play_marshal_VOID__OBJECT_INT64_INT64 (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__OBJECT_INT64_INT64) (gpointer data1, - gpointer arg_1, gint64 arg_2, gint64 arg_3, gpointer data2); - register GMarshalFunc_VOID__OBJECT_INT64_INT64 callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_VOID__OBJECT_INT64_INT64) (marshal_data ? marshal_data : - cc->callback); - - callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_int64 (param_values + 2), - g_marshal_value_peek_int64 (param_values + 3), data2); -} diff --git a/android/gst/playback/gstplay-marshal.h b/android/gst/playback/gstplay-marshal.h deleted file mode 100644 index 905a2c8..0000000 --- a/android/gst/playback/gstplay-marshal.h +++ /dev/null @@ -1,108 +0,0 @@ - -#ifndef __gst_play_marshal_MARSHAL_H__ -#define __gst_play_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* BOOLEAN:OBJECT,BOXED (gstplay-marshal.list:1) */ -extern void gst_play_marshal_BOOLEAN__OBJECT_BOXED (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* BOOLEAN:OBJECT,OBJECT,OBJECT (gstplay-marshal.list:2) */ -extern void gst_play_marshal_BOOLEAN__OBJECT_OBJECT_OBJECT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* BOXED:OBJECT,BOXED (gstplay-marshal.list:3) */ -extern void gst_play_marshal_BOXED__OBJECT_BOXED (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:OBJECT,BOOLEAN (gstplay-marshal.list:4) */ -extern void gst_play_marshal_VOID__OBJECT_BOOLEAN (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* ENUM:OBJECT,OBJECT,BOXED (gstplay-marshal.list:5) */ -extern void gst_play_marshal_ENUM__OBJECT_OBJECT_BOXED (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* ENUM:OBJECT,BOXED,OBJECT (gstplay-marshal.list:6) */ -extern void gst_play_marshal_ENUM__OBJECT_BOXED_OBJECT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* BOXED:OBJECT,BOXED,BOXED (gstplay-marshal.list:7) */ -extern void gst_play_marshal_BOXED__OBJECT_BOXED_BOXED (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* BOXED:INT (gstplay-marshal.list:8) */ -extern void gst_play_marshal_BOXED__INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* OBJECT:BOXED (gstplay-marshal.list:9) */ -extern void gst_play_marshal_OBJECT__BOXED (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* OBJECT:INT (gstplay-marshal.list:10) */ -extern void gst_play_marshal_OBJECT__INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* INT64:VOID (gstplay-marshal.list:11) */ -extern void gst_play_marshal_INT64__VOID (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:OBJECT,INT64,INT64 (gstplay-marshal.list:12) */ -extern void gst_play_marshal_VOID__OBJECT_INT64_INT64 (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __gst_play_marshal_MARSHAL_H__ */ - diff --git a/android/gst/tcp/gsttcp-enumtypes.c b/android/gst/tcp/gsttcp-enumtypes.c deleted file mode 100644 index 0f1018a..0000000 --- a/android/gst/tcp/gsttcp-enumtypes.c +++ /dev/null @@ -1,25 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#include "gsttcp-enumtypes.h" - -#include "gsttcp.h" - -/* enumerations from "gsttcp.h" */ -GType -gst_tcp_protocol_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_TCP_PROTOCOL_NONE, "GST_TCP_PROTOCOL_NONE", "none"}, - {GST_TCP_PROTOCOL_GDP, "GST_TCP_PROTOCOL_GDP", "gdp"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_enum_register_static ("GstTCPProtocol", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} - -/* Generated data ends here */ diff --git a/android/gst/tcp/gsttcp-enumtypes.h b/android/gst/tcp/gsttcp-enumtypes.h deleted file mode 100644 index 46cda7d..0000000 --- a/android/gst/tcp/gsttcp-enumtypes.h +++ /dev/null @@ -1,19 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#ifndef __GST_TCP_ENUM_TYPES_H__ -#define __GST_TCP_ENUM_TYPES_H__ - -#include - -G_BEGIN_DECLS - -/* enumerations from "gsttcp.h" */ -GType gst_tcp_protocol_get_type (void); -#define GST_TYPE_TCP_PROTOCOL (gst_tcp_protocol_get_type()) -G_END_DECLS - -#endif /* __GST_TCP_ENUM_TYPES_H__ */ - -/* Generated data ends here */ - diff --git a/android/gst/tcp/gsttcp-marshal.c b/android/gst/tcp/gsttcp-marshal.c deleted file mode 100644 index fb11074..0000000 --- a/android/gst/tcp/gsttcp-marshal.c +++ /dev/null @@ -1,186 +0,0 @@ -#include "gsttcp-marshal.h" - -#include - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:STRING,UINT (gsttcp-marshal.list:1) */ -void -gst_tcp_marshal_VOID__STRING_UINT (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_UINT) (gpointer data1, - gpointer arg_1, guint arg_2, gpointer data2); - register GMarshalFunc_VOID__STRING_UINT callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_VOID__STRING_UINT) (marshal_data ? marshal_data : - cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_uint (param_values + 2), data2); -} - -/* VOID:INT (gsttcp-marshal.list:2) */ - -/* VOID:INT,BOXED (gsttcp-marshal.list:3) */ -void -gst_tcp_marshal_VOID__INT_BOXED (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__INT_BOXED) (gpointer data1, - gint arg_1, gpointer arg_2, gpointer data2); - register GMarshalFunc_VOID__INT_BOXED callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_VOID__INT_BOXED) (marshal_data ? marshal_data : - cc->callback); - - callback (data1, - g_marshal_value_peek_int (param_values + 1), - g_marshal_value_peek_boxed (param_values + 2), data2); -} - -/* VOID:INT,ENUM,INT,UINT64,INT,UINT64 (gsttcp-marshal.list:4) */ -void -gst_tcp_marshal_VOID__INT_ENUM_INT_UINT64_INT_UINT64 (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__INT_ENUM_INT_UINT64_INT_UINT64) (gpointer - data1, gint arg_1, gint arg_2, gint arg_3, guint64 arg_4, gint arg_5, - guint64 arg_6, gpointer data2); - register GMarshalFunc_VOID__INT_ENUM_INT_UINT64_INT_UINT64 callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 7); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_VOID__INT_ENUM_INT_UINT64_INT_UINT64) (marshal_data ? - marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_int (param_values + 1), - g_marshal_value_peek_enum (param_values + 2), - g_marshal_value_peek_int (param_values + 3), - g_marshal_value_peek_uint64 (param_values + 4), - g_marshal_value_peek_int (param_values + 5), - g_marshal_value_peek_uint64 (param_values + 6), data2); -} - -/* BOXED:INT (gsttcp-marshal.list:5) */ -void -gst_tcp_marshal_BOXED__INT (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gpointer (*GMarshalFunc_BOXED__INT) (gpointer data1, - gint arg_1, gpointer data2); - register GMarshalFunc_BOXED__INT callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gpointer v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_BOXED__INT) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_int (param_values + 1), data2); - - g_value_take_boxed (return_value, v_return); -} diff --git a/android/gst/tcp/gsttcp-marshal.h b/android/gst/tcp/gsttcp-marshal.h deleted file mode 100644 index 092e152..0000000 --- a/android/gst/tcp/gsttcp-marshal.h +++ /dev/null @@ -1,47 +0,0 @@ - -#ifndef __gst_tcp_marshal_MARSHAL_H__ -#define __gst_tcp_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* VOID:STRING,UINT (gsttcp-marshal.list:1) */ -extern void gst_tcp_marshal_VOID__STRING_UINT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:INT (gsttcp-marshal.list:2) */ -#define gst_tcp_marshal_VOID__INT g_cclosure_marshal_VOID__INT - -/* VOID:INT,BOXED (gsttcp-marshal.list:3) */ -extern void gst_tcp_marshal_VOID__INT_BOXED (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:INT,ENUM,INT,UINT64,INT,UINT64 (gsttcp-marshal.list:4) */ -extern void gst_tcp_marshal_VOID__INT_ENUM_INT_UINT64_INT_UINT64 (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* BOXED:INT (gsttcp-marshal.list:5) */ -extern void gst_tcp_marshal_BOXED__INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __gst_tcp_marshal_MARSHAL_H__ */ - diff --git a/android/interfaces.mk b/android/interfaces.mk index 91bb1d5..61564b3 100644 --- a/android/interfaces.mk +++ b/android/interfaces.mk @@ -15,12 +15,10 @@ gst_interfaces_COPY_HEADERS_BASE := \ gst-libs/gst/interfaces/tunerchannel.h \ gst-libs/gst/interfaces/tunernorm.h \ gst-libs/gst/interfaces/videoorientation.h \ - gst-libs/gst/interfaces/xoverlay.h -gst_interfaces_COPY_HEADERS_ANDROID := \ + gst-libs/gst/interfaces/xoverlay.h \ gst-libs/gst/interfaces/interfaces-enumtypes.h -gst_interfaces_COPY_HEADERS := $(addprefix ../,$(gst_interfaces_COPY_HEADERS_BASE)) \ - $(addprefix ../android/,$(gst_interfaces_COPY_HEADERS_ANDROID)) +gst_interfaces_COPY_HEADERS := $(addprefix ../,$(gst_interfaces_COPY_HEADERS_BASE)) include $(CLEAR_VARS) @@ -39,8 +37,7 @@ interfaces_LOCAL_SRC_FILES_BASE:= \ gst-libs/gst/interfaces/tunernorm.c \ gst-libs/gst/interfaces/tunerchannel.c \ gst-libs/gst/interfaces/videoorientation.c \ - gst-libs/gst/interfaces/xoverlay.c -interfaces_LOCAL_SRC_FILES_ANDROID:= \ + gst-libs/gst/interfaces/xoverlay.c \ gst-libs/gst/interfaces/interfaces-marshal.c \ gst-libs/gst/interfaces/interfaces-enumtypes.c @@ -57,24 +54,9 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstinterfaces-0.10 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/interfaces \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst-libs/gst/interfaces \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -83,4 +65,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_interfaces_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_interfaces_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional + include $(BUILD_SHARED_LIBRARY) diff --git a/android/netbuffer.mk b/android/netbuffer.mk index c3efd8b..fd904bd 100644 --- a/android/netbuffer.mk +++ b/android/netbuffer.mk @@ -24,24 +24,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstnetbuffer-0.10 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/netbuffer \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/../gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -49,5 +33,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_netbuffer_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_netbuffer_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/pbutils.mk b/android/pbutils.mk index facd6a9..a9aebac 100644 --- a/android/pbutils.mk +++ b/android/pbutils.mk @@ -1,36 +1,51 @@ LOCAL_PATH:= $(call my-dir) -#---------------------------------------- -# include +include $(CLEAR_VARS) + +GST_PBUTILS_DIR := gst-libs/gst/pbutils/ + gst_pbutils_COPY_HEADERS_TO := gstreamer-0.10/gst/pbutils gst_pbutils_COPY_HEADERS_BASE := \ gst-libs/gst/pbutils/descriptions.h \ gst-libs/gst/pbutils/install-plugins.h \ gst-libs/gst/pbutils/missing-plugins.h \ - gst-libs/gst/pbutils/pbutils.h -gst_pbutils_COPY_HEADERS_ANDROID := \ + gst-libs/gst/pbutils/pbutils.h \ gst-libs/gst/pbutils/pbutils-enumtypes.h -gst_pbutils_COPY_HEADERS := $(addprefix ../,$(gst_pbutils_COPY_HEADERS_BASE)) \ - $(addprefix ../android/,$(gst_pbutils_COPY_HEADERS_ANDROID)) +gst_pbutils_COPY_HEADERS := $(addprefix ../,$(gst_pbutils_COPY_HEADERS_BASE)) -include $(CLEAR_VARS) LOCAL_ARM_MODE := arm -pbutils_LOCAL_SRC_FILES_BASE:= \ - gst-libs/gst/pbutils/pbutils.c \ - gst-libs/gst/pbutils/descriptions.c \ - gst-libs/gst/pbutils/install-plugins.c \ - gst-libs/gst/pbutils/missing-plugins.c -pbutils_LOCAL_SRC_FILES_ANDROID:= \ - gst-libs/gst/pbutils/pbutils-enumtypes.c +BUILT_SOURCES = \ + pbutils-enumtypes.c \ + pbutils-enumtypes.h \ + pbutils-marshal.c \ + pbutils-marshal.h + +LOCAL_SRC_FILES := \ + gstpluginsbaseversion.c \ + pbutils.c \ + codec-utils.c \ + descriptions.c \ + encoding-profile.c \ + encoding-target.c \ + install-plugins.c \ + missing-plugins.c \ + gstdiscoverer.c \ + gstdiscoverer-types.c \ + pbutils-enumtypes.c \ + pbutils-marshal.c + +LOCAL_SRC_FILES := $(addprefix ../$(GST_PBUTILS_DIR),$(LOCAL_SRC_FILES)) + +$(BUILT_SOURCES): + make -C $(GST_PLUGINS_BASE_TOP)/$(GST_PBUTILS_DIR) $@ -LOCAL_SRC_FILES:= $(addprefix ../,$(pbutils_LOCAL_SRC_FILES_BASE)) \ - $(addprefix ../android/,$(pbutils_LOCAL_SRC_FILES_ANDROID)) LOCAL_SHARED_LIBRARIES := \ + libgstvideo-0.10 \ libgstreamer-0.10 \ libgstbase-0.10 \ libglib-2.0 \ @@ -39,25 +54,8 @@ LOCAL_SHARED_LIBRARIES := \ libgobject-2.0 LOCAL_MODULE:= libgstpbutils-0.10 - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/pbutils \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst-libs/gst/pbutils \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -65,5 +63,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_pbutils_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_pbutils_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/playbin.mk b/android/playbin.mk index cb7fa10..e792429 100644 --- a/android/playbin.mk +++ b/android/playbin.mk @@ -4,23 +4,19 @@ include $(CLEAR_VARS) LOCAL_ARM_MODE := arm playbin_LOCAL_SRC_FILES_BASE:= \ - gst/playback/gstinputselector.c \ gst/playback/gstplayback.c \ gst/playback/gstplaybin.c \ gst/playback/gstplaybin2.c \ gst/playback/gstplaysink.c \ gst/playback/gstplaybasebin.c \ gst/playback/gstplay-enum.c \ - gst/playback/gstfactorylists.c \ - gst/playback/gstscreenshot.c \ gst/playback/gststreaminfo.c \ gst/playback/gststreamselector.c \ - gst/playback/gstsubtitleoverlay.c -playbin_LOCAL_SRC_FILES_ANDROID:= \ + gst/playback/gstsubtitleoverlay.c \ + gst/playback/gststreamsynchronizer.c \ gst/playback/gstplay-marshal.c -LOCAL_SRC_FILES:= $(addprefix ../,$(playbin_LOCAL_SRC_FILES_BASE)) \ - $(addprefix ../android/,$(playbin_LOCAL_SRC_FILES_ANDROID)) +LOCAL_SRC_FILES:= $(addprefix ../,$(playbin_LOCAL_SRC_FILES_BASE)) LOCAL_SHARED_LIBRARIES := \ libgstreamer-0.10 \ @@ -35,24 +31,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstplaybin -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/playback \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst/playback \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -60,5 +40,6 @@ LOCAL_PRELINK_MODULE := false #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/queue2.mk b/android/queue2.mk index 65f1f1e..6c5fcd4 100644 --- a/android/queue2.mk +++ b/android/queue2.mk @@ -5,12 +5,10 @@ include $(CLEAR_VARS) LOCAL_ARM_MODE := arm queue2_LOCAL_SRC_FILES_BASE:= \ - gst/playback/gstqueue2.c -queue2_LOCAL_SRC_FILES_ANDROID:= \ + gst/playback/gstqueue2.c \ gst/playback/gstplay-marshal.c -LOCAL_SRC_FILES:= $(addprefix ../,$(queue2_LOCAL_SRC_FILES_BASE)) \ - $(addprefix ../android/,$(queue2_LOCAL_SRC_FILES_ANDROID)) +LOCAL_SRC_FILES:= $(addprefix ../,$(queue2_LOCAL_SRC_FILES_BASE)) LOCAL_SHARED_LIBRARIES := \ @@ -24,23 +22,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstqueue2 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/playback \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst/playback \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H +LOCAL_CFLAGS := -DHAVE_CONFIG_H \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # diff --git a/android/riff.mk b/android/riff.mk index bae94a7..759bdad 100644 --- a/android/riff.mk +++ b/android/riff.mk @@ -31,23 +31,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstriff-0.10 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/riff \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -55,5 +40,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_riffs_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_riffs_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/rtp.mk b/android/rtp.mk index 7a8a8bc..7ad0071 100644 --- a/android/rtp.mk +++ b/android/rtp.mk @@ -34,24 +34,8 @@ LOCAL_SHARED_LIBRARIES := \ libgobject-2.0 LOCAL_MODULE:= libgstrtp-0.10 - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/rtp \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/../ \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -59,5 +43,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_rtp_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_rtp_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/rtsp.mk b/android/rtsp.mk index 7f628e3..fdc07b9 100644 --- a/android/rtsp.mk +++ b/android/rtsp.mk @@ -10,12 +10,10 @@ gst_rtsp_COPY_HEADERS_BASE := \ gst-libs/gst/rtsp/gstrtspmessage.h \ gst-libs/gst/rtsp/gstrtsprange.h \ gst-libs/gst/rtsp/gstrtsptransport.h \ - gst-libs/gst/rtsp/gstrtspurl.h -gst_rtsp_COPY_HEADERS_ANDROID := \ + gst-libs/gst/rtsp/gstrtspurl.h \ gst-libs/gst/rtsp/gstrtsp-enumtypes.h -gst_rtsp_COPY_HEADERS := $(addprefix ../,$(gst_rtsp_COPY_HEADERS_BASE)) \ - $(addprefix ../android/,$(gst_rtsp_COPY_HEADERS_ANDROID)) +gst_rtsp_COPY_HEADERS := $(addprefix ../,$(gst_rtsp_COPY_HEADERS_BASE)) include $(CLEAR_VARS) @@ -29,13 +27,11 @@ rtsp_LOCAL_SRC_FILES_BASE:= \ gst-libs/gst/rtsp/gstrtspmessage.c \ gst-libs/gst/rtsp/gstrtsprange.c \ gst-libs/gst/rtsp/gstrtsptransport.c \ - gst-libs/gst/rtsp/gstrtspurl.c -rtsp_LOCAL_SRC_FILES_ANDROID:= \ + gst-libs/gst/rtsp/gstrtspurl.c \ gst-libs/gst/rtsp/gstrtsp-marshal.c \ gst-libs/gst/rtsp/gstrtsp-enumtypes.c -LOCAL_SRC_FILES:= $(addprefix ../,$(rtsp_LOCAL_SRC_FILES_BASE)) \ - $(addprefix ../android/,$(rtsp_LOCAL_SRC_FILES_ANDROID)) +LOCAL_SRC_FILES:= $(addprefix ../,$(rtsp_LOCAL_SRC_FILES_BASE)) LOCAL_SHARED_LIBRARIES := \ libgstreamer-0.10 \ @@ -47,23 +43,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstrtsp-0.10 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/rtsp \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst-libs/gst/rtsp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DINET_ADDRSTRLEN=16 -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DINET_ADDRSTRLEN=16 -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -72,5 +53,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_rtsp_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_rtsp_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/sdp.mk b/android/sdp.mk index ae68026..b83002c 100644 --- a/android/sdp.mk +++ b/android/sdp.mk @@ -24,24 +24,8 @@ LOCAL_SHARED_LIBRARIES := \ libgobject-2.0 LOCAL_MODULE:= libgstsdp-0.10 - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/sdp \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -49,5 +33,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_sdp_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_sdp_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/tag.mk b/android/tag.mk index c0c1030..e4eaee6 100644 --- a/android/tag.mk +++ b/android/tag.mk @@ -13,6 +13,8 @@ LOCAL_ARM_MODE := arm tag_LOCAL_SRC_FILES:= \ gst-libs/gst/tag/gstvorbistag.c \ gst-libs/gst/tag/gstid3tag.c \ + gst-libs/gst/tag/gstxmptag.c \ + gst-libs/gst/tag/gsttageditingprivate.c \ gst-libs/gst/tag/tags.c \ gst-libs/gst/tag/lang.c \ gst-libs/gst/tag/gsttagdemux.c @@ -29,23 +31,9 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgsttag-0.10 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/tag \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -53,5 +41,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_tag_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_tag_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/tcp.mk b/android/tcp.mk index 29fe211..28f1dca 100644 --- a/android/tcp.mk +++ b/android/tcp.mk @@ -11,13 +11,11 @@ tcp_LOCAL_SRC_FILES_BASE:= \ gst/tcp/gsttcpclientsrc.c \ gst/tcp/gsttcpclientsink.c \ gst/tcp/gsttcpserversrc.c \ - gst/tcp/gsttcpserversink.c -tcp_LOCAL_SRC_FILES_ANDROID:= \ + gst/tcp/gsttcpserversink.c \ gst/tcp/gsttcp-enumtypes.c \ gst/tcp/gsttcp-marshal.c -LOCAL_SRC_FILES:= $(addprefix ../,$(tcp_LOCAL_SRC_FILES_BASE)) \ - $(addprefix ../android/,$(tcp_LOCAL_SRC_FILES_ANDROID)) +LOCAL_SRC_FILES:= $(addprefix ../,$(tcp_LOCAL_SRC_FILES_BASE)) LOCAL_SHARED_LIBRARIES := \ libgstreamer-0.10 \ @@ -30,23 +28,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgsttcp -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/tcp \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -54,5 +37,6 @@ LOCAL_PRELINK_MODULE := false #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/typefindfunctions.mk b/android/typefindfunctions.mk index cb660b9..2650e2b 100644 --- a/android/typefindfunctions.mk +++ b/android/typefindfunctions.mk @@ -12,6 +12,7 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(typefindfunctions_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ libgstreamer-0.10 \ libgstbase-0.10 \ + libgstpbutils-0.10 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ @@ -19,23 +20,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgsttypefindfunctions -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/typefind \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -43,5 +29,6 @@ LOCAL_PRELINK_MODULE := false #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/video.mk b/android/video.mk index f03ec55..fdfb6a2 100644 --- a/android/video.mk +++ b/android/video.mk @@ -5,13 +5,10 @@ gst_video_COPY_HEADERS_TO := gstreamer-0.10/gst/video gst_video_COPY_HEADERS_BASE := \ gst-libs/gst/video/gstvideofilter.h \ gst-libs/gst/video/gstvideosink.h \ - gst-libs/gst/video/video.h -gst_video_COPY_HEADERS_ANDROID := \ + gst-libs/gst/video/video.h \ gst-libs/gst/video/video-enumtypes.h -gst_video_COPY_HEADERS := $(addprefix ../,$(gst_video_COPY_HEADERS_BASE)) \ - $(addprefix ../android/,$(gst_video_COPY_HEADERS_ANDROID)) - +gst_video_COPY_HEADERS := $(addprefix ../,$(gst_video_COPY_HEADERS_BASE)) include $(CLEAR_VARS) @@ -20,12 +17,11 @@ LOCAL_ARM_MODE := arm video_LOCAL_SRC_FILES_BASE:= \ gst-libs/gst/video/video.c \ gst-libs/gst/video/gstvideosink.c \ - gst-libs/gst/video/gstvideofilter.c -video_LOCAL_SRC_FILES_ANDROID:= \ + gst-libs/gst/video/gstvideofilter.c \ + gst-libs/gst/video/convertframe.c \ gst-libs/gst/video/video-enumtypes.c -LOCAL_SRC_FILES:= $(addprefix ../,$(video_LOCAL_SRC_FILES_BASE)) \ - $(addprefix ../android/,$(video_LOCAL_SRC_FILES_ANDROID)) +LOCAL_SRC_FILES:= $(addprefix ../,$(video_LOCAL_SRC_FILES_BASE)) LOCAL_SHARED_LIBRARIES := \ libgstreamer-0.10 \ @@ -37,23 +33,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstvideo-0.10 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/video \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst-libs/gst/video \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # @@ -61,5 +42,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_video_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_video_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/android/videoscale.mk b/android/videoscale.mk new file mode 100644 index 0000000..83afa38 --- /dev/null +++ b/android/videoscale.mk @@ -0,0 +1,40 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_ARM_MODE := arm + +videoscale_LOCAL_SRC_FILES:= \ + gst/videoscale/gstvideoscale.c \ + gst/videoscale/gstvideoscaleorc-dist.c \ + gst/videoscale/vs_4tap.c \ + gst/videoscale/vs_fill_borders.c \ + gst/videoscale/vs_image.c \ + gst/videoscale/vs_scanline.c + +LOCAL_SRC_FILES:= $(addprefix ../,$(videoscale_LOCAL_SRC_FILES)) + +LOCAL_SHARED_LIBRARIES := \ + libgstvideo-0.10 \ + libgstreamer-0.10 \ + libgstbase-0.10 \ + libglib-2.0 \ + libgthread-2.0 \ + libgmodule-2.0 \ + libgobject-2.0 \ + libgstpbutils-0.10 + +LOCAL_MODULE:= libgstvideoscale + +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) +# +# define LOCAL_PRELINK_MODULE to false to not use pre-link map +# +LOCAL_PRELINK_MODULE := false + +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) diff --git a/android/videotestsrc.mk b/android/videotestsrc.mk new file mode 100644 index 0000000..3385aa1 --- /dev/null +++ b/android/videotestsrc.mk @@ -0,0 +1,38 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_ARM_MODE := arm + +videotestsrc_LOCAL_SRC_FILES:= \ + gst/videotestsrc/gstvideotestsrc.c \ + gst/videotestsrc/videotestsrc.c \ + gst/videotestsrc/gstvideotestsrcorc-dist.c \ + + +LOCAL_SRC_FILES:= $(addprefix ../,$(videotestsrc_LOCAL_SRC_FILES)) + +LOCAL_SHARED_LIBRARIES := \ + libgstcontroller-0.10 \ + libgstvideo-0.10 \ + libgstreamer-0.10 \ + libgstbase-0.10 \ + libglib-2.0 \ + libgthread-2.0 \ + libgmodule-2.0 \ + libgobject-2.0 + +LOCAL_MODULE:= libgstvideotestsrc + +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ + $(GST_PLUGINS_BASE_CFLAGS) +# +# define LOCAL_PRELINK_MODULE to false to not use pre-link map +# +LOCAL_PRELINK_MODULE := false + +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am index d993bca..3d23821 100644 --- a/ext/ogg/Makefile.am +++ b/ext/ogg/Makefile.am @@ -29,3 +29,17 @@ libgstogg_la_LIBADD = \ libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstogg_la_LIBTOOLFLAGS = --tag=disable-static + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstogg -:SHARED libgstogg \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstogg_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstogg_la_CFLAGS) \ + -:LDFLAGS $(libgstogg_la_LDFLAGS) \ + $(libgstogg_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index bcbc131..e88ad44 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am @@ -81,3 +81,18 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer -:PROJECT libgstapp -:SHARED libgstapp-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstapp_@GST_MAJORMINOR@_la_SOURCES) \ + $(nodist_libgstapp_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstapp_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstapp_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstapp_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/app \ + -:HEADERS $(libgstapp_@GST_MAJORMINOR@include_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 51c8607..65a9928 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -113,3 +113,19 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer -:PROJECT libgstaudio -:SHARED libgstaudio-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstaudio_@GST_MAJORMINOR@_la_SOURCES) \ + $(nodist_libgstaudio_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudio_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstaudio_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/tag \ + -:HEADERS $(libgstaudio_@GST_MAJORMINOR@include_HEADERS) \ + $(nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am index 348fe45..b95c78d 100644 --- a/gst-libs/gst/fft/Makefile.am +++ b/gst-libs/gst/fft/Makefile.am @@ -87,3 +87,17 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) endif + +Android.mk: Makefile.am + androgenizer -:PROJECT libgstfft -:SHARED libgstfft-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstfft_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(libgstfft_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstfft_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstfft_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/fft \ + -:HEADERS $(libgstfftinclude_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index eda0d91..827438b 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -118,3 +118,19 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer -:PROJECT libgstinterfaces -:SHARED libgstinterfaces-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES) \ + $(nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/interfaces \ + -:HEADERS $(libgstinterfacesinclude_HEADERS) \ + $(nodist_libgstinterfacesinclude_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am index a6bba8c..17c4007 100644 --- a/gst-libs/gst/netbuffer/Makefile.am +++ b/gst-libs/gst/netbuffer/Makefile.am @@ -52,3 +52,17 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) endif + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer -:PROJECT libgstnetbuffer -:SHARED libgstnetbuffer-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstnetbuffer_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstnetbuffer_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstnetbuffer_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstnetbuffer_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/netbuffer \ + -:HEADERS $(libgstnetbuffer_include_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index e26ef9b..5748ed4 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am @@ -117,3 +117,19 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer -:PROJECT libgstpbutils -:SHARED libgstpbutils-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstpbutils_@GST_MAJORMINOR@_la_SOURCES) \ + $(nodist_libgstpbutils_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstpbutils_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstpbutils_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstpbutils_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/pbutils \ + -:HEADERS $(libgstpbutils_@GST_MAJORMINOR@include_HEADERS) \ + $(nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index 07e7204..c060a39 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -75,3 +75,17 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) endif + +Android.mk: Makefile.am + androgenizer -:PROJECT libgstriff -:SHARED libgstriff-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstriff_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstriff_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstriff_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstriff_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/tag \ + -:HEADERS $(libgstriff_@GST_MAJORMINOR@include_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am index 5ed88fa..b712921 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am @@ -68,3 +68,17 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) endif + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer -:PROJECT libgstrtp -:SHARED libgstrtp-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstrtp_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrtp_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstrtp_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstrtp_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/rtp \ + -:HEADERS $(libgstrtp_@GST_MAJORMINOR@include_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am index f055e6a..fa03f78 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am @@ -101,3 +101,19 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer -:PROJECT libgstrtsp -:SHARED libgstrtsp-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstrtsp_@GST_MAJORMINOR@_la_SOURCES) \ + $(nodist_libgstrtsp_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrtsp_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstrtsp_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstrtsp_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/rtsp \ + -:HEADERS $(libgstrtspinclude_HEADERS) \ + $(nodist_libgstrtspinclude_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am index d0cd5e2..9e4a04e 100644 --- a/gst-libs/gst/sdp/Makefile.am +++ b/gst-libs/gst/sdp/Makefile.am @@ -55,3 +55,17 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) endif + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer -:PROJECT libgstsdp -:SHARED libgstsdp-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstsdp_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstsdp_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstsdp_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstsdp_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/sdp \ + -:HEADERS $(libgstsdpinclude_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am index 17b2dff..3c555b6 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am @@ -79,3 +79,17 @@ ISO_CODE_PROGS = endif noinst_PROGRAMS = $(ISO_CODE_PROGS) + +Android.mk: Makefile.am + androgenizer -:PROJECT libgsttag -:SHARED libgsttag-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgsttag_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(libgsttag_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgsttag_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgsttag_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/tag \ + -:HEADERS $(libgsttaginclude_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 4eeb5e0..a89dbae 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -79,3 +79,19 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer -:PROJECT libgstvideo -:SHARED libgstvideo-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstvideo_@GST_MAJORMINOR@_la_SOURCES) \ + $(nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(libgstvideo_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstvideo_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/tag \ + -:HEADERS $(libgstvideo_@GST_MAJORMINOR@include_HEADERS) \ + $(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/gst/adder/Makefile.am b/gst/adder/Makefile.am index f8969a4..8fe5d21 100644 --- a/gst/adder/Makefile.am +++ b/gst/adder/Makefile.am @@ -15,5 +15,17 @@ libgstadder_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstadder.h - - +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstadder -:SHARED libgstadder \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstadder_la_SOURCES) \ + $(nodist_libgstadder_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstadder_la_CFLAGS) \ + -:LDFLAGS $(libgstadder_la_LDFLAGS) \ + $(libgstadder_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/app/Makefile.am b/gst/app/Makefile.am index 178ed4e..2170623 100644 --- a/gst/app/Makefile.am +++ b/gst/app/Makefile.am @@ -6,3 +6,16 @@ libgstapp_la_LIBADD = $(GST_BASE_LIBS) $(top_builddir)/gst-libs/gst/app/libgstap libgstapp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstapp_la_LIBTOOLFLAGS = --tag=disable-static +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstapp -:SHARED libgstapp \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstapp_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstapp_la_CFLAGS) \ + -:LDFLAGS $(libgstapp_la_LDFLAGS) \ + $(libgstapp_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am index 6f34bc6..b8849b6 100644 --- a/gst/audioconvert/Makefile.am +++ b/gst/audioconvert/Makefile.am @@ -34,3 +34,18 @@ noinst_HEADERS = \ # $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ # $(GST_LIBS) + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstaudioconvert -:SHARED libgstaudioconvert \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstaudioconvert_la_SOURCES) \ + $(nodist_libgstaudioconvert_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudioconvert_la_CFLAGS) \ + -:LDFLAGS $(libgstaudioconvert_la_LDFLAGS) \ + $(libgstaudioconvert_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/audiorate/Makefile.am b/gst/audiorate/Makefile.am index 10195de..72c3355 100644 --- a/gst/audiorate/Makefile.am +++ b/gst/audiorate/Makefile.am @@ -8,3 +8,16 @@ libgstaudiorate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudiorate_la_LIBADD = $(GST_LIBS) libgstaudiorate_la_LIBTOOLFLAGS = --tag=disable-static +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstaudiorate -:SHARED libgstaudiorate \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstaudiorate_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudiorate_la_CFLAGS) \ + -:LDFLAGS $(libgstaudiorate_la_LDFLAGS) \ + $(libgstaudiorate_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/audioresample/Makefile.am b/gst/audioresample/Makefile.am index 6118ec1..3464a82 100644 --- a/gst/audioresample/Makefile.am +++ b/gst/audioresample/Makefile.am @@ -42,3 +42,16 @@ noinst_HEADERS = \ speex_resampler.h \ speex_resampler_wrapper.h +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstaudioresample -:SHARED libgstaudioresample \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstaudioresample_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudioresample_la_CFLAGS) \ + -:LDFLAGS $(libgstaudioresample_la_LDFLAGS) \ + $(libgstaudioresample_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/audiotestsrc/Makefile.am b/gst/audiotestsrc/Makefile.am index af7564d..67a2c0b 100644 --- a/gst/audiotestsrc/Makefile.am +++ b/gst/audiotestsrc/Makefile.am @@ -7,3 +7,17 @@ libgstaudiotestsrc_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_CONTROLLER_LIB libgstaudiotestsrc_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstaudiotestsrc.h + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstaudiotestsrc -:SHARED libgstaudiotestsrc \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstaudiotestsrc_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudiotestsrc_la_CFLAGS) \ + -:LDFLAGS $(libgstaudiotestsrc_la_LDFLAGS) \ + $(libgstaudiotestsrc_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/encoding/Makefile.am b/gst/encoding/Makefile.am index 2bd7cdd..dace539 100644 --- a/gst/encoding/Makefile.am +++ b/gst/encoding/Makefile.am @@ -37,3 +37,17 @@ CLEANFILES = $(BUILT_SOURCES) include $(top_srcdir)/common/gst-glib-gen.mak +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstencodebin -:SHARED libgstencodebin \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstencodebin_la_SOURCES) \ + $(nodist_libgstencodebin_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstencodebin_la_CFLAGS) \ + -:LDFLAGS $(libgstencodebin_la_LDFLAGS) \ + $(libgstencodebin_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/ffmpegcolorspace/Makefile.am b/gst/ffmpegcolorspace/Makefile.am index ec414f5..2ada4c9 100644 --- a/gst/ffmpegcolorspace/Makefile.am +++ b/gst/ffmpegcolorspace/Makefile.am @@ -21,3 +21,17 @@ noinst_HEADERS = \ imgconvert_template.h \ dsputil.h \ avcodec.h + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstffmpegcolorspace -:SHARED libgstffmpegcolorspace \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstffmpegcolorspace_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstffmpegcolorspace_la_CFLAGS) \ + -:LDFLAGS $(libgstffmpegcolorspace_la_LDFLAGS) \ + $(libgstffmpegcolorspace_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/ffmpegcolorspace/gstffmpegcodecmap.h b/gst/ffmpegcolorspace/gstffmpegcodecmap.h index 515f530..077fe3f 100644 --- a/gst/ffmpegcolorspace/gstffmpegcodecmap.h +++ b/gst/ffmpegcolorspace/gstffmpegcodecmap.h @@ -20,7 +20,7 @@ #ifndef __GST_FFMPEG_CODECMAP_H__ #define __GST_FFMPEG_CODECMAP_H__ -#include +#include "avcodec.h" #include /* diff --git a/gst/gdp/Makefile.am b/gst/gdp/Makefile.am index b42a955..a8aba8b 100644 --- a/gst/gdp/Makefile.am +++ b/gst/gdp/Makefile.am @@ -13,3 +13,17 @@ libgstgdp_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstgdppay.h \ gstgdpdepay.h + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstgdp -:SHARED libgstgdp \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstgdp_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstgdp_la_CFLAGS) \ + -:LDFLAGS $(libgstgdp_la_LDFLAGS) \ + $(libgstgdp_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am index b78e2e2..3adb56d 100644 --- a/gst/playback/Makefile.am +++ b/gst/playback/Makefile.am @@ -67,3 +67,41 @@ CLEANFILES = $(BUILT_SOURCES) include $(top_srcdir)/common/gst-glib-gen.mak +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstdecodebin -:SHARED libgstdecodebin \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstdecodebin_la_SOURCES) \ + $(nodist_libgstdecodebin_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdecodebin_la_CFLAGS) \ + -:LDFLAGS $(libgstdecodebin_la_LDFLAGS) \ + $(libgstdecodebin_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + \ + -:PROJECT libgstdecodebin2 -:SHARED libgstdecodebin2 \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstdecodebin2_la_SOURCES) \ + $(nodist_libgstdecodebin2_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdecodebin2_la_CFLAGS) \ + -:LDFLAGS $(libgstdecodebin2_la_LDFLAGS) \ + $(libgstdecodebin2_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + \ + -:PROJECT libgstplaybin -:SHARED libgstplaybin \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstplaybin_la_SOURCES) \ + $(nodist_libgstplaybin_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstplaybin_la_CFLAGS) \ + -:LDFLAGS $(libgstplaybin_la_LDFLAGS) \ + $(libgstplaybin_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am index c3ed8bd..a970a2b 100644 --- a/gst/tcp/Makefile.am +++ b/gst/tcp/Makefile.am @@ -39,3 +39,18 @@ noinst_HEADERS = \ CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = gsttcp-marshal.list + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgsttcp -:SHARED libgsttcp \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgsttcp_la_SOURCES) \ + $(nodist_libgsttcp_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgsttcp_la_CFLAGS) \ + -:LDFLAGS $(libgsttcp_la_LDFLAGS) \ + $(libgsttcp_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/typefind/Makefile.am b/gst/typefind/Makefile.am index cf9e59e..3258b15 100644 --- a/gst/typefind/Makefile.am +++ b/gst/typefind/Makefile.am @@ -10,3 +10,17 @@ libgsttypefindfunctions_la_LIBADD = \ $(GST_LIBS) $(GIO_LIBS) libgsttypefindfunctions_la_LIBTOOLFLAGS = --tag=disable-static + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgsttypefindfunctions -:SHARED libgsttypefindfunctions \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgsttypefindfunctions_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgsttypefindfunctions_la_CFLAGS) \ + -:LDFLAGS $(libgsttypefindfunctions_la_LDFLAGS) \ + $(libgsttypefindfunctions_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/videorate/Makefile.am b/gst/videorate/Makefile.am index 8dd9d78..fe9b996 100644 --- a/gst/videorate/Makefile.am +++ b/gst/videorate/Makefile.am @@ -8,3 +8,16 @@ libgstvideorate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideorate_la_LIBADD = $(GST_LIBS) libgstvideorate_la_LIBTOOLFLAGS = --tag=disable-static +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstvideorate -:SHARED libgstvideorate \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstvideorate_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideorate_la_CFLAGS) \ + -:LDFLAGS $(libgstvideorate_la_LDFLAGS) \ + $(libgstvideorate_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am index 941eac0..79d2cb4 100644 --- a/gst/videoscale/Makefile.am +++ b/gst/videoscale/Makefile.am @@ -26,3 +26,17 @@ noinst_HEADERS = \ vs_4tap.h \ vs_fill_borders.h +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstvideoscale -:SHARED libgstvideoscale \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstvideoscale_la_SOURCES) \ + $(nodist_libgstvideoscale_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideoscale_la_CFLAGS) \ + -:LDFLAGS $(libgstvideoscale_la_LDFLAGS) \ + $(libgstvideoscale_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/videotestsrc/Makefile.am b/gst/videotestsrc/Makefile.am index 12f357d..814899f 100644 --- a/gst/videotestsrc/Makefile.am +++ b/gst/videotestsrc/Makefile.am @@ -21,3 +21,17 @@ generate_sine_table_SOURCES = generate_sine_table.c generate_sine_table_CFLAGS = $(GST_CFLAGS) generate_sine_table_LDADD = $(LIBM) +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstvideotestsrc -:SHARED libgstvideotestsrc \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstvideotestsrc_la_SOURCES) \ + $(nodist_libgstvideotestsrc_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideotestsrc_la_CFLAGS) \ + -:LDFLAGS $(libgstvideotestsrc_la_LDFLAGS) \ + $(libgstvideotestsrc_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am index 04c348d..d750912 100644 --- a/gst/volume/Makefile.am +++ b/gst/volume/Makefile.am @@ -18,4 +18,17 @@ libgstvolume_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstvolume.h - +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstvolume -:SHARED libgstvolume \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstvolume_la_SOURCES) \ + $(nodist_libgstvolume_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvolume_la_CFLAGS) \ + -:LDFLAGS $(libgstvolume_la_LDFLAGS) \ + $(libgstvolume_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/tools/Makefile.am b/tools/Makefile.am index 997d6d4..647b634 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -36,3 +36,14 @@ all: all-am chmod chmod: $(bin_SCRIPTS) @chmod +x $^ + +Android.mk: Makefile.am + androgenizer -:PROJECT gst-discoverer \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:EXECUTABLE gst-discoverer -:TAGS eng debug \ + -:SOURCES $(gst_discoverer_@GST_MAJORMINOR@_SOURCES) \ + -:CFLAGS $(DEFS) $(AM_CFLAGS) \ + -:LDFLAGS -lgstpbutils-@GST_MAJORMINOR@ -lgstvideo-@GST_MAJORMINOR@ \ + $(GST_BASE_LIBS) $(GST_LIBS) \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ -- 2.7.4