Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not autoplay in video editor.

Browse Source
This commit is contained in:
Alex Hart
2021-10-15 11:14:32 -03:00
committed by Greyson Parrelli
parent 731683ae09
commit 62f9f19540
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.java
View File

@@ -45,6 +45,8 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
private VideoPlayer player;
@Nullable private VideoEditorHud hud;
private Runnable updatePosition;
private boolean isInEdit;
private boolean wasPlayingBeforeEdit;
public static VideoEditorFragment newInstance(@NonNull Uri uri, long maxCompressedVideoSize, long maxAttachmentSize, boolean isVideoGif) {
Bundle args = new Bundle();
@@ -88,9 +90,10 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
long maxOutput = requireArguments().getLong(KEY_MAX_OUTPUT);
long maxSend = requireArguments().getLong(KEY_MAX_SEND);
VideoSlide slide = new VideoSlide(requireContext(), uri, 0, isVideoGif);
boolean autoplay = isVideoGif;
player.setWindow(requireActivity().getWindow());
player.setVideoSource(slide, true);
player.setVideoSource(slide, autoplay);
if (slide.isVideoGif()) {
player.setPlayerCallback(new VideoPlayer.PlayerCallback() {
@@ -116,7 +119,7 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
hud.setEventListener(this);
updateHud(data);
if (data.durationEdited) {
player.clip(data.startTimeUs, data.endTimeUs, true);
player.clip(data.startTimeUs, data.endTimeUs, autoplay);
}
try {
hud.setVideoSource(slide, new VideoBitRateCalculator(maxOutput), maxSend);
@@ -134,8 +137,12 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
player.setPlayerCallback(new VideoPlayer.PlayerCallback() {
@Override
public void onPlaying() {
public void onReady() {
controller.onPlayerReady();
}
@Override
public void onPlaying() {
hud.fadePlayButton();
}
@@ -279,7 +286,11 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
data.endTimeUs = endTimeUs;
if (editingComplete) {
isInEdit = false;
videoScanThrottle.clear();
} else if (!isInEdit) {
isInEdit = true;
wasPlayingBeforeEdit = player.isPlaying();
}
videoScanThrottle.publish(() -> {
@@ -290,9 +301,13 @@ public class VideoEditorFragment extends Fragment implements VideoEditorHud.Even
player.setPlaybackPosition(fromEdited || editingComplete ? clampedStartTime / 1000 : endTimeUs / 1000);
if (editingComplete) {
if (durationEdited) {
player.clip(clampedStartTime, endTimeUs, true);
player.clip(clampedStartTime, endTimeUs, wasPlayingBeforeEdit);
} else {
player.removeClip(true);
player.removeClip(wasPlayingBeforeEdit);
}
if (!wasPlayingBeforeEdit) {
hud.showPlayButton();
}
}
});