Fixed 2x bug

This commit is contained in:
WeshBg 2026-03-14 00:44:18 -04:00
parent 7d60a0c43f
commit 742eba47bb
4 changed files with 86 additions and 99 deletions

View file

@ -887,7 +887,10 @@ const AndroidVideoPlayer: React.FC = () => {
onLongPressActivated={speedControl.activateSpeedBoost}
onLongPressEnd={speedControl.deactivateSpeedBoost}
onLongPressStateChange={(e) => {
if (e.nativeEvent.state !== 4 && e.nativeEvent.state !== 2) speedControl.deactivateSpeedBoost();
const state = e.nativeEvent.state;
if (state === 5 || state === 3 || state === 1) { // END, CANCELLED, FAILED
speedControl.deactivateSpeedBoost();
}
}}
toggleControls={toggleControls}
showControls={playerState.showControls}

View file

@ -59,23 +59,22 @@ export const useSpeedControl = (initialSpeed: number = 1.0) => {
useNativeDriver: true
}).start();
setTimeout(() => {
Animated.timing(speedActivatedOverlayOpacity, {
toValue: 0,
duration: 300,
useNativeDriver: true
}).start(() => setShowSpeedActivatedOverlay(false));
}, 2000);
}, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue]);
}, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue, speedActivatedOverlayOpacity]);
const deactivateSpeedBoost = useCallback(() => {
if (isSpeedBoosted) {
setPlaybackSpeed(originalSpeed);
setIsSpeedBoosted(false);
Animated.timing(speedActivatedOverlayOpacity, { toValue: 0, duration: 100, useNativeDriver: true }).start();
Animated.timing(speedActivatedOverlayOpacity, {
toValue: 0,
duration: 100,
useNativeDriver: true
}).start(() => {
setShowSpeedActivatedOverlay(false);
});
}
}, [isSpeedBoosted, originalSpeed]);
}, [isSpeedBoosted, originalSpeed, speedActivatedOverlayOpacity]);
return {
playbackSpeed,

View file

@ -191,13 +191,9 @@ export const GestureControls: React.FC<GestureControlsProps> = ({
height: '100%' as const,
};
// Full gesture area style
// Full gesture area style covering the entire video
const gestureAreaStyle = {
position: 'absolute' as const,
top: screenDimensions.height * 0.15,
left: 0,
width: screenDimensions.width,
height: screenDimensions.height * 0.7,
...StyleSheet.absoluteFillObject,
zIndex: 10,
};
@ -237,41 +233,39 @@ export const GestureControls: React.FC<GestureControlsProps> = ({
failOffsetY={[-20, 20]}
maxPointers={1}
>
<View style={gestureAreaStyle}>
{/* Left side gestures */}
<TapGestureHandler
ref={leftDoubleTapRef}
numberOfTaps={2}
onActivated={handleLeftDoubleTap}
>
<View style={leftSideStyle}>
<LongPressGestureHandler
onActivated={onLongPressActivated}
onEnded={onLongPressEnd}
onHandlerStateChange={onLongPressStateChange}
minDurationMs={500}
>
<View style={StyleSheet.absoluteFill}>
<PanGestureHandler
ref={leftVerticalPanRef}
onGestureEvent={gestureControls.onBrightnessGestureEvent}
activeOffsetY={[-10, 10]}
failOffsetX={[-20, 20]}
maxPointers={1}
>
<View style={StyleSheet.absoluteFill}>
<TapGestureHandler
waitFor={leftDoubleTapRef}
onActivated={toggleControls}
>
<View style={StyleSheet.absoluteFill} />
</TapGestureHandler>
</View>
</PanGestureHandler>
</View>
</LongPressGestureHandler>
</View>
</TapGestureHandler>
<LongPressGestureHandler
onActivated={onLongPressActivated}
onEnded={onLongPressEnd}
onHandlerStateChange={onLongPressStateChange}
minDurationMs={500}
maxDist={100000}
>
<View style={gestureAreaStyle}>
{/* Left side gestures */}
<TapGestureHandler
ref={leftDoubleTapRef}
numberOfTaps={2}
onActivated={handleLeftDoubleTap}
>
<View style={leftSideStyle}>
<PanGestureHandler
ref={leftVerticalPanRef}
onGestureEvent={gestureControls.onBrightnessGestureEvent}
activeOffsetY={[-10, 10]}
failOffsetX={[-20, 20]}
maxPointers={1}
>
<View style={StyleSheet.absoluteFill}>
<TapGestureHandler
waitFor={leftDoubleTapRef}
onActivated={toggleControls}
>
<View style={StyleSheet.absoluteFill} />
</TapGestureHandler>
</View>
</PanGestureHandler>
</View>
</TapGestureHandler>
{/* Center area tap handler */}
<TapGestureHandler
@ -298,41 +292,33 @@ export const GestureControls: React.FC<GestureControlsProps> = ({
}} />
</TapGestureHandler>
{/* Right side gestures */}
<TapGestureHandler
ref={rightDoubleTapRef}
numberOfTaps={2}
onActivated={handleRightDoubleTap}
>
<View style={rightSideStyle}>
<LongPressGestureHandler
onActivated={onLongPressActivated}
onEnded={onLongPressEnd}
onHandlerStateChange={onLongPressStateChange}
minDurationMs={500}
>
<View style={StyleSheet.absoluteFill}>
<PanGestureHandler
ref={rightVerticalPanRef}
onGestureEvent={gestureControls.onVolumeGestureEvent}
activeOffsetY={[-10, 10]}
failOffsetX={[-20, 20]}
maxPointers={1}
>
<View style={StyleSheet.absoluteFill}>
<TapGestureHandler
waitFor={rightDoubleTapRef}
onActivated={toggleControls}
>
<View style={StyleSheet.absoluteFill} />
</TapGestureHandler>
</View>
</PanGestureHandler>
</View>
</LongPressGestureHandler>
</View>
</TapGestureHandler>
</View>
{/* Right side gestures */}
<TapGestureHandler
ref={rightDoubleTapRef}
numberOfTaps={2}
onActivated={handleRightDoubleTap}
>
<View style={rightSideStyle}>
<PanGestureHandler
ref={rightVerticalPanRef}
onGestureEvent={gestureControls.onVolumeGestureEvent}
activeOffsetY={[-10, 10]}
failOffsetX={[-20, 20]}
maxPointers={1}
>
<View style={StyleSheet.absoluteFill}>
<TapGestureHandler
waitFor={rightDoubleTapRef}
onActivated={toggleControls}
>
<View style={StyleSheet.absoluteFill} />
</TapGestureHandler>
</View>
</PanGestureHandler>
</View>
</TapGestureHandler>
</View>
</LongPressGestureHandler>
</PanGestureHandler>
{/* Volume/Brightness Pill Overlay */}

View file

@ -63,23 +63,22 @@ export const useSpeedControl = (initialSpeed: number = 1.0) => {
useNativeDriver: true
}).start();
setTimeout(() => {
Animated.timing(speedActivatedOverlayOpacity, {
toValue: 0,
duration: 300,
useNativeDriver: true
}).start(() => setShowSpeedActivatedOverlay(false));
}, 2000);
}, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue]);
}, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue, speedActivatedOverlayOpacity]);
const deactivateSpeedBoost = useCallback(() => {
if (isSpeedBoosted) {
setPlaybackSpeed(originalSpeed);
setIsSpeedBoosted(false);
Animated.timing(speedActivatedOverlayOpacity, { toValue: 0, duration: 100, useNativeDriver: true }).start();
Animated.timing(speedActivatedOverlayOpacity, {
toValue: 0,
duration: 100,
useNativeDriver: true
}).start(() => {
setShowSpeedActivatedOverlay(false);
});
}
}, [isSpeedBoosted, originalSpeed]);
}, [isSpeedBoosted, originalSpeed, speedActivatedOverlayOpacity]);
return {
playbackSpeed,