From 751ebc32c1927eb45a832b7462a9051fe85f5b39 Mon Sep 17 00:00:00 2001 From: guoshuyu <359369982@qq.com> Date: Mon, 14 Dec 2020 14:05:38 +0800 Subject: [PATCH] update --- .../main/java/com/example/gsyvideoplayer/DetailPlayer.java | 6 +++--- .../com/example/gsyvideoplayer/exo/GSYExo2MediaPlayer.java | 5 +++-- .../gsyvideoplayer/exosubtitle/GSYExoSubTitlePlayer.java | 6 +++--- .../java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java index 65e45ef..2589ae3 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java +++ b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java @@ -93,7 +93,7 @@ public class DetailPlayer extends AppCompatActivity { /***************rtsp 配置****************/ - /*VideoOptionModel videoOptionModel = + VideoOptionModel videoOptionModel = new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "dns_cache_clear", 1); List list = new ArrayList<>(); list.add(videoOptionModel); @@ -111,7 +111,7 @@ public class DetailPlayer extends AppCompatActivity { list.add(videoOptionMode14); list.add(videoOptionMode15); list.add(videoOptionMode17); - GSYVideoManager.instance().setOptionModelList(list);*/ + GSYVideoManager.instance().setOptionModelList(list); /***************rtsp 配置****************/ /// ijk rtmp @@ -343,7 +343,7 @@ public class DetailPlayer extends AppCompatActivity { //String url = "http://39.104.119.42/elevator-1.0/api/downFile?path=demo.ogv"; //String url = "http://pointshow.oss-cn-hangzhou.aliyuncs.com/transcode/ORIGINAL/Mnbc61586842828593.mp4"; //ssl error - String url = "https://file.shftz.cn:8443/filesystem/download/10/2019/3/26/ce2c7c66-e9eb-42be-adf6-f9008385ea8c.mov/play"; + String url = "rtsp://admin:zaqwsx123456@192.168.40.181/cam/realmonitor?channel=1&subtype=1"; //String url = "https://us-4.wl-cdn.com/hls/20200225/fde4f8ef394731f38d68fe6d601cfd56/index.m3u8"; //String url = "https://cdn61.ytbbs.tv/cn/tv/55550/55550-1/play.m3u8?md5=v4sI4lWlo4XojzeAjgBGaQ&expires=1521204012&token=55550"; //String url = "http://1253492636.vod2.myqcloud.com/2e5fc148vodgzp1253492636/d08af82d4564972819086152830/plHZZoSkje0A.mp4"; diff --git a/app/src/main/java/com/example/gsyvideoplayer/exo/GSYExo2MediaPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/exo/GSYExo2MediaPlayer.java index 14ec24a..fbdc83c 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/exo/GSYExo2MediaPlayer.java +++ b/app/src/main/java/com/example/gsyvideoplayer/exo/GSYExo2MediaPlayer.java @@ -117,7 +117,7 @@ public class GSYExo2MediaPlayer extends IjkExo2MediaPlayer { @Override public void run() { if (mTrackSelector == null) { - mTrackSelector = new DefaultTrackSelector(); + mTrackSelector = new DefaultTrackSelector(mAppContext); } mEventLogger = new EventLogger(mTrackSelector); boolean preferExtensionDecoders = true; @@ -150,7 +150,8 @@ public class GSYExo2MediaPlayer extends IjkExo2MediaPlayer { if (playIndex > 0) { mInternalPlayer.seekTo(playIndex, C.INDEX_UNSET); } - mInternalPlayer.prepare(mMediaSource, false, false); + mInternalPlayer.setMediaSource(mMediaSource, false); + mInternalPlayer.prepare(); mInternalPlayer.setPlayWhenReady(false); } } diff --git a/app/src/main/java/com/example/gsyvideoplayer/exosubtitle/GSYExoSubTitlePlayer.java b/app/src/main/java/com/example/gsyvideoplayer/exosubtitle/GSYExoSubTitlePlayer.java index 1c22041..e66f78a 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/exosubtitle/GSYExoSubTitlePlayer.java +++ b/app/src/main/java/com/example/gsyvideoplayer/exosubtitle/GSYExoSubTitlePlayer.java @@ -45,7 +45,7 @@ public class GSYExoSubTitlePlayer extends IjkExo2MediaPlayer { @Override public void run() { if (mTrackSelector == null) { - mTrackSelector = new DefaultTrackSelector(); + mTrackSelector = new DefaultTrackSelector(mAppContext); } mEventLogger = new EventLogger(mTrackSelector); boolean preferExtensionDecoders = true; @@ -81,8 +81,8 @@ public class GSYExoSubTitlePlayer extends IjkExo2MediaPlayer { MediaSource textMediaSource = getTextSource(Uri.parse(mSubTitile)); mMediaSource = new MergingMediaSource(mMediaSource, textMediaSource); } - - mInternalPlayer.prepare(mMediaSource); + mInternalPlayer.setMediaSource(mMediaSource); + mInternalPlayer.prepare(); mInternalPlayer.setPlayWhenReady(false); } } diff --git a/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java index f110dbd..0d02de4 100644 --- a/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java +++ b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java @@ -343,7 +343,7 @@ public class IjkExo2MediaPlayer extends AbstractMediaPlayer implements Player.Ev @Override public void run() { if (mTrackSelector == null) { - mTrackSelector = new DefaultTrackSelector(); + mTrackSelector = new DefaultTrackSelector(mAppContext); } mEventLogger = new EventLogger(mTrackSelector); boolean preferExtensionDecoders = true; @@ -371,8 +371,8 @@ public class IjkExo2MediaPlayer extends AbstractMediaPlayer implements Player.Ev } if (mSurface != null) mInternalPlayer.setVideoSurface(mSurface); - - mInternalPlayer.prepare(mMediaSource); + mInternalPlayer.setMediaSource(mMediaSource); + mInternalPlayer.prepare(); mInternalPlayer.setPlayWhenReady(false); } } -- GitLab