Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c5cbbda
relink package avpro
NickKhalow Jul 21, 2026
adc08cb
adopt new api
NickKhalow Jul 21, 2026
034f1b7
import bin files
NickKhalow Jul 22, 2026
ac09961
link to the external package
NickKhalow Jul 22, 2026
0f36d9b
Merge branch 'dev' into feat/migrate-avpro-to-uuav
NickKhalow Jul 22, 2026
ee429f0
Merge branch 'dev' into feat/migrate-avpro-to-uuav
NickKhalow Jul 22, 2026
98fb935
relink media player
NickKhalow Jul 22, 2026
3269319
enable av_pro_present by default
NickKhalow Jul 23, 2026
fa33ab7
fix defines
NickKhalow Jul 23, 2026
2e3fafa
log injection
NickKhalow Jul 23, 2026
519195d
update uuav
NickKhalow Jul 23, 2026
d4ecd02
update asmdef
NickKhalow Jul 23, 2026
7368e2f
update hash
NickKhalow Jul 23, 2026
4bb4891
remove external uuav
NickKhalow Jul 23, 2026
f3a6a90
embed uuav
NickKhalow Jul 23, 2026
4257bd0
exclude target dir from unity indexing
NickKhalow Jul 23, 2026
e66f657
update config
NickKhalow Jul 23, 2026
a129bd9
rename windows specific files
NickKhalow Jul 23, 2026
f5b7e04
ffmpeg libs
NickKhalow Jul 23, 2026
4c6d963
build script cross-platform
NickKhalow Jul 23, 2026
168663c
ffmpeg build script macos
NickKhalow Jul 23, 2026
f8e1551
update cargo
NickKhalow Jul 23, 2026
219e798
config resolve dylib
NickKhalow Jul 23, 2026
e854053
hide third_party from unity indexing
NickKhalow Jul 23, 2026
f12e2d6
remove meta files from native
NickKhalow Jul 23, 2026
3ded547
rust impl macos
NickKhalow Jul 24, 2026
6f25c45
update dylib
NickKhalow Jul 24, 2026
9e3fb7c
managed macos impl
NickKhalow Jul 24, 2026
fe8e514
Merge remote-tracking branch 'origin/dev' into feat/migrate-avpro-to-…
NickKhalow Jul 24, 2026
5f9ab6d
update windows dll
NickKhalow Jul 24, 2026
201400f
remove AVPRO define
NickKhalow Jul 24, 2026
74a9229
Merge remote-tracking branch 'origin/feat/migrate-avpro-to-uuav' into…
NickKhalow Jul 24, 2026
a7b2424
address stop method
NickKhalow Jul 24, 2026
d9bb151
Update Explorer/Assets/Plugins/UUAV/Packages/UUAV/package.json
NickKhalow Jul 24, 2026
442399b
Update Explorer/Assets/Plugins/UUAV/Packages/UUAV/AVProCompat/Enums.cs
NickKhalow Jul 24, 2026
dd098df
Merge remote-tracking branch 'origin/feat/migrate-avpro-to-uuav' into…
NickKhalow Jul 24, 2026
ed0bb2a
Packages/UUAV/Runtime/UUAVPlayer.cs address TODOs
NickKhalow Jul 24, 2026
5c903fc
add missing define fix
NickKhalow Jul 24, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 1 addition & 199 deletions Explorer/Assets/DCL/Audio/Prefabs/MediaPlayer.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 4404749396010612502}
- component: {fileID: 4239607685379854175}
- component: {fileID: 112468050678348472}
- component: {fileID: 3132976908783262753}
m_Layer: 0
m_Name: MediaPlayer
m_TagString: Untagged
Expand Down Expand Up @@ -43,190 +42,9 @@ MonoBehaviour:
m_GameObject: {fileID: 8514532302456129528}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 638c870cac4da414fba921606d504407, type: 3}
m_Script: {fileID: 11500000, guid: 9f507bde81ed0ebf1a2b3c4d5e6f7081, type: 3}
m_Name:
m_EditorClassIdentifier:
_mediaSource: 1
_mediaReference: {fileID: 0}
_mediaPath:
_pathType: 0
_path: https://radioislanegra.org/radio/8010/basic.aac
_fallbackMediaHints:
transparency: 0
alphaPacking: 0
stereoPacking: 0
_autoOpen: 0
_autoPlayOnStart: 1
_loop: 0
_audioVolume: 0.03
_audioBalance: 0
_audioMuted: 0
_playbackRate: 1
_useResampler: 0
_resampleMode: 0
_resampleBufferSize: 5
_videoMapping: 0
_textureFilterMode: 1
_textureWrapMode: 1
_textureAnisoLevel: 0
_sideloadSubtitles: 0
_subtitlePath:
_pathType: 2
_path:
_audioHeadTransform: {fileID: 0}
_audioFocusEnabled: 0
_audioFocusTransform: {fileID: 0}
_audioFocusWidthDegrees: 90
_audioFocusOffLevelDB: 0
_httpHeaders:
httpHeaders: []
_keyAuth:
keyServerToken:
overrideDecryptionKeyBase64:
overrideDecryptionKey:
_events:
m_PersistentCalls:
m_Calls: []
_eventMask: -1
_pauseMediaOnAppPause: 1
_playMediaOnAppUnpause: 1
_persistent: 0
_forceFileFormat: 0
_optionsWindows:
httpHeaders:
httpHeaders: []
keyAuth:
keyServerToken:
overrideDecryptionKeyBase64:
overrideDecryptionKey:
videoApi: 0
useHardwareDecoding: 1
useTextureMips: 0
use10BitTextures: 0
hintAlphaChannel: 0
useLowLatency: 0
useCustomMovParser: 0
useHapNotchLC: 0
useStereoDetection: 1
useTextTrackSupport: 1
useFacebookAudio360Support: 1
useAudioDelay: 0
bufferedFrameSelection: 0
pauseOnPrerollComplete: 0
forceAudioOutputDeviceName:
preferredFilters: []
audioOutput: 0
audio360ChannelMode: 0
startWithHighestBitrate: 0
useLowLiveLatency: 0
parallelFrameCount: 3
prerollFrameCount: 4
useUnityAudio: 0
enableAudio360: 0
_optionsMacOSX:
httpHeaders:
httpHeaders: []
keyAuth:
keyServerToken:
overrideDecryptionKeyBase64:
overrideDecryptionKey:
textureFormat: 0
_audioMode: 0
_flags: 0
maximumPlaybackRate: 2
_preferredPeakBitRate: 0
_preferredPeakBitRateUnits: 1
_preferredForwardBufferDuration: 0
_preferredMaximumResolution: 0
_customPreferredMaximumResolution: {x: 0, y: 0}
_optionsIOS:
httpHeaders:
httpHeaders: []
keyAuth:
keyServerToken:
overrideDecryptionKeyBase64:
overrideDecryptionKey:
textureFormat: 0
_audioMode: 0
_flags: 0
maximumPlaybackRate: 2
_preferredPeakBitRate: 0
_preferredPeakBitRateUnits: 1
_preferredForwardBufferDuration: 0
_preferredMaximumResolution: 0
_customPreferredMaximumResolution: {x: 0, y: 0}
_optionsTVOS:
httpHeaders:
httpHeaders: []
keyAuth:
keyServerToken:
overrideDecryptionKeyBase64:
overrideDecryptionKey:
textureFormat: 0
_audioMode: 0
_flags: 0
maximumPlaybackRate: 2
_preferredPeakBitRate: 0
_preferredPeakBitRateUnits: 1
_preferredForwardBufferDuration: 0
_preferredMaximumResolution: 0
_customPreferredMaximumResolution: {x: 0, y: 0}
_optionsAndroid:
httpHeaders:
httpHeaders: []
keyAuth:
keyServerToken:
overrideDecryptionKeyBase64:
overrideDecryptionKey:
_preferredMaximumResolution: 0
_customPreferredMaximumResolution: {x: 0, y: 0}
_preferredPeakBitRate: 0
_preferredPeakBitRateUnits: 1
videoApi: 2
useFastOesPath: 0
showPosterFrame: 0
audioOutput: 0
audio360ChannelMode: 0
audio360LatencyMS: 0
preferSoftwareDecoder: 0
forceRtpTCP: 0
forceEnableMediaCodecAsyncQueueing: 0
blitTextureFiltering: 0
fileOffset: 0
startWithHighestBitrate: 0
minBufferMs: 50000
maxBufferMs: 50000
bufferForPlaybackMs: 2500
bufferForPlaybackAfterRebufferMs: 5000
enableAudio360: 0
_optionsWindowsUWP:
httpHeaders:
httpHeaders: []
keyAuth:
keyServerToken:
overrideDecryptionKeyBase64:
overrideDecryptionKey:
useHardwareDecoding: 1
useTextureMips: 0
use10BitTextures: 0
hintOutput10Bit: 0
useLowLatency: 0
videoApi: 1
audioOutput: 0
audio360ChannelMode: 0
startWithHighestBitrate: 0
useLowLiveLatency: 0
_optionsWebGL:
httpHeaders:
httpHeaders: []
keyAuth:
keyServerToken:
overrideDecryptionKeyBase64:
overrideDecryptionKey:
externalLibrary: 0
useTextureMips: 0
m_VideoPath:
m_VideoLocation: 2
--- !u!82 &112468050678348472
AudioSource:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -324,19 +142,3 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &3132976908783262753
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8514532302456129528}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3b05a64a5de3f8546bf586f42e37b979, type: 3}
m_Name:
m_EditorClassIdentifier:
_mediaPlayer: {fileID: 4239607685379854175}
_audioOutputMode: 1
_channelMask: 65535
_supportPositionalAudio: 0
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"GUID:40cc3d3e494162646bdb002eed05aeec",
"GUID:d28a7e4beeca475418c15757abf1b6f1",
"GUID:84651a3751eca9349aac36a66bba901b",
"GUID:9e24947de15b9834991c9d8411ea37cf"
"GUID:9e24947de15b9834991c9d8411ea37cf",
"GUID:4a0b2c8f3c9e5f6a0b1c2d3e4f5a6b7c"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand All @@ -42,4 +43,4 @@
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}
}
12 changes: 4 additions & 8 deletions Explorer/Assets/DCL/PluginSystem/DCL.Plugins.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@
"GUID:63cde67b4a5d47449392dfc49fc0c3ed",
"GUID:267f743eefeddd44982a713909628102",
"GUID:0e1edbec885c4350bb2ef81c6a413df5",
"GUID:f254b2009e854709a0ef0022a7ca697c",
"GUID:3c1a9be47d0f42e2a5b8c6d4e9f01a27"
"GUID:3c1a9be47d0f42e2a5b8c6d4e9f01a27",
"GUID:4a0b2c8f3c9e5f6a0b1c2d3e4f5a6b7c",
"GUID:f254b2009e854709a0ef0022a7ca697c"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand All @@ -90,12 +91,7 @@
"name": "com.dcl.gpui-assets",
"expression": "",
"define": "GPUI_PRO_PRESENT"
},
{
"name": "com.renderheads.avpro.video-ultra",
"expression": "",
"define": "AV_PRO_PRESENT"
}
],
"noEngineReferences": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public MediaPlayer GetOrCreateReusableMediaPlayer(string url)
#endif
mediaPlayer.PlatformOptionsWindows.startWithHighestBitrate = true;
mediaPlayer.PlatformOptionsWindows.useLowLiveLatency = false;
mediaPlayer.AutoOpen = false;
mediaPlayer.enabled = true;

return mediaPlayer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ public AvProPlayer(MediaPlayer avProMediaPlayer, MediaPlayerCustomPool mediaPlay
{
this.AvProMediaPlayer = avProMediaPlayer;
this.MediaPlayerCustomPool = mediaPlayerCustomPool;

if (AvProMediaPlayer.TryGetComponent(out AudioSource audioSource))
AvProMediaPlayer.SetAudioSource(audioSource);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Arch.Core;
using Arch.SystemGroups;
using DCL.CharacterCamera;
using DCL.Diagnostics;
using DCL.FeatureFlags;
using DCL.Multiplayer.Connections.RoomHubs;
using DCL.Optimization.PerformanceBudgeting;
Expand Down Expand Up @@ -42,15 +43,17 @@ public MediaPlayerPluginWrapper(
this.flipMaterial = flipMaterial;
this.placeholderSource = placeholderSource;

#if AV_PRO_PRESENT && !UNITY_EDITOR_LINUX && !UNITY_STANDALONE_LINUX
#if !UNITY_EDITOR_LINUX && !UNITY_STANDALONE_LINUX
this.frameTimeBudget = frameTimeBudget;
#endif
}

public void InjectToWorld(ref ArchSystemsWorldBuilder<World> builder, in ECSWorldInstanceSharedDependencies sceneDeps, IRoomHub roomHub, List<IFinalizeWorldSystem> finalizeWorldSystems,
List<ISceneIsCurrentListener> sceneIsCurrentListeners)
{
#if AV_PRO_PRESENT && !UNITY_EDITOR_LINUX && !UNITY_STANDALONE_LINUX
#if !UNITY_EDITOR_LINUX && !UNITY_STANDALONE_LINUX
ReportHub.LogProductionInfo("[MediaPlayerPluginWrapper] Inject");

MediaFactory mediaFactory = this.mediaFactory.CreateForScene(builder.World, sceneDeps, roomHub, placeholderSource);

CreateMediaPlayerSystem.InjectToWorld(ref builder, sceneDeps.SceneStateProvider, mediaFactory);
Expand All @@ -62,6 +65,8 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder<World> builder, in ECSWorl
VideoEventsSystem.InjectToWorld(ref builder, sceneDeps.EcsToCRDTWriter, sceneDeps.SceneStateProvider, frameTimeBudget);

finalizeWorldSystems.Add(CleanUpMediaPlayerSystem.InjectToWorld(ref builder));
#else
ReportHub.LogProductionInfo("[MediaPlayerPluginWrapper] Ignore Inject");
#endif
}

Expand Down
4 changes: 2 additions & 2 deletions Explorer/Assets/DCL/Tests/Editor/DCL.EditMode.Tests.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
"GUID:27619889b8ba8c24980f49ee34dbb44a",
"GUID:0acc523941302664db1f4e527237feb3",
"GUID:4129704b5a1a13841ba16f230bf24a57",
"GUID:3ca842002c51d0a43b73e45298809a13",
"GUID:0df5180c0c3a0594fbfa11f83736de9f",
"GUID:28964ef7dc9441b6b8671b61a8106690",
"GUID:267f743eefeddd44982a713909628102",
"GUID:4a0b2c8f3c9e5f6a0b1c2d3e4f5a6b7c",
"GUID:f254b2009e854709a0ef0022a7ca697c"
],
"includePlatforms": [
Expand Down Expand Up @@ -92,4 +92,4 @@
],
"versionDefines": [],
"noEngineReferences": false
}
}
8 changes: 8 additions & 0 deletions Explorer/Assets/Plugins/UUAV.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Explorer/Assets/Plugins/UUAV/Packages.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Explorer/Assets/Plugins/UUAV/Packages/UUAV.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Explorer/Assets/Plugins/UUAV/Packages/UUAV/AVProCompat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading