aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java135
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java2
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java11
3 files changed, 91 insertions, 57 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
index 37d3cda9..ba3a9c15 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
@@ -50,6 +50,7 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.MediaItem;
+import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Tracks;
@@ -183,6 +184,7 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
private String videoDownloadUrl;
private String videoFileName;
+ private String videoFallbackHLSUrl;
private String subredditName;
private String id;
private boolean wasPlaying;
@@ -409,6 +411,7 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
Post post = intent.getParcelableExtra(EXTRA_POST);
if (post != null) {
titleTextView.setText(post.getTitle());
+ videoFallbackHLSUrl = post.getVideoFallBackHLSUrl();
}
trackSelector = new DefaultTrackSelector(this);
@@ -506,6 +509,68 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
});
}
+ player.addListener(new Player.Listener() {
+ @Override
+ public void onTracksChanged(@NonNull Tracks tracks) {
+ ImmutableList<Tracks.Group> trackGroups = tracks.getGroups();
+ if (!trackGroups.isEmpty()) {
+ if (videoType == VIDEO_TYPE_NORMAL) {
+ hdButton.setVisibility(View.VISIBLE);
+ hdButton.setOnClickListener(view -> {
+ TrackSelectionDialogBuilder builder = new TrackSelectionDialogBuilder(ViewVideoActivity.this, getString(R.string.select_video_quality), player, C.TRACK_TYPE_VIDEO);
+ builder.setShowDisableOption(true);
+ builder.setAllowAdaptiveSelections(false);
+ Dialog dialog = builder.setTheme(R.style.MaterialAlertDialogTheme).build();
+ dialog.show();
+ if (dialog instanceof AlertDialog) {
+ ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
+ ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
+ }
+ });
+ }
+
+ for (Tracks.Group trackGroup : tracks.getGroups()) {
+ if (trackGroup.getType() == C.TRACK_TYPE_AUDIO) {
+ if (videoType == VIDEO_TYPE_NORMAL && trackGroup.length > 1) {
+ // Reddit video HLS usually has two audio tracks. The first is mono.
+ // The second (index 1) is stereo.
+ // Select the stereo audio track if possible.
+ trackSelector.setParameters(
+ trackSelector.buildUponParameters()
+ .setOverrideForType(new TrackSelectionOverride(
+ trackGroup.getMediaTrackGroup(),
+ 1
+ )
+ )
+ );
+ }
+ if (muteButton.getVisibility() != View.VISIBLE) {
+ muteButton.setVisibility(View.VISIBLE);
+ muteButton.setOnClickListener(view -> {
+ if (isMute) {
+ isMute = false;
+ player.setVolume(1f);
+ muteButton.setIconResource(R.drawable.ic_unmute_24dp);
+ } else {
+ isMute = true;
+ player.setVolume(0f);
+ muteButton.setIconResource(R.drawable.ic_mute_24dp);
+ }
+ });
+ }
+ }
+ }
+ } else {
+ muteButton.setVisibility(View.GONE);
+ }
+ }
+
+ @Override
+ public void onPlayerError(@NonNull PlaybackException error) {
+ loadFallbackVideo(savedInstanceState);
+ }
+ });
+
if (savedInstanceState == null) {
mVideoUri = intent.getData();
videoType = getIntent().getIntExtra(EXTRA_VIDEO_TYPE, VIDEO_TYPE_NORMAL);
@@ -623,63 +688,6 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
} else {
muteButton.setIconResource(R.drawable.ic_unmute_24dp);
}
-
- player.addListener(new Player.Listener() {
- @Override
- public void onTracksChanged(@NonNull Tracks tracks) {
- ImmutableList<Tracks.Group> trackGroups = tracks.getGroups();
- if (!trackGroups.isEmpty()) {
- if (videoType == VIDEO_TYPE_NORMAL) {
- hdButton.setVisibility(View.VISIBLE);
- hdButton.setOnClickListener(view -> {
- TrackSelectionDialogBuilder builder = new TrackSelectionDialogBuilder(ViewVideoActivity.this, getString(R.string.select_video_quality), player, C.TRACK_TYPE_VIDEO);
- builder.setShowDisableOption(true);
- builder.setAllowAdaptiveSelections(false);
- Dialog dialog = builder.setTheme(R.style.MaterialAlertDialogTheme).build();
- dialog.show();
- if (dialog instanceof AlertDialog) {
- ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
- ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
- }
- });
- }
-
- for (Tracks.Group trackGroup : tracks.getGroups()) {
- if (trackGroup.getType() == C.TRACK_TYPE_AUDIO) {
- if (videoType == VIDEO_TYPE_NORMAL && trackGroup.length > 1) {
- // Reddit video HLS usually has two audio tracks. The first is mono.
- // The second (index 1) is stereo.
- // Select the stereo audio track if possible.
- trackSelector.setParameters(
- trackSelector.buildUponParameters()
- .setOverrideForType(new TrackSelectionOverride(
- trackGroup.getMediaTrackGroup(),
- 1
- )
- )
- );
- }
- if (muteButton.getVisibility() != View.VISIBLE) {
- muteButton.setVisibility(View.VISIBLE);
- muteButton.setOnClickListener(view -> {
- if (isMute) {
- isMute = false;
- player.setVolume(1f);
- muteButton.setIconResource(R.drawable.ic_unmute_24dp);
- } else {
- isMute = true;
- player.setVolume(0f);
- muteButton.setIconResource(R.drawable.ic_mute_24dp);
- }
- });
- }
- }
- }
- } else {
- muteButton.setVisibility(View.GONE);
- }
- }
- });
}
private void changePlaybackSpeed() {
@@ -749,6 +757,7 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
new FetchPost.FetchPostListener() {
@Override
public void fetchPostSuccess(Post post) {
+ videoFallbackHLSUrl = post.getVideoFallBackHLSUrl();
if (post.isRedgifs()) {
videoType = VIDEO_TYPE_REDGIFS;
String redgifsId = post.getRedgifsId();
@@ -841,6 +850,18 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
});
}
+ private void loadFallbackVideo(Bundle savedInstanceState) {
+ if (videoFallbackHLSUrl != null) {
+ MediaItem mediaItem = player.getCurrentMediaItem();
+ if (mediaItem == null || mediaItem.localConfiguration != null && !videoFallbackHLSUrl.equals(mediaItem.localConfiguration.uri.toString())) {
+ videoType = VIDEO_TYPE_NORMAL;
+ player.prepare();
+ player.setMediaSource(new HlsMediaSource.Factory(dataSourceFactory).createMediaSource(MediaItem.fromUri(videoFallbackHLSUrl)));
+ preparePlayer(savedInstanceState);
+ }
+ }
+ }
+
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.view_video_activity, menu);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java
index 70fc3632..c0a65008 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java
@@ -399,6 +399,8 @@ public class ParsePost {
post.setVideoUrl(videoUrl);
post.setVideoDownloadUrl(videoDownloadUrl);
}
+ post.setVideoFallBackHLSUrl(Html.fromHtml(data.getJSONObject(JSONUtils.PREVIEW_KEY)
+ .getJSONObject(JSONUtils.REDDIT_VIDEO_PREVIEW_KEY).getString(JSONUtils.HLS_URL_KEY)).toString());
} else {
if (path.endsWith(".jpg") || path.endsWith(".png") || path.endsWith(".jpeg")) {
//Image post
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java
index ba7b4beb..e8fc7ee1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java
@@ -43,6 +43,7 @@ public class Post implements Parcelable {
private String url;
private String videoUrl;
private String videoDownloadUrl;
+ private String videoFallBackHLSUrl;
private String redgifsId;
private String streamableShortCode;
private boolean isImgur;
@@ -167,6 +168,7 @@ public class Post implements Parcelable {
url = in.readString();
videoUrl = in.readString();
videoDownloadUrl = in.readString();
+ videoFallBackHLSUrl = in.readString();
redgifsId = in.readString();
streamableShortCode = in.readString();
isImgur = in.readByte() != 0;
@@ -328,6 +330,14 @@ public class Post implements Parcelable {
this.videoDownloadUrl = videoDownloadUrl;
}
+ public String getVideoFallBackHLSUrl() {
+ return videoFallBackHLSUrl;
+ }
+
+ public void setVideoFallBackHLSUrl(String videoFallBackHLSUrl) {
+ this.videoFallBackHLSUrl = videoFallBackHLSUrl;
+ }
+
public String getRedgifsId() {
return redgifsId;
}
@@ -488,6 +498,7 @@ public class Post implements Parcelable {
dest.writeString(url);
dest.writeString(videoUrl);
dest.writeString(videoDownloadUrl);
+ dest.writeString(videoFallBackHLSUrl);
dest.writeString(redgifsId);
dest.writeString(streamableShortCode);
dest.writeByte((byte) (isImgur ? 1 : 0));
generated by cgit (git). Responsive design from responsive-cgit-css. Dark theme color palette from Dracula theme