8268718: [macos] Video stops, but audio continues to play when stopTime is reached

arapte · arapte · commit 5185c671f4ad · 2021-08-19T17:49:59.000Z
Backport-of: 0c98d9608611aa2378b38604e2528935c94e84ae
diff --git a/modules/javafx.media/src/main/native/jfxmedia/platform/osx/avf/AVFMediaPlayer.mm b/modules/javafx.media/src/main/native/jfxmedia/platform/osx/avf/AVFMediaPlayer.mm
@@ -333,6 +333,9 @@ - (double) currentTime
 - (void) setCurrentTime:(double)time
 {
     [self.player seekToTime:CMTimeMakeWithSeconds(time, 1)];
+    if (previousPlayerState == kPlayerState_FINISHED) {
+        [self play];
+    }
 }
 
 - (BOOL) mute {
@@ -402,6 +405,8 @@ - (void) stop {
 }
 
 - (void) finish {
+    [self.player pause];
+    [self setPlayerState:kPlayerState_FINISHED];
 }
 
 - (void) dispose {

Original file line number	Diff line number	Diff line change
`@@ -333,6 +333,9 @@ - (double) currentTime`
`333`	`333`	`- (void) setCurrentTime:(double)time`
`334`	`334`	`{`
`335`	`335`	`[self.player seekToTime:CMTimeMakeWithSeconds(time, 1)];`
	`336`	`+ if (previousPlayerState == kPlayerState_FINISHED) {`
	`337`	`+ [self play];`
	`338`	`+ }`
`336`	`339`	`}`
`337`	`340`
`338`	`341`	`- (BOOL) mute {`
`@@ -402,6 +405,8 @@ - (void) stop {`
`402`	`405`	`}`
`403`	`406`
`404`	`407`	`- (void) finish {`
	`408`	`+ [self.player pause];`
	`409`	`+ [self setPlayerState:kPlayerState_FINISHED];`
`405`	`410`	`}`
`406`	`411`
`407`	`412`	`- (void) dispose {`