mirror/SmartTube
1
0
Fork 0
mirror of https://github.com/yuliskov/SmartTube.git synced 2026-01-25 16:10:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

track select fix

Browse Source
This commit is contained in:
Yuriy Liskov
2020-09-23 20:14:51 +03:00
parent 52555b1ed1
commit 31a4972ed1
6 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/selector/TrackSelectorManager.java
View File

@@ -390,9 +390,13 @@ public class TrackSelectorManager implements TrackSelectorCallback {
for (int trackIndex = 0; trackIndex < renderer.mediaTracks[groupIndex].length; trackIndex++) {
MediaTrack mediaTrack = renderer.mediaTracks[groupIndex][trackIndex];
if (TrackSelectorUtil.compare(mediaTrack, track)) {
int compare = TrackSelectorUtil.compare(mediaTrack, track);
if (compare == 0) {
result = mediaTrack;
break;
} else if (compare < 0 && TrackSelectorUtil.compare(result, mediaTrack) < 0) {
result = mediaTrack;
}
}
}

64
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/selector/TrackSelectorUtil.java
View File

@@ -114,23 +114,7 @@ public class TrackSelectorUtil {
return format.bitrate > 300000 ? "5.1" : "";
}
public static boolean heightEquals(int height1, int height2) {
if (height1 == -1 || height2 == -1) {
return false;
}
return Math.abs(height1 - height2) < HEIGHT_EQUITY_THRESHOLD_PX;
}
public static boolean heightLessOrEquals(int height1, int height2) {
if (height1 == -1 || height2 == -1) {
return false;
}
return height1 <= height2 || Math.abs(height1 - height2) < HEIGHT_EQUITY_THRESHOLD_PX;
}
public static boolean codecEquals(String codecs1, String codecs2) {
private static boolean codecEquals(String codecs1, String codecs2) {
if (codecs1 == null || codecs2 == null) {
return false;
}
@@ -138,23 +122,53 @@ public class TrackSelectorUtil {
return Helpers.equals(codecNameShort(codecs1), codecNameShort(codecs2));
}
public static boolean fpsEquals(float fps1, float fps2) {
if (fps1 == -1 || fps2 == -1) {
private static boolean heightEquals(int height1, int height2) {
if (height1 == -1 || height2 == -1) {
return false;
}
return Math.abs(height1 - height2) < HEIGHT_EQUITY_THRESHOLD_PX;
}
private static boolean heightLessOrEquals(int height1, int height2) {
if (height1 == -1 || height2 == -1) {
return false;
}
return height1 <= height2 || heightEquals(height1, height2);
}
private static boolean fpsEquals(float fps1, float fps2) {
if (fps1 == -1 || fps2 == -1) {
return true;
}
return Math.abs(fps1 - fps2) < 10;
}
public static boolean compare(MediaTrack track1, MediaTrack track2) {
boolean result = false;
private static boolean fpsLessOrEquals(float fps1, float fps2) {
if (fps1 == -1 || fps2 == -1) {
return true;
}
return fps1 <= fps2 || fpsEquals(fps1, fps2);
}
public static int compare(MediaTrack track1, MediaTrack track2) {
if (track1 == null || track1.format == null) {
return -1;
}
int result = 1;
if (Helpers.equals(track1.format.id, track2.format.id)) {
result = true;
result = 0;
} else if (TrackSelectorUtil.codecEquals(track1.format.codecs, track2.format.codecs)) {
if (TrackSelectorUtil.fpsEquals(track1.format.frameRate, track2.format.frameRate)) {
if (TrackSelectorUtil.heightLessOrEquals(track1.format.height, track2.format.height)) {
result = true;
if (TrackSelectorUtil.fpsLessOrEquals(track1.format.frameRate, track2.format.frameRate)) {
if (TrackSelectorUtil.heightEquals(track1.format.height, track2.format.height)) {
result = 0;
} else if (TrackSelectorUtil.heightLessOrEquals(track1.format.height, track2.format.height)) {
result = -1;
}
}
}

6
smartyoutubetv2/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/playerglue/PlaybackTransportRowPresenter.java
View File

@@ -595,9 +595,9 @@ public class PlaybackTransportRowPresenter extends PlaybackRowPresenter {
setHeaderPresenter(null);
setSelectEffectEnabled(false);
mPlaybackControlsPresenter = new ControlBarPresenter(com.liskovsoft.smartyoutubetv2.tv.R.layout.lb_control_bar_mod);
mPlaybackControlsPresenter = new ControlBarPresenter(com.liskovsoft.smartyoutubetv2.tv.R.layout.mod_lb_control_bar);
mPlaybackControlsPresenter.setDefaultFocusToMiddle(false);
mSecondaryControlsPresenter = new ControlBarPresenter(com.liskovsoft.smartyoutubetv2.tv.R.layout.lb_control_bar_mod);
mSecondaryControlsPresenter = new ControlBarPresenter(com.liskovsoft.smartyoutubetv2.tv.R.layout.mod_lb_control_bar);
mSecondaryControlsPresenter.setDefaultFocusToMiddle(false);
mPlaybackControlsPresenter.setOnControlSelectedListener(mOnControlSelectedListener);
@@ -694,7 +694,7 @@ public class PlaybackTransportRowPresenter extends PlaybackRowPresenter {
@Override
protected RowPresenter.ViewHolder createRowViewHolder(ViewGroup parent) {
View v = LayoutInflater.from(parent.getContext()).inflate(
com.liskovsoft.smartyoutubetv2.tv.R.layout.lb_playback_transport_controls_row_mod, parent, false);
com.liskovsoft.smartyoutubetv2.tv.R.layout.mod_lb_playback_transport_controls_row, parent, false);
ViewHolder vh = new ViewHolder(v, mDescriptionPresenter);
initRow(vh);
return vh;

2
smartyoutubetv2/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/VideoPlayerGlue.java
View File

@@ -127,6 +127,7 @@ public class VideoPlayerGlue extends FixedVideoPlayerGlue<PlayerAdapter> {
adapter.add(mRewindAction);
adapter.add(mFastForwardAction);
adapter.add(mSkipNextAction);
adapter.add(mRepeatAction);
}
@Override
@@ -144,7 +145,6 @@ public class VideoPlayerGlue extends FixedVideoPlayerGlue<PlayerAdapter> {
adapter.add(mThumbsUpAction);
adapter.add(mSubscribeAction);
adapter.add(mClosedCaptioningAction);
adapter.add(mRepeatAction);
adapter.add(mVideoStatsAction);
}

0
smartyoutubetv2/src/main/res/layout/lb_control_bar_mod.xml → smartyoutubetv2/src/main/res/layout/mod_lb_control_bar.xml
View File

0
smartyoutubetv2/src/main/res/layout/lb_playback_transport_controls_row_mod.xml → smartyoutubetv2/src/main/res/layout/mod_lb_playback_transport_controls_row.xml
View File