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

Allow seeking in video timeline.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-03-15 15:08:45 -04:00
committed by Cody Henthorne
parent b38865bdc7
commit c0cb2b5e12
5 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import org.thoughtcrime.securesms.video.VideoPlayer.PlayerCallback
import org.thoughtcrime.securesms.video.videoconverter.VideoThumbnailsRangeSelectorView
import org.thoughtcrime.securesms.video.videoconverter.VideoThumbnailsRangeSelectorView.PositionDragListener
import java.io.IOException
import kotlin.time.Duration.Companion.microseconds
class VideoEditorFragment : Fragment(), PositionDragListener, MediaSendPageFragment {
private val sharedViewModel: MediaSelectionViewModel by viewModels(ownerProducer = { requireActivity() })
@@ -176,7 +177,7 @@ class VideoEditorFragment : Fragment(), PositionDragListener, MediaSendPageFragm
if (slide.hasVideo()) {
canEdit = true
try {
videoTimeLine.registerPlayerOnRangeChangeListener(this)
videoTimeLine.registerPlayerDragListener(this)
hud.visibility = View.VISIBLE
startPositionUpdates()
@@ -293,7 +294,8 @@ class VideoEditorFragment : Fragment(), PositionDragListener, MediaSendPageFragm
videoScanThrottle.publish {
player.pause()
player.playbackPosition = position
val milliseconds = position.microseconds.inWholeMilliseconds
player.playbackPosition = milliseconds
}
}

6
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
View File

@@ -543,8 +543,10 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
return
}
val uri = mediaItem.uri
videoTimeLine.unregisterPlayerOnRangeChangeListener()
videoTimeLine.setInput(uri)
val updatedInputInTimeline = videoTimeLine.setInput(uri)
if (updatedInputInTimeline) {
videoTimeLine.unregisterDragListener()
}
val size: Long = tryGetUriSize(requireContext(), uri, Long.MAX_VALUE)
val maxSend = sharedViewModel.getMediaConstraints().getVideoMaxSize(requireContext())
if (size > maxSend) {