Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to the final ExoPlayer release.

Browse Source
This commit is contained in:
Nicholas
2023-07-19 12:18:04 -04:00
parent a8349671d0
commit 627657e1de
8 changed files with 68 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java
View File

@@ -144,7 +144,7 @@ final class VoiceNotePlaybackPreparer implements MediaSessionConnector.Playbac
@MainThread
private void applyDescriptionsToQueue(@NonNull List<MediaItem> mediaItems) {
for (MediaItem mediaItem : mediaItems) {
MediaItem.PlaybackProperties playbackProperties = mediaItem.playbackProperties;
final MediaItem.LocalConfiguration playbackProperties = mediaItem.playbackProperties;
if (playbackProperties == null) {
continue;
}
@@ -194,7 +194,7 @@ final class VoiceNotePlaybackPreparer implements MediaSessionConnector.Playbac
private int indexOfPlayerMediaItemByUri(@NonNull Uri uri) {
for (int i = 0; i < player.getMediaItemCount(); i++) {
MediaItem.PlaybackProperties playbackProperties = player.getMediaItemAt(i).playbackProperties;
final MediaItem.LocalConfiguration playbackProperties = player.getMediaItemAt(i).playbackProperties;
if (playbackProperties != null && playbackProperties.uri.equals(uri)) {
return i;
}

11
app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4VideoPlayer.java
View File

@@ -16,7 +16,7 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
import com.google.android.exoplayer2.ui.PlayerView;
import com.google.android.exoplayer2.ui.StyledPlayerView;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
@@ -31,10 +31,9 @@ public final class GiphyMp4VideoPlayer extends FrameLayout implements DefaultLif
@SuppressWarnings("unused")
private static final String TAG = Log.tag(GiphyMp4VideoPlayer.class);
private final PlayerView exoView;
private ExoPlayer exoPlayer;
private CornerMask cornerMask;
private MediaItem mediaItem;
private final StyledPlayerView exoView;
private ExoPlayer exoPlayer;
private CornerMask cornerMask;
public GiphyMp4VideoPlayer(Context context) {
this(context, null);
@@ -79,7 +78,6 @@ public final class GiphyMp4VideoPlayer extends FrameLayout implements DefaultLif
}
void setVideoItem(@NonNull MediaItem mediaItem) {
this.mediaItem = mediaItem;
exoPlayer.setMediaItem(mediaItem);
exoPlayer.prepare();
}
@@ -110,7 +108,6 @@ public final class GiphyMp4VideoPlayer extends FrameLayout implements DefaultLif
if (exoPlayer != null) {
exoPlayer.stop();
exoPlayer.clearMediaItems();
mediaItem = null;
}
}

4
app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
View File

@@ -37,7 +37,7 @@ import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
import com.google.android.exoplayer2.ui.PlayerControlView;
import com.google.android.exoplayer2.ui.PlayerView;
import com.google.android.exoplayer2.ui.StyledPlayerView;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
@@ -53,7 +53,7 @@ public class VideoPlayer extends FrameLayout {
@SuppressWarnings("unused")
private static final String TAG = Log.tag(VideoPlayer.class);
private final PlayerView exoView;
private final StyledPlayerView exoView;
private final DefaultMediaSourceFactory mediaSourceFactory;
private ExoPlayer exoPlayer;

2
app/src/main/res/layout/gif_player.xml
View File

@@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.exoplayer2.ui.PlayerView
<com.google.android.exoplayer2.ui.StyledPlayerView
android:id="@+id/video_view"
android:layout_width="match_parent"
android:layout_height="match_parent"

2
app/src/main/res/layout/story_video_player.xml
View File

@@ -7,7 +7,7 @@
android:orientation="vertical"
tools:viewBindingIgnore="true">
<com.google.android.exoplayer2.ui.PlayerView
<com.google.android.exoplayer2.ui.StyledPlayerView
android:id="@+id/video_view"
android:layout_width="match_parent"
android:layout_height="match_parent"

2
app/src/main/res/layout/video_player.xml
View File

@@ -8,7 +8,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.exoplayer2.ui.PlayerView
<com.google.android.exoplayer2.ui.StyledPlayerView
android:id="@+id/video_view"
android:layout_width="match_parent"
android:layout_height="match_parent"