提交 751ebc32 编写于 作者: G guoshuyu

update

上级 93d48b20
...@@ -93,7 +93,7 @@ public class DetailPlayer extends AppCompatActivity { ...@@ -93,7 +93,7 @@ public class DetailPlayer extends AppCompatActivity {
/***************rtsp 配置****************/ /***************rtsp 配置****************/
/*VideoOptionModel videoOptionModel = VideoOptionModel videoOptionModel =
new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "dns_cache_clear", 1); new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "dns_cache_clear", 1);
List<VideoOptionModel> list = new ArrayList<>(); List<VideoOptionModel> list = new ArrayList<>();
list.add(videoOptionModel); list.add(videoOptionModel);
...@@ -111,7 +111,7 @@ public class DetailPlayer extends AppCompatActivity { ...@@ -111,7 +111,7 @@ public class DetailPlayer extends AppCompatActivity {
list.add(videoOptionMode14); list.add(videoOptionMode14);
list.add(videoOptionMode15); list.add(videoOptionMode15);
list.add(videoOptionMode17); list.add(videoOptionMode17);
GSYVideoManager.instance().setOptionModelList(list);*/ GSYVideoManager.instance().setOptionModelList(list);
/***************rtsp 配置****************/ /***************rtsp 配置****************/
/// ijk rtmp /// ijk rtmp
...@@ -343,7 +343,7 @@ public class DetailPlayer extends AppCompatActivity { ...@@ -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://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"; //String url = "http://pointshow.oss-cn-hangzhou.aliyuncs.com/transcode/ORIGINAL/Mnbc61586842828593.mp4";
//ssl error //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://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 = "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"; //String url = "http://1253492636.vod2.myqcloud.com/2e5fc148vodgzp1253492636/d08af82d4564972819086152830/plHZZoSkje0A.mp4";
......
...@@ -117,7 +117,7 @@ public class GSYExo2MediaPlayer extends IjkExo2MediaPlayer { ...@@ -117,7 +117,7 @@ public class GSYExo2MediaPlayer extends IjkExo2MediaPlayer {
@Override @Override
public void run() { public void run() {
if (mTrackSelector == null) { if (mTrackSelector == null) {
mTrackSelector = new DefaultTrackSelector(); mTrackSelector = new DefaultTrackSelector(mAppContext);
} }
mEventLogger = new EventLogger(mTrackSelector); mEventLogger = new EventLogger(mTrackSelector);
boolean preferExtensionDecoders = true; boolean preferExtensionDecoders = true;
...@@ -150,7 +150,8 @@ public class GSYExo2MediaPlayer extends IjkExo2MediaPlayer { ...@@ -150,7 +150,8 @@ public class GSYExo2MediaPlayer extends IjkExo2MediaPlayer {
if (playIndex > 0) { if (playIndex > 0) {
mInternalPlayer.seekTo(playIndex, C.INDEX_UNSET); mInternalPlayer.seekTo(playIndex, C.INDEX_UNSET);
} }
mInternalPlayer.prepare(mMediaSource, false, false); mInternalPlayer.setMediaSource(mMediaSource, false);
mInternalPlayer.prepare();
mInternalPlayer.setPlayWhenReady(false); mInternalPlayer.setPlayWhenReady(false);
} }
} }
......
...@@ -45,7 +45,7 @@ public class GSYExoSubTitlePlayer extends IjkExo2MediaPlayer { ...@@ -45,7 +45,7 @@ public class GSYExoSubTitlePlayer extends IjkExo2MediaPlayer {
@Override @Override
public void run() { public void run() {
if (mTrackSelector == null) { if (mTrackSelector == null) {
mTrackSelector = new DefaultTrackSelector(); mTrackSelector = new DefaultTrackSelector(mAppContext);
} }
mEventLogger = new EventLogger(mTrackSelector); mEventLogger = new EventLogger(mTrackSelector);
boolean preferExtensionDecoders = true; boolean preferExtensionDecoders = true;
...@@ -81,8 +81,8 @@ public class GSYExoSubTitlePlayer extends IjkExo2MediaPlayer { ...@@ -81,8 +81,8 @@ public class GSYExoSubTitlePlayer extends IjkExo2MediaPlayer {
MediaSource textMediaSource = getTextSource(Uri.parse(mSubTitile)); MediaSource textMediaSource = getTextSource(Uri.parse(mSubTitile));
mMediaSource = new MergingMediaSource(mMediaSource, textMediaSource); mMediaSource = new MergingMediaSource(mMediaSource, textMediaSource);
} }
mInternalPlayer.setMediaSource(mMediaSource);
mInternalPlayer.prepare(mMediaSource); mInternalPlayer.prepare();
mInternalPlayer.setPlayWhenReady(false); mInternalPlayer.setPlayWhenReady(false);
} }
} }
......
...@@ -343,7 +343,7 @@ public class IjkExo2MediaPlayer extends AbstractMediaPlayer implements Player.Ev ...@@ -343,7 +343,7 @@ public class IjkExo2MediaPlayer extends AbstractMediaPlayer implements Player.Ev
@Override @Override
public void run() { public void run() {
if (mTrackSelector == null) { if (mTrackSelector == null) {
mTrackSelector = new DefaultTrackSelector(); mTrackSelector = new DefaultTrackSelector(mAppContext);
} }
mEventLogger = new EventLogger(mTrackSelector); mEventLogger = new EventLogger(mTrackSelector);
boolean preferExtensionDecoders = true; boolean preferExtensionDecoders = true;
...@@ -371,8 +371,8 @@ public class IjkExo2MediaPlayer extends AbstractMediaPlayer implements Player.Ev ...@@ -371,8 +371,8 @@ public class IjkExo2MediaPlayer extends AbstractMediaPlayer implements Player.Ev
} }
if (mSurface != null) if (mSurface != null)
mInternalPlayer.setVideoSurface(mSurface); mInternalPlayer.setVideoSurface(mSurface);
mInternalPlayer.setMediaSource(mMediaSource);
mInternalPlayer.prepare(mMediaSource); mInternalPlayer.prepare();
mInternalPlayer.setPlayWhenReady(false); mInternalPlayer.setPlayWhenReady(false);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册