Commit 73e8f91a authored by Thomas Guillem's avatar Thomas Guillem

initial commit

parents
*.iml
.gradle
/local.properties
/.idea
.DS_Store
/build
/captures
/vlc-android
/libvlc/*.aar
Copyright (C) 2016 VideoLAN
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
allprojects {
repositories {
jcenter()
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}
#!/bin/sh
rootdir=`dirname $0`
checkfail()
{
if [ ! $? -eq 0 ];then
echo "'$1' failed"
exit 1
fi
}
if [ ! -d "${rootdir}/vlc-android" ]; then
echo "VLC Android source not found, cloning"
git clone http://code.videolan.org/videolan/vlc-android.git
checkfail "git clone"
fi
sh -c "cd ${rootdir}/vlc-android && ./compile.sh -l $*"
checkfail "./vlc-android/compile.sh $*"
cp "${rootdir}"/vlc-android/libvlc/build/outputs/aar/*.aar "${rootdir}"/libvlc
checkfail "libvlc*.arr not found"
VLC_SRC_DIR=`realpath "${rootdir}"/vlc-android/vlc`
LIBVLC_LIBS=`realpath "${rootdir}"/vlc-android/libvlc/jni/libs`
for project in native_sample;do
for arch in `ls ${LIBVLC_LIBS}`;do
$ANDROID_NDK/ndk-build -C "${rootdir}"/${project} \
VLC_SRC_DIR="${VLC_SRC_DIR}" \
LIBVLC_LIBS="${LIBVLC_LIBS}/${arch}" \
APP_BUILD_SCRIPT=jni/Android.mk \
APP_PLATFORM=android-9 \
APP_ABI=${arch} \
NDK_PROJECT_PATH=jni
done
done
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
\ No newline at end of file
#Wed Oct 21 11:34:03 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
#!/usr/bin/env bash
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn ( ) {
echo "$*"
}
die ( ) {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windowz variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
configurations.create("default")
artifacts.add("default", file('libvlc-3.0.0.aar'))
/build
/jni/libs
/jni/obj
apply plugin: 'com.android.application'
android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
sourceSets {
main {
jni.srcDirs = [] // Prevent gradle from building native code with ndk; we have our own Makefile for it.
jniLibs.srcDir 'jni/libs' // Where generated .so files are placed
}
}
defaultConfig {
applicationId 'org.videolan.native_sample'
minSdkVersion 16
targetSdkVersion 23
versionCode 1
versionName "1.0"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
productFlavors {
}
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:support-v4:23.1.1'
compile project(':libvlc')
}
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := native
LOCAL_SRC_FILES := main.c
LOCAL_LDFLAGS := -L${LIBVLC_LIBS}
LOCAL_LDLIBS := -llog -lvlc
LOCAL_C_INCLUDES := $(VLC_SRC_DIR)/include
LOCAL_SHARED_LIBRARIES:= libvlc
include $(BUILD_SHARED_LIBRARY)
/*****************************************************************************
* main.c
*****************************************************************************
* Copyright (C) 2016 VideoLAN
* All rights reserved.
*
* This software may be modified and distributed under the terms
* of the BSD license. See the LICENSE file for details.
*****************************************************************************/
#include <stdlib.h>
#include <jni.h>
#include <vlc/vlc.h>
#include <vlc/libvlc_media_player.h>
#define SAMPLE_TEST "/sdcard/Movies/sample.mp4"
static struct
{
struct {
jfieldID mInstance;
} NativeActivity;
} fields;
struct context
{
libvlc_instance_t * p_libvlc;
libvlc_media_player_t * p_mp;
jobject jaWindow;
};
struct context *
getInstance(JNIEnv *p_env, jobject thiz)
{
return (struct context*)(intptr_t)
(*p_env)->GetLongField(p_env, thiz, fields.NativeActivity.mInstance);
}
static void
setInstance(JNIEnv *p_env, jobject thiz, struct context *p_ctx)
{
(*p_env)->SetLongField(p_env, thiz, fields.NativeActivity.mInstance,
(jlong)(intptr_t)p_ctx);
}
bool
Java_org_videolan_nativesample_NativeActivity_nativeCreate(
JNIEnv *p_env, jobject thiz)
{
struct context *p_ctx = calloc(1, sizeof(struct context));
if (p_ctx == NULL)
return false;
static const char *pp_argv[] = {
"-vvv",
"--aout", "android_audiotrack",
"--androidwindow-chroma", "RV32",
"--audio-resampler", "soxr",
};
p_ctx->p_libvlc = libvlc_new(sizeof(pp_argv)/sizeof(*pp_argv), pp_argv);
if (p_ctx->p_libvlc == NULL)
{
free(p_ctx);
return false;
}
p_ctx->p_mp = libvlc_media_player_new(p_ctx->p_libvlc);
if (p_ctx->p_mp == NULL)
{
libvlc_release(p_ctx->p_libvlc);
free(p_ctx);
return false;
}
setInstance(p_env, thiz, p_ctx);
return true;
}
void
Java_org_videolan_nativesample_NativeActivity_nativeDestroy(
JNIEnv *p_env, jobject thiz)
{
struct context *p_ctx = getInstance(p_env, thiz);
if (p_ctx == NULL)
return;
libvlc_media_player_release(p_ctx->p_mp);
libvlc_release(p_ctx->p_libvlc);
free(p_ctx);
}
static bool
PlayUrl(struct context *p_ctx, const char *psz_url)
{
libvlc_media_t *p_m;
if (psz_url[0] == '/')
p_m = libvlc_media_new_path(p_ctx->p_libvlc, psz_url);
else
p_m = libvlc_media_new_location(p_ctx->p_libvlc, psz_url);
if (p_m == NULL)
return false;
libvlc_media_add_option(p_m, ":file-caching=1500");
libvlc_media_add_option(p_m, ":network-caching=1500");
libvlc_media_add_option(p_m, ":codec=mediacodec_ndk,mediacodec_jni,all");
libvlc_media_player_set_media(p_ctx->p_mp, p_m);
int i_ret = libvlc_media_player_play(p_ctx->p_mp);
/* Instance is now owned by the media player */
libvlc_media_release(p_m);
return i_ret == 0;
}
static void
Stop(struct context *p_ctx)
{
libvlc_media_player_stop(p_ctx->p_mp);
}
bool
Java_org_videolan_nativesample_NativeActivity_nativeStart(
JNIEnv *p_env, jobject thiz, jobject jaWindow)
{
struct context *p_ctx = getInstance(p_env, thiz);
if (p_ctx == NULL)
return false;
p_ctx->jaWindow = (*p_env)->NewGlobalRef(p_env, jaWindow);
libvlc_media_player_set_android_context(p_ctx->p_mp, p_ctx->jaWindow);
return PlayUrl(p_ctx, SAMPLE_TEST);
}
void
Java_org_videolan_nativesample_NativeActivity_nativeStop(
JNIEnv *p_env, jobject thiz)
{
struct context *p_ctx = getInstance(p_env, thiz);
if (p_ctx == NULL)
return;
Stop(p_ctx);
libvlc_media_player_set_android_context(p_ctx->p_mp, NULL);
(*p_env)->DeleteGlobalRef(p_env, p_ctx->jaWindow);
p_ctx->jaWindow = NULL;
}
jint
JNI_OnLoad(JavaVM *vm, void *reserved)
{
JNIEnv *p_env;
if ((*vm)->GetEnv(vm, (void**) &p_env, JNI_VERSION_1_2) != JNI_OK)
return -1;
jclass cls =
(*p_env)->FindClass(p_env, "org/videolan/nativesample/NativeActivity");
if (!cls)
return -1;
fields.NativeActivity.mInstance =
(*p_env)->GetFieldID(p_env, cls, "mInstance", "J");
if (!fields.NativeActivity.mInstance)
return -1;
(*p_env)->DeleteLocalRef(p_env, cls);
return JNI_VERSION_1_2;
}
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /home/tom/work/android/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.videolan.nativesample">
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name="org.videolan.nativesample.NativeActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/app_name"
android:theme="@style/FullscreenTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
/*****************************************************************************
* NativeActivity.java
*****************************************************************************
* Copyright (C) 2016 VideoLAN
* All rights reserved.
*
* This software may be modified and distributed under the terms
* of the BSD license. See the LICENSE file for details.
*****************************************************************************/
package org.videolan.nativesample;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.res.Configuration;
import android.os.Build;
import android.os.Handler;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.SurfaceView;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewStub;
import android.widget.FrameLayout;
import android.widget.Toast;
import org.videolan.libvlc.AWindow;
import org.videolan.libvlc.AWindowNativeHandler;
import org.videolan.libvlc.IVLCVout;
@SuppressWarnings("JniMissingFunction")
public class NativeActivity extends AppCompatActivity implements IVLCVout.Callback {
private static final boolean ENABLE_SUBTITLES = true;
private static final String TAG = "NativeActivity";
private static final int SURFACE_BEST_FIT = 0;
private static final int SURFACE_FIT_HORIZONTAL = 1;
private static final int SURFACE_FIT_VERTICAL = 2;
private static final int SURFACE_FILL = 3;
private static final int SURFACE_16_9 = 4;
private static final int SURFACE_4_3 = 5;
private static final int SURFACE_ORIGINAL = 6;
private static int CURRENT_SIZE = SURFACE_BEST_FIT;
private AWindow mAWindow = null;
private SurfaceView mUiSurface = null;
private FrameLayout mVideoSurfaceFrame = null;
private SurfaceView mVideoSurface = null;
private SurfaceView mSubtitlesSurface = null;
private final Handler mHandler = new Handler();
private View.OnLayoutChangeListener mOnLayoutChangeListener = null;
private int mVideoHeight = 0;
private int mVideoWidth = 0;
private int mVideoVisibleHeight = 0;
private int mVideoVisibleWidth = 0;
private int mVideoSarNum = 0;
private int mVideoSarDen = 0;
@TargetApi(19)
private void hide() {
// Note that some of these constants are new as of API 16 (Jelly Bean)
// and API 19 (KitKat). It is safe to use them, as they are inlined
// at compile-time and do nothing on earlier devices.
mUiSurface.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE
| View.SYSTEM_UI_FLAG_FULLSCREEN
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
}
private static int sInit = -1;
static synchronized boolean loadLibraries(Context context) {
if (sInit != -1)
return sInit == 1;
System.loadLibrary("compat.7");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD_MR1) {
try {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB_MR1)
System.loadLibrary("anw.10");