Commit 19ccaaa1 authored by Richard Gonlag's avatar Richard Gonlag

Merge remote-tracking branch 'videolan/master'

parents 3903a234 9bd25503
Pipeline #63480 passed with stages
in 25 minutes and 52 seconds
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: screen
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
fileFormatVersion: 2
guid: dda856af5216c6d45874c074cf358a10
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
......@@ -984,7 +984,7 @@ MeshRenderer:
m_RenderingLayerMask: 4294967295
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: dda856af5216c6d45874c074cf358a10, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
......
......@@ -355,7 +355,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: dda856af5216c6d45874c074cf358a10, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
......
using UnityEngine;
using System;
using System.Threading.Tasks;
using LibVLCSharp;
public class ThreeSixty : MonoBehaviour
......@@ -36,7 +37,7 @@ void OnDisable()
_libVLC = null;
}
public async void PlayPause()
public void PlayPause()
{
Debug.Log ("[VLC] Toggling Play Pause !");
if (_mediaPlayer == null)
......@@ -57,7 +58,21 @@ public async void PlayPause()
// to your computer (to avoid network requests for smoother navigation)
// and adjust the Uri to the local path
var media = new Media(_libVLC, new Uri("https://streams.videolan.org/streams/360/eagle_360.mp4"));
await media.Parse();
Task.Run(async () =>
{
var result = await media.Parse(MediaParseOptions.ParseNetwork);
var trackList = media.TrackList(TrackType.Video);
var is360 = trackList[0].Data.Video.Projection == VideoProjection.Equirectangular;
if(is360)
Debug.Log("The video is a 360 video");
else
Debug.Log("The video was not identified as a 360 video by VLC, make sure it is properly tagged");
trackList.Dispose();
});
_mediaPlayer.Media = media;
}
......@@ -106,13 +121,6 @@ void OnGUI()
void Do360Navigation()
{
var is360 = _mediaPlayer.Media?.Tracks[0].Data.Video.Projection == VideoProjection.Equirectangular;
if(!is360)
{
Debug.Log("The video was not identified as 360 video by VLC, make sure it is properly tagged");
return;
}
var range = Math.Max(UnityEngine.Screen.width, UnityEngine.Screen.height);
Yaw = _mediaPlayer.Viewpoint.Yaw;
......
......@@ -4,6 +4,12 @@ This document will focus on the release notes of vlc-unity itself, unless specif
For LibVLC changes, head over to https://code.videolan.org/videolan/vlc/-/blob/master/NEWS and the git history.
For LibVLCSharp changes, see https://code.videolan.org/videolan/LibVLCSharp/-/blob/master/NEWS.
0.1.1:
- libvlc: windows update, January 26th 2021 build.
- update scene to latest media track APIs.
- use unlit screens for demo scenes https://code.videolan.org/videolan/vlc-unity/-/issues/3 by Richard Gonlag
- fix color space issue by Richard Gonlag https://code.videolan.org/videolan/vlc-unity/-/issues/92
0.1.0:
- libvlc: windows update, January 5th 2021 build.
- libvlcsharp update https://code.videolan.org/videolan/LibVLCSharp/-/commit/c0eda0386fdc1dc2472ab516df1b5171e39912b0
......
......@@ -120,7 +120,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.1.0
bundleVersion: 0.1.1
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
......
m_EditorVersion: 2019.3.13f1
m_EditorVersionWithRevision: 2019.3.13f1 (d4ddf0d95db9)
m_EditorVersion: 2019.4.18f1
m_EditorVersionWithRevision: 2019.4.18f1 (3310a4d4f880)
......@@ -4,7 +4,7 @@
UnityConnectSettings:
m_ObjectHideFlags: 0
serializedVersion: 1
m_Enabled: 1
m_Enabled: 0
m_TestMode: 0
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
......
# VLC for Unity documentation
- [User documentation](#user-documentation)
- [Make a release](#make-a-release)
- [Platform support](#platform-spport)
## User documentation
Given that VLC for Unity is based on LibVLCSharp, it shares 99% of the same APIs which means the LibVLCSharp documentation applies. You can find it [here](https://code.videolan.org/videolan/LibVLCSharp/-/blob/3.x/docs/home.md).
A basic explanation of the demo scenes provided in the asset is detailed in the [documentation text file](..\Assets\VLCUnity\documentation.txt).
## Make a release
This is a list of things to check until the release is more automated. Though the "uploading to the store" step cannot be scripted currently.
- plugins.dat generation,
- avoid js files,
- trial ftp upload,
- check that editor and standalone demo scenes work,
- check final package size size (~50MB),
## Platform support
Currently only Windows classic (win64) is supported (not UWP).
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment