Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +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"

2
dependencies.gradle
View File

@@ -11,7 +11,7 @@ dependencyResolutionManagement {
version('androidx-lifecycle', '2.6.1')
version('androidx-navigation', '2.6.0')
version('androidx-window', '1.0.0')
version('exoplayer', '2.18.1')
version('exoplayer', '2.19.0')
version('glide', '4.13.2')
version('kotlin', '1.8.10')
version('libsignal-client', '0.26.0')

96
gradle/verification-metadata.xml
View File

@@ -1068,6 +1068,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="21e0d4c4c0565106558eab24e6c1344866a300dfacad4732d942c9e920ac8ff9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.media" name="media" version="1.6.0">
<artifact name="media-1.6.0.aar">
<sha256 value="fe628847d8f909ca8f23d685061f9a7684aa0c9bc9c1b201c4ff6eb7b3372828" origin="Generated by Gradle"/>
</artifact>
<artifact name="media-1.6.0.module">
<sha256 value="44d12bf8f7ce879f03af00ba01b556751d0073440fed1150128e903974c4def0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.multidex" name="multidex" version="2.0.1">
<artifact name="multidex-2.0.1.aar">
<sha256 value="42dd32ff9f97f85771b82a20003a8d70f68ab7b4ba328964312ce0732693db09" origin="Generated by Gradle"/>
@@ -2252,68 +2260,76 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="cb9353ef1791ae17097d878ca711e25a9c32cec9042adc49b00cadfee1a7290b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.android.exoplayer" name="exoplayer-common" version="2.18.1">
<artifact name="exoplayer-common-2.18.1.aar">
<sha256 value="2ca678c0c88935361c01f75455747de6124565b46162cbbcab00aac5498cc846" origin="Generated by Gradle"/>
<component group="com.google.android.exoplayer" name="exoplayer-common" version="2.19.0">
<artifact name="exoplayer-common-2.19.0.aar">
<sha256 value="275b1e632ea0c84c72d1dbf7d269dac56b16b91143ada275e839f43b3c0957c3" origin="Generated by Gradle"/>
</artifact>
<artifact name="exoplayer-common-2.18.1.module">
<sha256 value="5edad89e532cc835ee034ad86cbad0ec3de3eddb099cdbb8f1e640f3c4562b73" origin="Generated by Gradle"/>
<artifact name="exoplayer-common-2.19.0.module">
<sha256 value="4bc5417380075718238a6d2a9ef793eb924947d82c237e6fe92ff1625440aa8d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.android.exoplayer" name="exoplayer-core" version="2.18.1">
<artifact name="exoplayer-core-2.18.1.aar">
<sha256 value="f07ef40d8d8166beb78b0516cbb93a0053319d694300255d54483368b9a2105f" origin="Generated by Gradle"/>
<component group="com.google.android.exoplayer" name="exoplayer-container" version="2.19.0">
<artifact name="exoplayer-container-2.19.0.aar">
<sha256 value="f8d44b158d5f43a1da1912238c302b2c26ab8034344e94c5e58b673fd0327048" origin="Generated by Gradle"/>
</artifact>
<artifact name="exoplayer-core-2.18.1.module">
<sha256 value="7f5c3f842b20a27bcc2921a911c7f914975d67a14d2c218170541517cfc0658d" origin="Generated by Gradle"/>
<artifact name="exoplayer-container-2.19.0.module">
<sha256 value="0509716ed4e8616622d26f44dde77f787c53e4038153579c4a52411a319d96e3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.android.exoplayer" name="exoplayer-database" version="2.18.1">
<artifact name="exoplayer-database-2.18.1.aar">
<sha256 value="d7510e96a0d88f197c5800cbc7a181c44176600cd83a06bd2e8ffa92e05f552b" origin="Generated by Gradle"/>
<component group="com.google.android.exoplayer" name="exoplayer-core" version="2.19.0">
<artifact name="exoplayer-core-2.19.0.aar">
<sha256 value="da783e26eb7033ff33124185b50aee01f2b02234d12222b99e1e012e24c1f94d" origin="Generated by Gradle"/>
</artifact>
<artifact name="exoplayer-database-2.18.1.module">
<sha256 value="df15e2773d30378e08584aa0e94e97ff3086a107bf4b350a4f048ce8047dc95a" origin="Generated by Gradle"/>
<artifact name="exoplayer-core-2.19.0.module">
<sha256 value="8c7182e88880516b9e93a81033a5d8238be0381e41da0f462e48451c21e9526f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.android.exoplayer" name="exoplayer-datasource" version="2.18.1">
<artifact name="exoplayer-datasource-2.18.1.aar">
<sha256 value="4c228fce4a22ff992726821eed39914d4ad532bbbc4b4ad31c1486ad306ebdb2" origin="Generated by Gradle"/>
<component group="com.google.android.exoplayer" name="exoplayer-database" version="2.19.0">
<artifact name="exoplayer-database-2.19.0.aar">
<sha256 value="e3b0a1b33f1392682bb59cc3c88e6ae02538a172880a4466542ba2ed902e8229" origin="Generated by Gradle"/>
</artifact>
<artifact name="exoplayer-datasource-2.18.1.module">
<sha256 value="db76feba0bc299968d79bfcf75a9cbd010071b110b66b974581f0052f0b072a6" origin="Generated by Gradle"/>
<artifact name="exoplayer-database-2.19.0.module">
<sha256 value="4e55bcf14ac65f9c06beb443a71de208b7203c7eb8f3c4dd1c51487a31db1e56" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.android.exoplayer" name="exoplayer-decoder" version="2.18.1">
<artifact name="exoplayer-decoder-2.18.1.aar">
<sha256 value="23df2444b585e460fa2f23e44269d75f601e32d871f584e7d07b548b9e675e66" origin="Generated by Gradle"/>
<component group="com.google.android.exoplayer" name="exoplayer-datasource" version="2.19.0">
<artifact name="exoplayer-datasource-2.19.0.aar">
<sha256 value="ae62f419c7da8a37530f2c507ba303cc8166ba4b56b34326b08ed6ea546a120d" origin="Generated by Gradle"/>
</artifact>
<artifact name="exoplayer-decoder-2.18.1.module">
<sha256 value="a10ad404c6995ce650c1f9822bc57b59301bf6cd98be87e3f3a0a48a32320e84" origin="Generated by Gradle"/>
<artifact name="exoplayer-datasource-2.19.0.module">
<sha256 value="d0e12555b89a63e505a472620341d1b1900520b9d2bc25b3c8530a9db79ffb82" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.android.exoplayer" name="exoplayer-extractor" version="2.18.1">
<artifact name="exoplayer-extractor-2.18.1.aar">
<sha256 value="529a18b0a4130b87d96c50924ba8e3a725356574d1178b33d14479ada9ad006a" origin="Generated by Gradle"/>
<component group="com.google.android.exoplayer" name="exoplayer-decoder" version="2.19.0">
<artifact name="exoplayer-decoder-2.19.0.aar">
<sha256 value="1222e92cb18e041ed998f056f0226f5101dc22faa4768e63f9148f99484de3b6" origin="Generated by Gradle"/>
</artifact>
<artifact name="exoplayer-extractor-2.18.1.module">
<sha256 value="22194b98c343d81804624190996ffadbbf031bc1c911d2e6c8d2dd5af3ad235a" origin="Generated by Gradle"/>
<artifact name="exoplayer-decoder-2.19.0.module">
<sha256 value="d24ec7c397d53372866ff3e6886ec65788841863d676dea151094d5459918684" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.android.exoplayer" name="exoplayer-ui" version="2.18.1">
<artifact name="exoplayer-ui-2.18.1.aar">
<sha256 value="2e52f624ac4104aed7946066313ff1da3aba16535df8f931a9c7a218ae79ac57" origin="Generated by Gradle"/>
<component group="com.google.android.exoplayer" name="exoplayer-extractor" version="2.19.0">
<artifact name="exoplayer-extractor-2.19.0.aar">
<sha256 value="3e5536939c89220bfd844e332226fea9c1bd7d65ff2a51d7d613652744bb3f6c" origin="Generated by Gradle"/>
</artifact>
<artifact name="exoplayer-ui-2.18.1.module">
<sha256 value="dfc244dbb9ade2363f8352214567fe19cd4ae243bd32f0813d0f65f1aa9bb3cc" origin="Generated by Gradle"/>
<artifact name="exoplayer-extractor-2.19.0.module">
<sha256 value="73a7505d13669d60bdc962ec093c1b76c181b33ea27614a7468d32400793a521" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.android.exoplayer" name="extension-mediasession" version="2.18.1">
<artifact name="extension-mediasession-2.18.1.aar">
<sha256 value="cfc0431892300c872da5273699008d3aafb0fe9ee72cd4d57950ec65560638a8" origin="Generated by Gradle"/>
<component group="com.google.android.exoplayer" name="exoplayer-ui" version="2.19.0">
<artifact name="exoplayer-ui-2.19.0.aar">
<sha256 value="0e95e2ef646a934a95b94f4fa0e50eec1fa420294b166d4a76bf116658a55459" origin="Generated by Gradle"/>
</artifact>
<artifact name="extension-mediasession-2.18.1.module">
<sha256 value="313157e19cc69358139899fb582d110e361e54ab80bf681b60d7247b5b69a822" origin="Generated by Gradle"/>
<artifact name="exoplayer-ui-2.19.0.module">
<sha256 value="538e820c54b958d661e1d8a9534c20081fda6a9992c23e6a39ad56d686e4e618" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.android.exoplayer" name="extension-mediasession" version="2.19.0">
<artifact name="extension-mediasession-2.19.0.aar">
<sha256 value="705148834535331c90b39836240d1cc9501423f762275ad3b784c1e88e2e94f6" origin="Generated by Gradle"/>
</artifact>
<artifact name="extension-mediasession-2.19.0.module">
<sha256 value="7c3e8f972b1c842fa99b8ca356ebbc70a2afda03ff827a50a456754e4c93e213" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.android.flexbox" name="flexbox" version="3.0.0">