rtspt support

squi2rel · squi2rel · commit 91b8d3050d25 · 2025-10-10T23:00:40.000+08:00
diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ loader_version=0.16.14
 loom_version=1.10-SNAPSHOT
 
 # Mod Properties
-mod_version=1.5.10
+mod_version=1.5.11
 maven_group=com.github.squi2rel.vp
 archives_base_name=VideoPlayer
 
diff --git a/src/client/java/com/github/squi2rel/vp/Intersection.java b/src/client/java/com/github/squi2rel/vp/Intersection.java
@@ -1,5 +1,6 @@
 package com.github.squi2rel.vp;
 
+import com.github.squi2rel.vp.video.ClientVideoScreen;
 import org.joml.Vector3f;
 
 public class Intersection {
diff --git a/src/client/java/com/github/squi2rel/vp/ScreenRenderer.java b/src/client/java/com/github/squi2rel/vp/ScreenRenderer.java
@@ -1,5 +1,6 @@
 package com.github.squi2rel.vp;
 
+import com.github.squi2rel.vp.video.ClientVideoScreen;
 import com.github.squi2rel.vp.vivecraft.Vivecraft;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
diff --git a/src/client/java/com/github/squi2rel/vp/video/AbstractCameraPlayer.java b/src/client/java/com/github/squi2rel/vp/video/AbstractCameraPlayer.java
@@ -1,6 +1,5 @@
 package com.github.squi2rel.vp.video;
 
-import com.github.squi2rel.vp.ClientVideoScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.Framebuffer;
 import net.minecraft.client.gl.SimpleFramebuffer;
diff --git a/src/client/java/com/github/squi2rel/vp/video/ClientVideoArea.java b/src/client/java/com/github/squi2rel/vp/video/ClientVideoArea.java
@@ -1,6 +1,5 @@
 package com.github.squi2rel.vp.video;
 
-import com.github.squi2rel.vp.ClientVideoScreen;
 import com.github.squi2rel.vp.network.ByteBufUtils;
 import io.netty.buffer.ByteBuf;
 import org.joml.Vector3f;
diff --git a/src/client/java/com/github/squi2rel/vp/video/ClientVideoScreen.java b/src/client/java/com/github/squi2rel/vp/video/ClientVideoScreen.java
@@ -1,7 +1,7 @@
-package com.github.squi2rel.vp;
+package com.github.squi2rel.vp.video;
 
+import com.github.squi2rel.vp.VideoPlayerClient;
 import com.github.squi2rel.vp.provider.VideoInfo;
-import com.github.squi2rel.vp.video.*;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
diff --git a/src/client/java/com/github/squi2rel/vp/video/ClonePlayer.java b/src/client/java/com/github/squi2rel/vp/video/ClonePlayer.java
@@ -1,6 +1,5 @@
 package com.github.squi2rel.vp.video;
 
-import com.github.squi2rel.vp.ClientVideoScreen;
 import com.github.squi2rel.vp.provider.VideoInfo;
 import net.minecraft.client.render.VertexConsumer;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/client/java/com/github/squi2rel/vp/video/Degree360Player.java b/src/client/java/com/github/squi2rel/vp/video/Degree360Player.java
@@ -1,6 +1,5 @@
 package com.github.squi2rel.vp.video;
 
-import com.github.squi2rel.vp.ClientVideoScreen;
 import com.github.squi2rel.vp.ScreenRenderer;
 import com.github.squi2rel.vp.vivecraft.Vivecraft;
 import com.mojang.blaze3d.systems.RenderSystem;
diff --git a/src/client/java/com/github/squi2rel/vp/video/EntityCameraPlayer.java b/src/client/java/com/github/squi2rel/vp/video/EntityCameraPlayer.java
@@ -1,7 +1,6 @@
 package com.github.squi2rel.vp.video;
 
 import com.github.squi2rel.vp.CameraRenderer;
-import com.github.squi2rel.vp.ClientVideoScreen;
 import com.github.squi2rel.vp.mixin.client.ClientWorldAccessor;
 import com.github.squi2rel.vp.provider.VideoInfo;
 import net.minecraft.client.MinecraftClient;
diff --git a/src/client/java/com/github/squi2rel/vp/video/IVideoPlayer.java b/src/client/java/com/github/squi2rel/vp/video/IVideoPlayer.java
@@ -1,6 +1,5 @@
 package com.github.squi2rel.vp.video;
 
-import com.github.squi2rel.vp.ClientVideoScreen;
 import com.github.squi2rel.vp.ScreenRenderer;
 import com.github.squi2rel.vp.provider.VideoInfo;
 import net.minecraft.client.gl.ShaderProgramKeys;
diff --git a/src/client/java/com/github/squi2rel/vp/video/VideoPlayer.java b/src/client/java/com/github/squi2rel/vp/video/VideoPlayer.java
@@ -1,6 +1,5 @@
 package com.github.squi2rel.vp.video;
 
-import com.github.squi2rel.vp.ClientVideoScreen;
 import com.github.squi2rel.vp.provider.VideoInfo;
 import com.github.squi2rel.vp.vivecraft.Vivecraft;
 import net.minecraft.client.MinecraftClient;
diff --git a/src/client/java/com/github/squi2rel/vp/video/VideoPlayers.java b/src/client/java/com/github/squi2rel/vp/video/VideoPlayers.java
@@ -1,6 +1,5 @@
 package com.github.squi2rel.vp.video;
 
-import com.github.squi2rel.vp.ClientVideoScreen;
 import com.github.squi2rel.vp.provider.VideoInfo;
 
 public class VideoPlayers {
diff --git a/src/client/java/com/github/squi2rel/vp/video/VlcDecoder.java b/src/client/java/com/github/squi2rel/vp/video/VlcDecoder.java
@@ -61,7 +61,6 @@ public void error(MediaPlayer mediaPlayer) {
                 mediaPlayer.submit(() -> mediaPlayer.controls().stop());
             }
         });
-        mediaPlayer.video().setAdjustVideo(false);
     }
 
     public static void load() {
@@ -87,7 +86,7 @@ public void submit(Runnable r) {
     }
 
     public void init(VideoInfo info) {
-        mediaPlayer.media().play(info.path(), info.params());
+        mediaPlayer.media().play(info.path().replace("rtspt://", "rtsp://"), info.params());
     }
 
     public ByteBuffer decodeNextFrame() {
diff --git a/src/main/java/com/github/squi2rel/vp/VideoPlayerMain.java b/src/main/java/com/github/squi2rel/vp/VideoPlayerMain.java
@@ -23,7 +23,7 @@
 public class VideoPlayerMain implements ModInitializer {
     public static final String MOD_ID = "videoplayer";
     public static final String version = FabricLoader.getInstance().getModContainer(MOD_ID).orElseThrow().getMetadata().getVersion().toString();
-    public static UnsatisfiedLinkError error = null;
+    public static Throwable error = null;
 
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
@@ -32,7 +32,7 @@ public class VideoPlayerMain implements ModInitializer {
     public void onInitialize() {
         try {
             StreamListener.load();
-        } catch (UnsatisfiedLinkError e) {
+        } catch (Throwable e) {
             error = e;
             VideoPlayerMain.LOGGER.error("Cannot load vlc library", e);
             return;
diff --git a/src/main/java/com/github/squi2rel/vp/provider/NetworkProvider.java b/src/main/java/com/github/squi2rel/vp/provider/NetworkProvider.java
@@ -46,7 +46,7 @@ private static String getName(String mrl) {
         String name = "Unknown Stream";
         if (path.startsWith("http") && path.contains(".m3u8")) {
             name = "HLS Stream";
-        } else if (path.startsWith("rtsp://")) {
+        } else if (path.startsWith("rtsp://") || path.startsWith("rtspt://")) {
             name = "RTSP Stream";
         } else if (path.startsWith("http")) {
             name = "HTTP Stream";
diff --git a/src/main/java/com/github/squi2rel/vp/video/StreamListener.java b/src/main/java/com/github/squi2rel/vp/video/StreamListener.java
@@ -128,7 +128,7 @@ public void timeout(Runnable timeout) {
     @Override
     public void listen() {
         references.put(player, this);
-        player.media().play(info.path(), info.params());
+        player.media().play(info.path().replace("rtspt://", "rtsp://"), info.params());
     }
 
     @Override
