build.gradle

@@ -22,7 +22,7 @@ allprojects {
 }
 
 ext {
-    libvlcVersion = '4.0.0-eap17'
+    libvlcVersion = '4.0.0-eap20'
     minSdkVersion = 17
     targetSdkVersion = 30
     compileSdkVersion = 31

buildsystem/build-libvlc.sh

@@ -90,10 +90,10 @@ fi
 # try to detect NDK version
 REL=$(grep -o '^Pkg.Revision.*[0-9]*.*' $ANDROID_NDK/source.properties |cut -d " " -f 3 | cut -d "." -f 1)
 
-if [ "$REL" = 26 ]; then
+if [ "$REL" = 27 ]; then
     ANDROID_API=21
 else
-    echo "NDK v26 needed, cf. https://developer.android.com/ndk/downloads/"
+    echo "NDK v27 needed, got $REL, cf. https://developer.android.com/ndk/downloads/"
     exit 1
 fi
 
@@ -262,8 +262,6 @@ VLC_CONTRIB_ARGS="\
     --disable-aribb25 \
     --disable-caca \
     --disable-chromaprint \
-    --disable-dca \
-    --disable-a52 \
     --disable-faad2 \
     --disable-fontconfig \
     --disable-goom \
@@ -310,8 +308,6 @@ VLC_CONFIGURE_ARGS="\
     --disable-alsa \
     --disable-caca \
     --disable-dbus \
-    --disable-dca \
-    --disable-a52 \
     --disable-decklink \
     --disable-dv1394 \
     --disable-faad \

buildsystem/build-libvlcjni.sh

@@ -59,10 +59,10 @@ fi
 # try to detect NDK version
 REL=$(grep -o '^Pkg.Revision.*[0-9]*.*' $ANDROID_NDK/source.properties |cut -d " " -f 3 | cut -d "." -f 1)
 
-if [ "$REL" = 26 ]; then
+if [ "$REL" = 27 ]; then
     ANDROID_API=21
 else
-    echo "NDK v26 needed, cf. https://developer.android.com/ndk/downloads/"
+    echo "NDK v27 needed, got $REL, cf. https://developer.android.com/ndk/downloads/"
     exit 1
 fi
 

buildsystem/compile-libvlc.sh

@@ -102,10 +102,10 @@ fi
 # try to detect NDK version
 REL=$(grep -o '^Pkg.Revision.*[0-9]*.*' $ANDROID_NDK/source.properties |cut -d " " -f 3 | cut -d "." -f 1)
 
-if [ "$REL" = 26 ]; then
+if [ "$REL" = 27 ]; then
     ANDROID_API=21
 else
-    echo "NDK v26 needed, got $REL, cf. https://developer.android.com/ndk/downloads/"
+    echo "NDK v27 needed, got $REL, cf. https://developer.android.com/ndk/downloads/"
     exit 1
 fi
 

buildsystem/get-vlc.sh

@@ -69,7 +69,7 @@ done
 # Fetch VLC source #
 ####################
 
-VLC_TESTED_HASH=8c9891d4bb7f7c146abb17606e7528f6d0209ea3
+VLC_TESTED_HASH=113e5a86b8801cb5cde1616d4f4da2eb14cbc1a8
 VLC_REPOSITORY=https://code.videolan.org/videolan/vlc.git
 VLC_BRANCH=master
 if [ ! -d "vlc" ]; then

buildsystem/gitlab/.gitlab-ci.yml

@@ -7,7 +7,7 @@ cache:
 
 default:
   interruptible: true
-  image: registry.videolan.org/vlc-debian-android:20240731083648
+  image: registry.videolan.org/vlc-debian-android:20250403202200
   tags:
     - amd64
     - docker

libvlc/jni/libvlcjni-mediaplayer.c

@@ -22,7 +22,6 @@
 
 #include <pthread.h>
 #include <stdlib.h>
-#include <dlfcn.h>
 
 #include "libvlcjni-vlcobject.h"
 
@@ -1033,7 +1032,7 @@ Java_org_videolan_libvlc_MediaPlayer_nativeSetEqualizer(JNIEnv *env,
 
 jboolean
 Java_org_videolan_libvlc_MediaPlayer_nativeRecord(JNIEnv *env, jobject thiz,
-                                                  jstring jdirectory)
+                                                  jstring jdirectory, jboolean enable)
 {
     vlcjni_object *p_obj = VLCJniObject_getInstance(env, thiz);
     const char *psz_directory;
@@ -1041,12 +1040,6 @@ Java_org_videolan_libvlc_MediaPlayer_nativeRecord(JNIEnv *env, jobject thiz,
     if (!p_obj)
         return false;
 
-    int (*record_func)(libvlc_media_player_t *, const char *) =
-        dlsym(RTLD_DEFAULT, "libvlc_media_player_record");
-
-    if (!record_func)
-        return false;
-
     if (jdirectory)
     {
         psz_directory = (*env)->GetStringUTFChars(env, jdirectory, 0);
@@ -1059,14 +1052,14 @@ Java_org_videolan_libvlc_MediaPlayer_nativeRecord(JNIEnv *env, jobject thiz,
     else
         psz_directory = NULL;
 
-    jboolean ret = record_func(p_obj->u.p_mp, psz_directory) == 0;
+    libvlc_media_player_record(p_obj->u.p_mp, enable, psz_directory);
 
     if (psz_directory)
     {
         (*env)->ReleaseStringUTFChars(env, jdirectory, psz_directory);
     }
 
-    return ret;
+    return true;
 }
 
 jint
@@ -1197,3 +1190,51 @@ Java_org_videolan_libvlc_MediaPlayer_00024Equalizer_nativeSetAmp(JNIEnv *env,
 
     return libvlc_audio_equalizer_set_amp_at_index(p_eq, amp, index) == 0 ? true : false;
 }
+
+void
+Java_org_videolan_libvlc_MediaPlayer_nativeSetTeletext(JNIEnv *env,
+                                                       jobject thiz,
+                                                       jint page)
+{
+    vlcjni_object *p_obj = VLCJniObject_getInstance(env, thiz);
+
+    if (!p_obj)
+        return;
+
+    libvlc_video_set_teletext(p_obj->u.p_mp, page);
+}
+
+jint
+Java_org_videolan_libvlc_MediaPlayer_nativeGetTeletext(JNIEnv *env,
+                                                       jobject thiz)
+{
+    vlcjni_object *p_obj = VLCJniObject_getInstance(env, thiz);
+
+    if (!p_obj)
+        return 100;
+
+    return libvlc_video_get_teletext(p_obj->u.p_mp);
+}
+
+void
+Java_org_videolan_libvlc_MediaPlayer_nativeSetTeletextTransparency(JNIEnv *env,
+                                                                   jobject thiz,
+                                                                   jboolean transparent)
+{
+    vlcjni_object *p_obj = VLCJniObject_getInstance(env, thiz);
+    if (!p_obj)
+        return;
+
+    libvlc_video_set_teletext_transparency (p_obj->u.p_mp, transparent);
+}
+
+jboolean
+Java_org_videolan_libvlc_MediaPlayer_nativeGetTeletextTransparency(JNIEnv *env,
+                                                                   jobject thiz)
+{
+    vlcjni_object *p_obj = VLCJniObject_getInstance(env, thiz);
+    if (!p_obj)
+        return false;
+
+    return !!libvlc_video_get_teletext_transparency (p_obj->u.p_mp);
+}

libvlc/patches/0006-input-display-discoverer-preparsers-logs.patch

@@ -14,14 +14,14 @@ diff --git a/src/input/input.c b/src/input/input.c
 index 21e019a6e72..d12de7bf367 100644
 --- a/src/input/input.c
 +++ b/src/input/input.c
-@@ -297,7 +297,6 @@ input_thread_t *input_Create( vlc_object_t *p_parent,
-     if( priv->type == INPUT_TYPE_PREPARSING
-      || priv->type == INPUT_TYPE_THUMBNAILING )
+@@ -301,7 +301,6 @@ input_thread_t * input_Create( vlc_object_t *p_parent, input_item_t *p_item,
+ 
+     if( priv->type != INPUT_TYPE_PLAYBACK )
      {
 -        p_input->obj.logger = NULL;
          p_input->obj.no_interact = true;
      }
-     else
+ 
 -- 
 2.35.1
 

libvlc/src/main/java/org/videolan/libvlc/MediaPlayer.java

@@ -390,6 +390,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
         SURFACE_16_9(16F/9F),
         SURFACE_4_3(4F/3F),
         SURFACE_16_10(16F/10F),
+        SURFACE_2_1(2F),
         SURFACE_221_1(2.21F),
         SURFACE_235_1(2.35F),
         SURFACE_239_1(2.39F),
@@ -1222,10 +1223,11 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
      *
      * @param directory path of the recording directory or null to stop
      * recording
+     * @param enable true to start recording, false to stop
      * @return true on success.
      */
-    public boolean record(String directory) {
-        return nativeRecord(directory);
+    public boolean record(String directory, boolean enable) {
+        return nativeRecord(directory, enable);
     }
 
     /**
@@ -1320,6 +1322,39 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
         nativeSetPosition(pos, false);
     }
 
+    /**
+     * Gets currently selected teletext page.
+     * @return the currently selected teletext page.
+     */
+    public int getTeletext() {
+        return nativeGetTeletext();
+    };
+
+    /**
+     * Select a teletext page.
+     * If telexext was not active, activate teletext.
+     * @param page: page to change to
+     */
+    public void setTeletext(int page) {
+        nativeSetTeletext(page);
+    };
+
+    /**
+     * Get current teletext background transparency.
+     * @return true if teletext is currently active and transparent, false if teletext is opaque or not active.
+     */
+    public boolean getTeletextTransparency() {
+        return nativeGetTeletextTransparency();
+    };
+
+    /**
+     * Set teletext background transparency.
+     * @param transparent: true for transparent, false for opaque
+     */
+    public void setTeletextTransparency(boolean transparent) {
+        nativeSetTeletextTransparency(transparent);
+    };
+
     /**
      * Gets current movie's length in ms.
      * @return the movie length (in ms), or -1 if there is no media.
@@ -1436,6 +1471,10 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
     private native long nativeGetSpuDelay();
     private native boolean nativeSetSpuDelay(long delay);
     private native boolean nativeAddSlave(int type, String location, boolean select);
-    private native boolean nativeRecord(String directory);
+    private native boolean nativeRecord(String directory, boolean enable);
     private native boolean nativeSetEqualizer(Equalizer equalizer);
+    private native int nativeGetTeletext();
+    private native void nativeSetTeletext(int page);
+    private native boolean nativeGetTeletextTransparency();
+    private native void nativeSetTeletextTransparency(boolean transparent);
 }

libvlc/src/main/java/org/videolan/libvlc/VideoHelper.java

@@ -189,6 +189,10 @@ class VideoHelper implements IVLCVout.OnNewVideoLayoutListener {
                 mMediaPlayer.setAspectRatio("16:10");
                 mMediaPlayer.setNativeScale(0);
                 break;
+            case SURFACE_2_1:
+                mMediaPlayer.setAspectRatio("2:1");
+                mMediaPlayer.setNativeScale(0);
+                break;
             case SURFACE_221_1:
                 mMediaPlayer.setAspectRatio("221:100");
                 mMediaPlayer.setNativeScale(0);

libvlc/src/main/java/org/videolan/libvlc/interfaces/IMedia.java

@@ -102,9 +102,10 @@ public interface IMedia extends IVLCObject<IMedia.Event> {
     class Parse {
         public static final int ParseLocal = 0x01;
         public static final int ParseNetwork = 0x02;
-        public static final int FetchLocal = 0x04;
-        public static final int FetchNetwork = 0x08;
-        public static final int DoInteract = 0x10;
+        public static final int ParseForced = 0x04;
+        public static final int FetchLocal = 0x08;
+        public static final int FetchNetwork = 0x10;
+        public static final int DoInteract = 0x20;
     }
 
     /*