From 072942b687ad181ddf86e1ed2957cd0b781aa48d Mon Sep 17 00:00:00 2001 From: johnwenjunwu Date: Fri, 23 Apr 2021 11:44:48 +0800 Subject: [PATCH] refactor(las): replace "manifest.las" with "ijklas:" --- .../tv/danmaku/ijk/media/example/widget/media/IjkVideoView.java | 2 +- ijkmedia/ijkplayer/ijkavformat/ijklas.c | 2 +- ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/widget/media/IjkVideoView.java b/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/widget/media/IjkVideoView.java index 88bb8c25..d4200045 100755 --- a/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/widget/media/IjkVideoView.java +++ b/android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/widget/media/IjkVideoView.java @@ -256,7 +256,7 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl public void setVideoPath(String path) { if (path.contains("adaptationSet")){ mManifestString = path; - setVideoURI(Uri.parse("manifest.las")); + setVideoURI(Uri.parse("ijklas:")); } else { setVideoURI(Uri.parse(path)); } diff --git a/ijkmedia/ijkplayer/ijkavformat/ijklas.c b/ijkmedia/ijkplayer/ijkavformat/ijklas.c index 6dfac615..642a5000 100644 --- a/ijkmedia/ijkplayer/ijkavformat/ijklas.c +++ b/ijkmedia/ijkplayer/ijkavformat/ijklas.c @@ -1758,7 +1758,7 @@ static int las_close(AVFormatContext* s) { } static int las_probe(AVProbeData* p) { - if (p->filename && strstr(p->filename, "manifest.las")) + if (p->filename && av_strstart(p->filename, "ijklas:", NULL)) return AVPROBE_SCORE_MAX; return 0; diff --git a/ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m b/ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m index 79ceb60f..5178c747 100644 --- a/ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m +++ b/ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m @@ -39,7 +39,7 @@ - (instancetype)initWithManifest: (NSString*)manifest_string { self = [self initWithNibName:@"IJKMoviePlayerViewController" bundle:nil]; if (self) { - self.url = [NSURL URLWithString:@"manifest.las"]; + self.url = [NSURL URLWithString:@"ijklas:"]; self.manifest = manifest_string; } return self; -- GitLab