From: Sebastian Dröge Date: Fri, 3 Jun 2016 13:18:22 +0000 (+0300) Subject: Review Android tutorial 1 and add some more todo items X-Git-Tag: 1.19.3~489^2~621 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63804edcca3d0fd924983e89e0755b6e13c92107;p=platform%2Fupstream%2Fgstreamer.git Review Android tutorial 1 and add some more todo items --- diff --git a/Android+tutorial+1+Link+against+GStreamer.markdown b/Android+tutorial+1+Link+against+GStreamer.markdown index 0da2454..53adac5 100644 --- a/Android+tutorial+1+Link+against+GStreamer.markdown +++ b/Android+tutorial+1+Link+against+GStreamer.markdown @@ -22,17 +22,17 @@ easily see how all the pieces fit together. Let’s first introduce the Java code, then the C code and finally the makefile that allows GStreamer integration. -**src/com/gst\_sdk\_tutorials/tutorial\_1/Tutorial1.java** +**src/org/freedesktop/gstreamer/tutorials/tutorial\_1/Tutorial1.java** ``` lang=java -package com.gst_sdk_tutorials.tutorial_1; +package org.freedesktop.gstreamer.tutorials.tutorial_1; import android.app.Activity; import android.os.Bundle; import android.widget.TextView; import android.widget.Toast; -import com.gstreamer.GStreamer; +import org.freedesktop.gstreamer.GStreamer; public class Tutorial1 extends Activity { private native String nativeGetGStreamerInfo(); @@ -146,7 +146,7 @@ code: /* * Java Bindings */ -jstring gst_native_get_gstreamer_info (JNIEnv* env, jobject thiz) { +static jstring gst_native_get_gstreamer_info (JNIEnv* env, jobject thiz) { char *version_utf8 = gst_version_string(); jstring *version_jstring = (*env)->NewStringUTF(env, version_utf8); g_free (version_utf8); @@ -164,7 +164,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { __android_log_print (ANDROID_LOG_ERROR, "tutorial-1", "Could not retrieve JNIEnv"); return 0; } - jclass klass = (*env)->FindClass (env, "com/gst_sdk_tutorials/tutorial_1/Tutorial1"); + jclass klass = (*env)->FindClass (env, "org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1"); (*env)->RegisterNatives (env, klass, native_methods, G_N_ELEMENTS(native_methods)); return JNI_VERSION_1_4; @@ -191,7 +191,7 @@ And then locate the class containing the UI part of this tutorial using FindClass()`: ``` lang=c -jclass klass = (*env)->FindClass (env, "com/gst_sdk_tutorials/tutorial_1/Tutorial1"); +jclass klass = (*env)->FindClass (env, "org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1"); ``` Finally, we register our native methods with `RegisterNatives()`, this @@ -250,15 +250,15 @@ LOCAL_SHARED_LIBRARIES := gstreamer_android LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) -ifndef GSTREAMER_SDK_ROOT -ifndef GSTREAMER_SDK_ROOT_ANDROID -$(error GSTREAMER_SDK_ROOT_ANDROID is not defined!) +ifndef GSTREAMER_ROOT +ifndef GSTREAMER_ROOT_ANDROID +$(error GSTREAMER_ROOT_ANDROID is not defined!) endif -GSTREAMER_SDK_ROOT := $(GSTREAMER_SDK_ROOT_ANDROID) +GSTREAMER_ROOT := $(GSTREAMER_ROOT_ANDROID) endif -GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_SDK_ROOT)/share/gst-android/ndk-build/ +GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/ GSTREAMER_PLUGINS := coreelements -include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer.mk +include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk ``` This is a barebones makefile for a project with GStreamer support. It diff --git a/TODO.markdown b/TODO.markdown index 597e62f..6ea2cc0 100644 --- a/TODO.markdown +++ b/TODO.markdown @@ -31,7 +31,6 @@ Pages to review: - Playback+tutorial+8+Hardware-accelerated+video+decoding.markdown - Playback+tutorial+9+Digital+audio+pass-through.markdown - Android+tutorials.markdown - - Android+tutorial+1+Link+against+GStreamer.markdown - Android+tutorial+2+A+running+pipeline.markdown - Android+tutorial+3+Video.markdown - Android+tutorial+4+A+basic+media+player.markdown @@ -55,6 +54,15 @@ Pages to review: - gst-inspect.markdown - gst-launch.markdown + +Screenshots: + - Create new ones with the official GStreamer logo and not saying "0.10.36". Affected: + - Android tutorial 1: attachments/2654326.png + +Code: + - Change namespace from com.gst\* to org.freedesktop.gstreamer + - Change logos to the official gstreamer logo + Reviewed pages: - Home.markdown - Installing+the+SDK.markdown @@ -62,6 +70,7 @@ Reviewed pages: - Building+from+source+using+Cerbero.markdown - Table+of+Concepts.markdown - Tutorials.markdown + - Android+tutorial+1+Link+against+GStreamer.markdown For-later pages: - Qt+tutorials.markdown [tpm: this should all be rewritten from scratch with qmlglsink; QtGStreamer is outdated and unmaintained, we should not promote it]