chore(android): rework view type (#3940)
This commit is contained in:
@@ -44,11 +44,12 @@ import {
|
||||
resolveAssetSourceForVideo,
|
||||
} from './utils';
|
||||
import {VideoManager} from './specs/VideoNativeComponent';
|
||||
import type {
|
||||
OnLoadData,
|
||||
OnTextTracksData,
|
||||
OnReceiveAdEventData,
|
||||
ReactVideoProps,
|
||||
import {
|
||||
type OnLoadData,
|
||||
type OnTextTracksData,
|
||||
type OnReceiveAdEventData,
|
||||
type ReactVideoProps,
|
||||
ViewType,
|
||||
} from './types';
|
||||
|
||||
export type VideoSaveData = {
|
||||
@@ -84,6 +85,9 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
|
||||
selectedVideoTrack,
|
||||
selectedAudioTrack,
|
||||
selectedTextTrack,
|
||||
useTextureView,
|
||||
useSecureView,
|
||||
viewType,
|
||||
onLoadStart,
|
||||
onLoad,
|
||||
onError,
|
||||
@@ -571,6 +575,37 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
|
||||
],
|
||||
);
|
||||
|
||||
const _viewType = useMemo(() => {
|
||||
const hasValidDrmProp =
|
||||
drm !== undefined && Object.keys(drm).length !== 0;
|
||||
|
||||
const shallForceViewType =
|
||||
hasValidDrmProp && (viewType === ViewType.TEXTURE || useTextureView);
|
||||
|
||||
if (shallForceViewType) {
|
||||
console.warn(
|
||||
'cannot use DRM on texture view. please set useTextureView={false}',
|
||||
);
|
||||
}
|
||||
if (useSecureView && useTextureView) {
|
||||
console.warn(
|
||||
'cannot use SecureView on texture view. please set useTextureView={false}',
|
||||
);
|
||||
}
|
||||
|
||||
return shallForceViewType
|
||||
? useSecureView
|
||||
? ViewType.SURFACE_SECURE
|
||||
: ViewType.SURFACE // check if we should force the type to Surface due to DRM
|
||||
: viewType
|
||||
? viewType // else use ViewType from source
|
||||
: useSecureView // else infer view type from useSecureView and useTextureView
|
||||
? ViewType.SURFACE_SECURE
|
||||
: useTextureView
|
||||
? ViewType.TEXTURE
|
||||
: ViewType.SURFACE;
|
||||
}, [drm, useSecureView, useTextureView, viewType]);
|
||||
|
||||
return (
|
||||
<View style={style}>
|
||||
<NativeVideoComponent
|
||||
@@ -651,6 +686,7 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
|
||||
onControlsVisibilityChange={
|
||||
onControlsVisibilityChange ? _onControlsVisibilityChange : undefined
|
||||
}
|
||||
viewType={_viewType}
|
||||
/>
|
||||
{hasPoster && showPoster ? (
|
||||
<Image style={posterStyle} source={{uri: poster}} />
|
||||
|
Reference in New Issue
Block a user