diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml index 199280fa2..ad8a60e09 100644 --- a/vlc-android/AndroidManifest.xml +++ b/vlc-android/AndroidManifest.xml @@ -15,6 +15,7 @@ = LIBVLC_DEBUG && level <= LIBVLC_ERROR) prio = priority[level]; + if (!verbose && prio < ANDROID_LOG_ERROR) + return; + __android_log_vprint(prio, "VLC", fmt, ap); } static libvlc_log_subscriber_t debug_subscriber; -void Java_org_videolan_vlc_LibVLC_nativeInit(JNIEnv *env, jobject thiz) +void Java_org_videolan_vlc_LibVLC_changeVerbosity(JNIEnv *env, jobject thiz, jboolean verbose) +{ + libvlc_log_unsubscribe(&debug_subscriber); + libvlc_log_subscribe(&debug_subscriber, debug_log, (void*)verbose); +} + +void Java_org_videolan_vlc_LibVLC_nativeInit(JNIEnv *env, jobject thiz, jboolean verbose) { //only use OpenSLES if java side says we can jclass cls = (*env)->GetObjectClass(env, thiz); jmethodID methodId = (*env)->GetMethodID(env, cls, "getAout", "()I"); bool use_opensles = (*env)->CallIntMethod(env, thiz, methodId) == AOUT_OPENSLES; - libvlc_log_subscribe(&debug_subscriber, debug_log, NULL); + libvlc_log_subscribe(&debug_subscriber, debug_log, (void*)verbose); /* Don't add any invalid options, otherwise it causes LibVLC to crash */ const char *argv[] = { "-I", "dummy", - "-vv", "--no-osd", "--no-video-title-show", "--no-stats", "--no-plugins-cache", "--no-drop-late-frames", "--avcodec-fast", - use_opensles ? "--aout=opensles" : "--aout=android_audiotrack" + use_opensles ? "--aout=opensles" : "--aout=android_audiotrack", }; libvlc_instance_t *instance = libvlc_new(sizeof(argv) / sizeof(*argv), argv); diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml index 0d3adca1e..42438e2d8 100644 --- a/vlc-android/res/values/strings.xml +++ b/vlc-android/res/values/strings.xml @@ -101,7 +101,8 @@ Open MRL Open network stream Enter network MRL: e.g. http://, mms:// or rtsp:// - + Verbose + Increase the verbosity (logcat) Audio output AudioTrack (native) AudioTrack (Java) diff --git a/vlc-android/res/xml/preferences.xml b/vlc-android/res/xml/preferences.xml index a250a331d..c4fca2e4e 100644 --- a/vlc-android/res/xml/preferences.xml +++ b/vlc-android/res/xml/preferences.xml @@ -37,6 +37,12 @@ + +