feat(las): register ijklas demuxer & find through it's format_name

feat(las): find ijklas demuxer through it's format name
luosch · Apr 23, 2021 · 13f03e8 · 13f03e8
1 parent a6e5146
commit 13f03e8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/...kplayer-example/src/main/java/tv/danmaku/ijk/media/example/widget/media/IjkVideoView.java b/...kplayer-example/src/main/java/tv/danmaku/ijk/media/example/widget/media/IjkVideoView.java
@@ -256,7 +256,7 @@ public void setHudView(TableLayout tableLayout) {
     public void setVideoPath(String path) {
         if (path.contains("adaptationSet")){
             mManifestString = path;
-            setVideoURI(Uri.EMPTY);
+            setVideoURI(Uri.parse("manifest.las"));
         } else {
             setVideoURI(Uri.parse(path));
         }
@@ -1044,6 +1044,7 @@ public IMediaPlayer createPlayer(int playerType) {
                     ijkMediaPlayer.native_setLogLevel(IjkMediaPlayer.IJK_LOG_DEBUG);
 
                     if (mManifestString != null) {
+                        ijkMediaPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "iformat", "ijklas");
                         ijkMediaPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "is-manifest", 1);
                         ijkMediaPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "manifest_string", mManifestString);
                     }

diff --git a/ijkmedia/ijkplayer/ijkavformat/allformats.c b/ijkmedia/ijkplayer/ijkavformat/allformats.c
@@ -87,5 +87,6 @@ void ijkav_register_all(void)
     IJK_REGISTER_PROTOCOL(ijksegment);
     /* demuxers */
     IJK_REGISTER_DEMUXER(ijklivehook);
+    IJK_REGISTER_DEMUXER(ijklas);
     av_log(NULL, AV_LOG_INFO, "===== custom modules end =====\n");
 }
diff --git a/ijkmedia/ijkplayer/ijkavformat/ijklas.c b/ijkmedia/ijkplayer/ijkavformat/ijklas.c
@@ -1839,7 +1839,7 @@ static int las_close(AVFormatContext* s) {
 }
 
 static int las_probe(AVProbeData* p) {
-    if (p->filename && strstr(p->filename, ".las"))
+    if (p->filename && strstr(p->filename, "manifest.las"))
         return AVPROBE_SCORE_MAX;
 
     return 0;
@@ -2108,17 +2108,17 @@ static const AVOption las_options[] = {
     {NULL}
 };
 
-static const AVClass las_class = {
-    .class_name = "las",
+static const AVClass ijklas_class = {
+    .class_name = "las demuxer",
     .item_name  = av_default_item_name,
     .option     = las_options,
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-AVInputFormat ijkff_las_demuxer = {
-    .name           = "las",
+AVInputFormat ijkff_ijklas_demuxer = {
+    .name           = "ijklas",
     .long_name      = "Live Adaptive Streaming",
-    .priv_class     = &las_class,
+    .priv_class     = &ijklas_class,
     .priv_data_size = sizeof(LasContext),
     .read_probe     = las_probe,
     .read_header    = las_read_header,