diff options
| author | Alessandro Decina <alessandro.d@gmail.com> | 2011-03-01 13:12:55 +0100 |
|---|---|---|
| committer | Alessandro Decina <alessandro.d@gmail.com> | 2011-03-01 13:12:55 +0100 |
| commit | 657dfec5baa20ebbeeec73a8e0859afdbbe9b68d (patch) | |
| tree | 2e1fea07d3c01b9b6816785f481c82e75a66780b | |
| parent | ba69fa6ccf7a49a1dea32da2908cfbe8ac1f77d8 (diff) | |
Build fixes
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | gstplayer/Android.mk | 432 | ||||
| -rwxr-xr-x | gstplayer/GstDriver.cpp | 1 | ||||
| -rw-r--r-- | gstplayer/GstDriver.h | 5 |
4 files changed, 128 insertions, 315 deletions
@@ -2,9 +2,8 @@ LOCAL_PATH := $(call my-dir) -GSTREAMER_TOP := $(LOCAL_PATH) +GST_ANDROID_TOP := $(LOCAL_PATH) include $(CLEAR_VARS) -include $(GSTREAMER_TOP)/gstplayer/Android.mk - +include $(GST_ANDROID_TOP)/gstplayer/Android.mk diff --git a/gstplayer/Android.mk b/gstplayer/Android.mk index 3fd91d6..1355fa3 100644 --- a/gstplayer/Android.mk +++ b/gstplayer/Android.mk @@ -2,7 +2,6 @@ # # Copyright 2009 STN wireless # -ifeq ($(ANDROID_USE_GSTREAMER),true) LOCAL_PATH:= $(call my-dir) @@ -13,61 +12,39 @@ include $(CLEAR_VARS) LOCAL_ARM_MODE := arm -gstplayer_FILES := \ +LOCAL_SRC_FILES := \ GstPlayer.cpp \ GstDriver.cpp -gstplayer_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include \ - $(call include-path-for,libgstreamer-0.10 libgstmetadataretriever libgstbase-0.10 libglib-2.0 libgthread-2.0 libgmodule-2.0 libgobject-2.0 libgstvideo-0.10 libxml2 libmedia) +LOCAL_CFLAGS := \ + $(shell $(PKG_CONFIG) gstreamer-0.10 --cflags) \ + $(shell $(PKG_CONFIG) gstreamer-app-0.10 --cflags) \ + -DANDROID_USE_GSTREAMER -LOCAL_SRC_FILES := $(gstplayer_FILES) - -LOCAL_C_INCLUDES += $(gstplayer_C_INCLUDES) LOCAL_SHARED_LIBRARIES := \ libgstmetadataretriever \ - libgstreamer-0.10 \ - libgstbase-0.10 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 \ - libgstvideo-0.10 \ - libgstapp-0.10 - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -LOCAL_CFLAGS += -DSTECONF_ANDROID_VERSION_FROYO -endif - -LOCAL_SHARED_LIBRARIES += \ - libutils \ - libcutils \ - libui \ - libhardware \ - libandroid_runtime \ - libmedia \ + libgstreamer-0.10 \ + libgstbase-0.10 \ + libglib-2.0 \ + libgthread-2.0 \ + libgmodule-2.0 \ + libgobject-2.0 \ + libgstvideo-0.10 \ + libgstapp-0.10 \ + libutils \ + libcutils \ + libui \ + libhardware \ + libandroid_runtime \ + libmedia \ libbinder -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) -LOCAL_LDLIBS += -ldl -endif -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif -LOCAL_CFLAGS += -Wall -g -O2 -LOCAL_CFLAGS += -DANDROID_USE_GSTREAMER - -LOCAL_LDLIBS += -lpthread +LOCAL_LDLIBS += -ldl -lpthread LOCAL_MODULE:= libgstplayer +LOCAL_MODULE_TAGS := optional # # define LOCAL_PRELINK_MODULE to false to not use pre-link map @@ -83,281 +60,124 @@ include $(CLEAR_VARS) LOCAL_ARM_MODE := arm -gstmetadataretriever_FILES := \ +LOCAL_SRC_FILES := \ GstMetadataRetriever.cpp \ GstMetadataRetrieverDriver.cpp -gstmetadataretriever_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include \ - $(call include-path-for, libgstreamer-0.10 libgstbase-0.10 libglib-2.0 libgthread-2.0 libgmodule-2.0 libgobject-2.0 libgstvideo-0.10 libxml2) - -LOCAL_SRC_FILES := $(gstmetadataretriever_FILES) - -LOCAL_C_INCLUDES += $(gstmetadataretriever_C_INCLUDES) - LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 \ - libgstvideo-0.10 - -LOCAL_SHARED_LIBRARIES += \ - libutils \ - libcutils \ - libui \ - libhardware \ - libandroid_runtime \ + libgstreamer-0.10 \ + libgstbase-0.10 \ + libglib-2.0 \ + libgthread-2.0 \ + libgmodule-2.0 \ + libgobject-2.0 \ + libgstvideo-0.10 \ + libutils \ + libcutils \ + libui \ + libhardware \ + libandroid_runtime \ libmedia -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -LOCAL_CFLAGS += -DSTECONF_ANDROID_VERSION_FROYO -endif - -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) -LOCAL_LDLIBS += -ldl -endif -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif +LOCAL_CFLAGS := \ + $(shell $(PKG_CONFIG) gstreamer-0.10 --cflags) \ + $(shell $(PKG_CONFIG) gstreamer-tag-0.10 --cflags) \ + -DANDROID_USE_GSTREAMER -LOCAL_CFLAGS += -Wall -g -O2 -LOCAL_CFLAGS += -DANDROID_USE_GSTREAMER - -LOCAL_LDLIBS += -lpthread +LOCAL_LDLIBS := -ldl -lpthread LOCAL_MODULE:= libgstmetadataretriever +LOCAL_MODULE_TAGS := optional -# -# define LOCAL_PRELINK_MODULE to false to not use pre-link map -# -LOCAL_PRELINK_MODULE := false - -include $(BUILD_SHARED_LIBRARY) - - - -# ------------------------------------- -# gstmediarecorder library -# -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm - -gstmediarecorder_FILES := \ - GstMediaRecorder.cpp - -gstmediarecorder_C_INCLUDES := \ - $(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/gst/gstplayer \ - external/icebird/gstreamer-icb-video \ - external/icebird/include \ - external/alsa-lib/include \ - $(call include-path-for, libgstreamer-0.10 libgstbase-0.10 libglib-2.0 libgthread-2.0 libgmodule-2.0 libgobject-2.0 libgstvideo-0.10 libxml2) - -LOCAL_SRC_FILES := $(gstmediarecorder_FILES) - -LOCAL_C_INCLUDES += $(gstmediarecorder_C_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := libasound - -LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 \ - libgstvideo-0.10 \ - libgstapp-0.10 \ - libgsticbvideo - -LOCAL_SHARED_LIBRARIES += \ - libutils \ - libcutils \ - libui \ - libhardware \ - libandroid_runtime \ - libmedia \ - libbinder - - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_SHARED_LIBRARIES += libcamera_client -LOCAL_C_INCLUDES += external/icu4c/common -LOCAL_CFLAGS += -DSTECONF_ANDROID_VERSION_FROYO -endif - -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) -LOCAL_LDLIBS += -ldl -endif -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif - -LOCAL_CFLAGS += -Wall -g -O2 -LOCAL_CFLAGS += -DANDROID_USE_GSTREAMER - -LOCAL_LDLIBS += -lpthread - -LOCAL_MODULE:= libgstmediarecorder - -# -# define LOCAL_PRELINK_MODULE to false to not use pre-link map -# -LOCAL_PRELINK_MODULE := false - -include $(BUILD_SHARED_LIBRARY) - - - - -# ------------------------------------- -# gsticbandroidsink library -# -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm - -gsticbandroidsink_FILES := \ - GsticbAndroidVideoSink.cpp \ - GsticbAndroid.cpp - -gsticbandroidsink_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/gst/gstreamer/android \ - external/libxml2/include \ - external/icebird/gstreamer-icb-video \ - external/icebird/include \ - frameworks/base/libs/audioflinger \ - frameworks/base/media/libmediaplayerservice \ - frameworks/base/media/libmedia \ - frameworks/base/include/media - -LOCAL_SRC_FILES := $(gsticbandroidsink_FILES) - -LOCAL_C_INCLUDES += $(gsticbandroidsink_C_INCLUDES) - -LOCAL_CFLAGS += -DHAVE_CONFIG_H -LOCAL_CFLAGS += -Wall -Wdeclaration-after-statement -g -O2 -LOCAL_CFLAGS += -DANDROID_USE_GSTREAMER - -LOCAL_SHARED_LIBRARIES += libdl -LOCAL_SHARED_LIBRARIES += \ - libgstreamer-0.10 \ - libgstbase-0.10 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 \ - libgstvideo-0.10 - -LOCAL_SHARED_LIBRARIES += \ - libutils \ - libcutils \ - libui \ - libhardware \ - libandroid_runtime \ - libmedia \ - libgsticbvideo \ - libbinder - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_SHARED_LIBRARIES += libsurfaceflinger_client -LOCAL_C_INCLUDES += external/icu4c/common -LOCAL_CFLAGS += -DSTECONF_ANDROID_VERSION_FROYO -endif - -LOCAL_MODULE:= libgsticbandroidsink -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 - -# -# define LOCAL_PRELINK_MODULE to false to not use pre-link map -# LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) -# ------------------------------------- -# gstmediascanner library -# -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm - -gstmediascanner_FILES := \ - GstMediaScanner.cpp - -gstmediascanner_C_INCLUDES := \ - $(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/icebird/gstreamer-icb-video \ - external/icebird/include - -LOCAL_SRC_FILES := $(gstmediascanner_FILES) - -LOCAL_C_INCLUDES += $(gstmediascanner_C_INCLUDES) - -LOCAL_CFLAGS += -DHAVE_CONFIG_H -LOCAL_CFLAGS += -Wall -Wdeclaration-after-statement -g -O2 -LOCAL_CFLAGS += -DANDROID_USE_GSTREAMER - -LOCAL_SHARED_LIBRARIES += libdl -LOCAL_SHARED_LIBRARIES += \ - libgstreamer-0.10 \ - libgstbase-0.10 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 \ - libgstvideo-0.10 -LOCAL_SHARED_LIBRARIES += \ - libutils \ - libcutils \ - libui \ - libhardware \ - libandroid_runtime \ - libmedia \ - libgsticbvideo \ - libbinder - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -LOCAL_CFLAGS += -DSTECONF_ANDROID_VERSION_FROYO -endif - -LOCAL_MODULE:= libgstmediascanner -#MULTICORE BUILD MAKE -jX -#LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/ - -# -# define LOCAL_PRELINK_MODULE to false to not use pre-link map # -LOCAL_PRELINK_MODULE := false - -include $(BUILD_SHARED_LIBRARY) - - -endif # ANDROID_USE_GSTREAMER == true +## ------------------------------------- +## gstmediarecorder library +## +#include $(CLEAR_VARS) +# +#LOCAL_ARM_MODE := arm +# +#LOCAL_SRC_FILES := \ +# GstMediaRecorder.cpp +# +#LOCAL_WHOLE_STATIC_LIBRARIES := libasound +# +#LOCAL_SHARED_LIBRARIES := \ +# libgstreamer-0.10 \ +# libgstbase-0.10 \ +# libglib-2.0 \ +# libgthread-2.0 \ +# libgmodule-2.0 \ +# libgobject-2.0 \ +# libgstvideo-0.10 \ +# libgstapp-0.10 \ +# libgsticbvideo +# +#LOCAL_SHARED_LIBRARIES += \ +# libutils \ +# libcutils \ +# libui \ +# libhardware \ +# libandroid_runtime \ +# libmedia \ +# libbinder +# +# +#LOCAL_CFLAGS := -DANDROID_USE_GSTREAMER +# +#LOCAL_LDLIBS := -ldl -lpthread +# +#LOCAL_MODULE:= libgstmediarecorder +#LOCAL_MODULE_TAGS := optional +# +## +## define LOCAL_PRELINK_MODULE to false to not use pre-link map +## +#LOCAL_PRELINK_MODULE := false +# +#include $(BUILD_SHARED_LIBRARY) +# +# +## ------------------------------------- +## gstmediascanner library +## +#include $(CLEAR_VARS) +# +#LOCAL_ARM_MODE := arm +# +#LOCAL_SRC_FILES := \ +# GstMediaScanner.cpp +# +#LOCAL_CFLAGS += \ +# $(shell $(PKG_CONFIG) gstreamer-0.10 --cflags) \ +# -DHAVE_CONFIG_H \ +# -Wdeclaration-after-statement \ +# -DANDROID_USE_GSTREAMER +# +#LOCAL_SHARED_LIBRARIES:= \ +# libgstreamer-0.10 \ +# libgstbase-0.10 \ +# libglib-2.0 \ +# libgthread-2.0 \ +# libgmodule-2.0 \ +# libgobject-2.0 \ +# libgstvideo-0.10 \ +# libutils \ +# libcutils \ +# libui \ +# libhardware \ +# libandroid_runtime \ +# libmedia \ +# libgsticbvideo \ +# libbinder +# +#LOCAL_MODULE:= libgstmediascanner +#LOCAL_MODULE_TAGS := optional +#LOCAL_PRELINK_MODULE := false +# +#include $(BUILD_SHARED_LIBRARY) diff --git a/gstplayer/GstDriver.cpp b/gstplayer/GstDriver.cpp index af14b21..66f370d 100755 --- a/gstplayer/GstDriver.cpp +++ b/gstplayer/GstDriver.cpp @@ -23,7 +23,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #include "GstDriver.h" #include "GstPlayer.h" -#include "GsticbAndroidVideoSink.h" #include <gst/video/video.h> #include <fcntl.h> #include <media/Metadata.h> diff --git a/gstplayer/GstDriver.h b/gstplayer/GstDriver.h index 1a19068..67996b5 100644 --- a/gstplayer/GstDriver.h +++ b/gstplayer/GstDriver.h @@ -25,12 +25,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #include <gst/app/gstappsrc.h> #include <utils/List.h> #include <utils/Log.h> -// SurfaceFlinger -#ifdef STECONF_ANDROID_VERSION_FROYO #include <surfaceflinger/ISurface.h> -#else -#include <ui/ISurface.h> -#endif // pmem interprocess shared memory support #include <binder/MemoryBase.h> |