Add srv3 support

afishhh · Mar 29, 2024 · 01d407e · 01d407e
1 parent 92cb473
commit 01d407e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
@@ -196,7 +196,7 @@ static const struct format_hack format_hacks[] = {
     TEXTSUB("aqtitle"), TEXTSUB("jacosub"), TEXTSUB("microdvd"),
     TEXTSUB("mpl2"), TEXTSUB("mpsub"), TEXTSUB("pjs"), TEXTSUB("realtext"),
     TEXTSUB("sami"), TEXTSUB("srt"), TEXTSUB("stl"), TEXTSUB("subviewer"),
-    TEXTSUB("subviewer1"), TEXTSUB("vplayer"), TEXTSUB("ass"),
+    TEXTSUB("subviewer1"), TEXTSUB("vplayer"), TEXTSUB("ass"), TEXTSUB("srv3"),
 
     TEXTSUB_UTF8("webvtt"),
 

diff --git a/options/options.c b/options/options.c
@@ -1061,6 +1061,7 @@ static const struct MPOpts mp_default_opts = {
         "scc",
         "smi",
         "srt",
+        "srv3",
         "ssa",
         "sub",
         "sup",

diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua
@@ -66,6 +66,7 @@ local ext_map = {
 
 local codec_map = {
     -- src pattern  = mpv codec
+    ["srv3"]        = "srv3",
     ["vtt"]         = "webvtt",
     ["opus"]        = "opus",
     ["vp9"]         = "vp9",
@@ -895,7 +896,7 @@ function run_ytdl_hook(url)
 
     local command = {
         ytdl.path, "--no-warnings", "-J", "--flat-playlist",
-        "--sub-format", "ass/srt/best"
+        "--sub-format", "ass/srv3/srt/best"
     }
 
     -- Checks if video option is "no", change format accordingly,

diff --git a/sub/lavc_conv.c b/sub/lavc_conv.c
@@ -106,7 +106,9 @@ struct lavc_conv *lavc_conv_create(struct mp_log *log,
     priv->avctx = avctx;
     priv->extradata = talloc_strndup(priv, avctx->subtitle_header,
                                      avctx->subtitle_header_size);
-    disable_styles(bstr0(priv->extradata));
+    // The SRV3 decoder actually tries to replicate YouTube's styling
+    if(strcmp(codec->name, "srv3"))
+        disable_styles(bstr0(priv->extradata));
     return priv;
 
  error:
-Original file line number
+Diff line change
@@ Expand Up / @@ -1061,6 +1061,7 @@ static const struct MPOpts mp_default_opts = { @@
             "scc",
             "smi",
             "srt",
+            "srv3",
             "ssa",
             "sub",
             "sup",
@@ Expand Down @@