summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2016-06-22 00:46:26 +0300
committerSebastian Dröge <sebastian@centricular.com>2016-06-22 00:46:26 +0300
commit1b0154c8669d21ab6f0584378b0129005b3f74ff (patch)
tree96cf6f8f9448755131046feb7de959476c39399c
parent040d2ca8557856f121db87568724e5d6eddbd67b (diff)
sdk-installing-for-android-development: Some further 1.x updates
And add it back to the TODO list, more work on this page needed.
-rw-r--r--TODO.md3
-rw-r--r--sdk-installing-for-android-development.md20
2 files changed, 15 insertions, 8 deletions
diff --git a/TODO.md b/TODO.md
index a3dfe0c..dc74665 100644
--- a/TODO.md
+++ b/TODO.md
@@ -9,6 +9,8 @@ Pages to review:
- sdk-installing-on-linux.md
- sdk-installing-on-mac-osx.md
- sdk-installing-on-windows.md
+ - sdk-installing-for-android-development.md
+ - Need to update/review the plugins list
Screenshots:
@@ -39,7 +41,6 @@ Reviewed pages:
- sdk-basic-tutorial-handy-elements.md
- sdk-basic-tutorial-platform-specific-elements.md
- sdk-installing.md
- - sdk-installing-for-android-development.md
- sdk-building-from-source-using-cerbero.md
- sdk-table-of-concepts.md
- sdk-tutorials.md
diff --git a/sdk-installing-for-android-development.md b/sdk-installing-for-android-development.md
index c3806ad..320760b 100644
--- a/sdk-installing-for-android-development.md
+++ b/sdk-installing-for-android-development.md
@@ -216,13 +216,19 @@ Adding GStreamer support only requires adding these lines:
include $(BUILD_SHARED_LIBRARY)
+ ifndef GSTREAMER_ROOT
+ ifndef GSTREAMER_ROOT_ANDROID
+ $(error GSTREAMER_ROOT_ANDROID is not defined!)
+ endif
GSTREAMER_ROOT := $(GSTREAMER_ROOT_ANDROID)
+ endif
+
GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
- GSTREAMER_PLUGINS := coreelements ogg theora vorbis ffmpegcolorspace playback eglglessink soup opensles
+ GSTREAMER_PLUGINS := coreelements ogg theora vorbis videoconvert audioconvert audioresample playback glimagesink soup opensles
G_IO_MODULES := gnutls
- GSTREAMER_EXTRA_DEPS := gstreamer-interfaces-1.0 gstreamer-video-1.0
+ GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0
- include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer.mk 
+ include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer.mk
Where line 7 specifies an extra library to be included in the project:
`libgstreamer_android.so`. This library contains all GStreamer code,
@@ -233,16 +239,16 @@ access android-specific functionality.
Lines 12 and 13 simply define some convenient macros.
-Line 14 lists the plugins you want statically linked into
+Line 20 lists the plugins you want statically linked into
`libgstreamer_android.so`. Listing only the ones you need makes your
application smaller.
-Line 15 is required to have internet access from GStreamer, through the
+Line 21 is required to have HTTPS/TLS support from GStreamer, through the
`souphttpsrc` element.
-Line 16 defines which GStreamer libraries your application requires.
+Line 22 defines which GStreamer libraries your application requires.
-Finally, line 18 includes the make files which perform the rest of the
+Finally, line 24 includes the make files which perform the rest of the
magic.
Listing all desired plugins can be cumbersome, so they have been grouped