Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
282790ead5
@ -287,6 +287,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
|
|||||||
public void play(String url, int playModel) {
|
public void play(String url, int playModel) {
|
||||||
srcUrl = url;
|
srcUrl = url;
|
||||||
PLAY_MODEL = playModel;
|
PLAY_MODEL = playModel;
|
||||||
|
waitNextUrl = null;
|
||||||
Log.i(TAG, "play" + " url:" + url + " playModel: " + playModel + " landscape: " + landscape + " videoLandscape" + videoLandscape);
|
Log.i(TAG, "play" + " url:" + url + " playModel: " + playModel + " landscape: " + landscape + " videoLandscape" + videoLandscape);
|
||||||
if (playModel != PLAY_MODEL_DEF && !url.contains(videoFps[0] + ".flv")) {
|
if (playModel != PLAY_MODEL_DEF && !url.contains(videoFps[0] + ".flv")) {
|
||||||
mPlayer.setViewResizeMode(landscape == VIDEO_VERTICAL);
|
mPlayer.setViewResizeMode(landscape == VIDEO_VERTICAL);
|
||||||
|
Loading…
Reference in New Issue
Block a user