Skip to content

GitLab

Commit 84528862 authored by Martin Finkel's avatar Martin Finkel
Browse files
Options

initial crossplatform libvlc + libvlcsharp setup + add android binding project... 

initial crossplatform libvlc + libvlcsharp setup + add android binding project + android videoView + update sample
parent 13279805
Hide whitespace changes
Inline Side-by-side
Showing with 847 additions and 1638 deletions
Directory.Build.props 0 → 100644
View file @ 84528862
<Project>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>$(DefineConstants);PORTABLE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
<DefineConstants>$(DefineConstants);NET_461;XAML;WINDOWS_CLASSIC;WINDOWS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS_UWP;WINDOWS</DefineConstants>
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'Xamarin.iOS10'">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'Xamarin.Mac20'">
<DefineConstants>$(DefineConstants);MONO;COCOA</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'Xamarin.TVOS10'">
<DefineConstants>$(DefineConstants);MONO;COCOA</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'Xamarin.WatchOS10'">
<DefineConstants>$(DefineConstants);MONO;COCOA</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid80'">
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
</PropertyGroup>
</Project>
\ No newline at end of file
LibVLCSharp.Android.AWindow/LibVLCSharp.Android.AWindow.csproj
View file @ 84528862
......@@ -13,7 +13,7 @@
<AssemblyName>LibVLCSharp.Android.AWindow</AssemblyName>
<FileAlignment>512</FileAlignment>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
......@@ -41,7 +41,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Jars\AboutJars.txt" />
<None Include="Additions\AboutAdditions.txt" />
<LibraryProjectZip Include="Jars\org.videolan.libvlc.aar" />
</ItemGroup>
......
LibVLCSharp.Android.AWindow/LibVLCSharp.Android.AWindow.sln 0 → 100644
View file @ 84528862

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2037
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Android.AWindow", "LibVLCSharp.Android.AWindow.csproj", "{239A82A5-19A1-4382-8F9B-4A9705648017}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{239A82A5-19A1-4382-8F9B-4A9705648017}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{239A82A5-19A1-4382-8F9B-4A9705648017}.Debug|Any CPU.Build.0 = Debug|Any CPU
{239A82A5-19A1-4382-8F9B-4A9705648017}.Release|Any CPU.ActiveCfg = Release|Any CPU
{239A82A5-19A1-4382-8F9B-4A9705648017}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FA1439C9-5F61-4BDE-8598-886A77E53032}
EndGlobalSection
EndGlobal
LibVLCSharp.Android.Sample/AWindow.cs deleted 100644 → 0
View file @ 13279805
//using System;
//using System.Collections.Generic;
//using System.Threading;
//using Android.Graphics;
//using Android.OS;
//using Android.Views;
//using Java.Interop;
//using Java.Lang;
//using Thread = Java.Lang.Thread;
//namespace LibVLCSharp.Android.Sample
//{
// public class AWindow : Java.Lang.Object, IVLCVout
// {
// const string Tag = "AWindow";
// const int ID_VIDEO = 0;
// const int ID_SUBTITLES = 1;
// const int ID_MAX = 2;
// class SurfaceHelper
// {
// readonly AWindow _aWindow;
// readonly int _id;
// readonly SurfaceView _surfaceView;
// readonly TextureView _textureView;
// static ISurfaceHolder _surfaceHolder;
// static Surface _surface;
// readonly SurfaceHolderCallback _surfaceHolderCallback;
// readonly TextureView.ISurfaceTextureListener _surfaceTextureListener;
// SurfaceHelper(int id, AWindow aWindow)
// {
// _id = id;
// _aWindow = aWindow;
// _surfaceHolderCallback = new SurfaceHolderCallback(this);
// _surfaceTextureListener = Build.VERSION.SdkInt >= BuildVersionCodes.IceCreamSandwich ? CreateSurfaceTextureListener() : null;
// }
// internal SurfaceHelper(int id, SurfaceView surfaceView, AWindow awindow) : this(id, awindow)
// {
// _surfaceView = surfaceView;
// _surfaceHolder = _surfaceView.Holder;
// }
// internal SurfaceHelper(int id, TextureView textureView, AWindow awindow) : this(id, awindow)
// {
// _textureView = textureView;
// }
// internal SurfaceHelper(int id, Surface surface, ISurfaceHolder surfaceHolder, AWindow awindow) : this(id, awindow)
// {
// _surface = surface;
// _surfaceHolder = surfaceHolder;
// }
// void SetSurface(Surface surface)
// {
// if (surface.IsValid && _aWindow.GetNativeSurface(_id) == null)
// {
// _surface = surface;
// _aWindow.SetNativeSurface(_id, _surface);
// _aWindow.OnSurfaceCreated();
// }
// }
// void AttachSurfaceView()
// {
// _surfaceHolder.AddCallback(_surfaceHolderCallback);
// SetSurface(_surfaceHolder.Surface);
// }
// void AttachTextureView()
// {
// _textureView.SurfaceTextureListener = _surfaceTextureListener;
// SetSurface(new Surface(_textureView.SurfaceTexture));
// }
// void AttachSurface()
// {
// _surfaceHolder?.AddCallback(_surfaceHolderCallback);
// SetSurface(_surface);
// }
// public void Attach()
// {
// if(_surfaceView != null)
// AttachSurfaceView();
// else if(_textureView != null)
// AttachTextureView();
// else if (_surface != null)
// AttachSurface();
// else throw new IllegalStateException();
// }
// void ReleaseTextureView()
// {
// if (_textureView != null)
// _textureView.SurfaceTextureListener = null;
// }
// public void Release()
// {
// _surface = null;
// _aWindow.SetNativeSurface(_id, null);
// _surfaceHolder?.RemoveCallback(_surfaceHolderCallback);
// ReleaseTextureView();
// }
// void OnSurfaceDestroyed() => _aWindow.OnSurfaceDestroyed();
// public bool Ready => _surfaceView == null || _surface != null;
// public Surface Surface => _surface;
// class SurfaceHolderCallback : Java.Lang.Object, ISurfaceHolderCallback
// {
// readonly SurfaceHelper _surfaceHelper;
// internal SurfaceHolderCallback(SurfaceHelper surfaceHelper)
// {
// _surfaceHelper = surfaceHelper;
// }
// public void SurfaceChanged(ISurfaceHolder holder, Format format, int width, int height)
// {
// }
// public void SurfaceCreated(ISurfaceHolder holder)
// {
// if (holder != _surfaceHolder)
// throw new IllegalStateException("holders are different");
// _surfaceHelper.SetSurface(holder.Surface);
// }
// public void SurfaceDestroyed(ISurfaceHolder holder)
// {
// _surfaceHelper.OnSurfaceDestroyed();
// }
// }
// TextureView.ISurfaceTextureListener CreateSurfaceTextureListener()
// {
// return new SurfaceTextureListener(this);
// }
// class SurfaceTextureListener : Java.Lang.Object, TextureView.ISurfaceTextureListener
// {
// readonly SurfaceHelper _surfaceHelper;
// internal SurfaceTextureListener(SurfaceHelper surfaceHelper)
// {
// _surfaceHelper = surfaceHelper;
// }
// public void OnSurfaceTextureAvailable(SurfaceTexture surface, int width, int height)
// {
// _surfaceHelper.SetSurface(new Surface(surface));
// }
// public bool OnSurfaceTextureDestroyed(SurfaceTexture surface)
// {
// _surfaceHelper.OnSurfaceDestroyed();
// return true;
// }
// public void OnSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height)
// {
// }
// public void OnSurfaceTextureUpdated(SurfaceTexture surface)
// {
// }
// }
// }
// static readonly object _locker = new object();
// static readonly int SURFACE_STATE_INIT = 0;
// static readonly int SURFACE_STATE_ATTACHED = 1;
// static readonly int SURFACE_STATE_READY = 2;
// readonly SurfaceHelper[] _surfaceHelpers;
// readonly ISurfaceCallback _surfaceCallback;
// int _surfaceState = SURFACE_STATE_INIT;
// INewVideoLayoutListener _newVideoLayoutListener;
// readonly List<ICallback> _voutCallbacks = new List<ICallback>();
// readonly Handler _handler = new Handler(Looper.MainLooper);
// static Surface[] _surfaces;
// long _callbackNativeHandle;
// int _mouseAction, _mouseButton, _mouseX, _mouseY, _windowWidth, _windowHeight = -1;
// readonly SurfaceTextureThread mSurfaceTextureThread = new SurfaceTextureThread();
// static readonly NativeLock _nativeLock = new NativeLock();
// const int AWINDOW_REGISTER_ERROR = 0;
// const int AWINDOW_REGISTER_FLAGS_SUCCESS = 0x1;
// const int AWINDOW__FLAGS_HAS_VIDEO_LAYOUT_LISTENER = 0x2;
// public AWindow(ISurfaceCallback surfaceCallback)
// {
// _surfaceCallback = surfaceCallback;
// _surfaceHelpers = new SurfaceHelper[ID_MAX];
// _surfaces = new Surface[ID_MAX];
// }
// void EnsureInitState()
// {
// if (_surfaceState != SURFACE_STATE_INIT)
// throw new IllegalStateException($"Can't set view when already attached. Current state: {_surfaceState}," +
// $"_surface[ID_VIDEO]: {_surfaceHelpers[ID_VIDEO]} / {_surfaces[ID_VIDEO]}, " +
// $"_surfaces[ID_SUBTITLES]: {_surfaceHelpers[ID_SUBTITLES]} / {_surfaces[ID_SUBTITLES]}");
// }
// void SetView(int id, SurfaceView view)
// {
// EnsureInitState();
// if(view == null)
// throw new NullReferenceException("view is null");
// var surfaceHelper = _surfaceHelpers[id];
// surfaceHelper?.Release();
// _surfaceHelpers[id] = new SurfaceHelper(id, view, this);
// }
// void SetView(int id, TextureView view)
// {
// if(Build.VERSION.SdkInt < BuildVersionCodes.IceCreamSandwich)
// throw new IllegalArgumentException("TextureView not implemented in this android version");
// EnsureInitState();
// if(view == null)
// throw new NullReferenceException("view is null");
// var surfaceHelper = _surfaceHelpers[id];
// surfaceHelper?.Release();
// _surfaceHelpers[id] = new SurfaceHelper(id, view, this);
// }
// void SetSurface(int id, Surface surface, ISurfaceHolder surfaceHolder)
// {
// EnsureInitState();
// if (!surface.IsValid && surfaceHolder == null)
// throw new IllegalStateException("surface is not attached and holder is null");
// var surfaceHelper = _surfaceHelpers[id];
// surfaceHelper?.Release();
// _surfaceHelpers[id] = new SurfaceHelper(id, surface, surfaceHolder, this);
// }
// public void SetVideoView(SurfaceView videoSurfaceView)
// {
// SetView(ID_VIDEO, videoSurfaceView);
// }
// public void SetVideoView(TextureView videoTextureView)
// {
// SetView(ID_VIDEO, videoTextureView);
// }
// public void SetVideoSurface(Surface videoSurface, ISurfaceHolder surfaceHolder)
// {
// SetSurface(ID_VIDEO, videoSurface, surfaceHolder);
// }
// public void SetVideoSurface(SurfaceTexture videoSurfaceTexture)
// {
// SetSurface(ID_VIDEO, new Surface(videoSurfaceTexture), null);
// }
// public void SetSubtitlesView(SurfaceView subtitlesSurfaceView)
// {
// SetView(ID_SUBTITLES, subtitlesSurfaceView);
// }
// public void SetSubtitlesView(TextureView subtitlesTextureView)
// {
// SetView(ID_SUBTITLES, subtitlesTextureView);
// }
// public void SetSubtitlesSurface(Surface subtitlesSurface, ISurfaceHolder surfaceHolder)
// {
// SetSurface(ID_SUBTITLES, subtitlesSurface, surfaceHolder);
// }
// public void SetSubtitlesSurface(SurfaceTexture subtitlesSurfaceTexture)
// {
// SetSurface(ID_SUBTITLES, new Surface(subtitlesSurfaceTexture), null);
// }
// public void AttachViews(INewVideoLayoutListener onNewVideoLayoutListener)
// {
// if (_surfaceState != SURFACE_STATE_INIT || _surfaceHelpers[ID_VIDEO] == null)
// throw new IllegalStateException("Already attached or video view not configured");
// Interlocked.Exchange(ref _surfaceState, SURFACE_STATE_ATTACHED);
// lock (_nativeLock)
// {
// _newVideoLayoutListener = onNewVideoLayoutListener;
// _nativeLock.BuffersGeometryAbort = false;
// _nativeLock.BuffersGeometryConfigured = false;
// }
// for (var id = 0; id < ID_MAX; ++id)
// {
// _surfaceHelpers[id]?.Attach();
// }
// }
// public void AttachViews()
// {
// AttachViews(null);
// }
// public void DetachViews()
// {
// if (_surfaceState == SURFACE_STATE_INIT)
// return;
// Interlocked.Exchange(ref _surfaceState, SURFACE_STATE_INIT);
// _handler.RemoveCallbacksAndMessages(null);
// lock (_locker)
// {
// _newVideoLayoutListener = null;
// _nativeLock.BuffersGeometryAbort = true;
// //_nativeLock.NotifyAll()
// }
// for (var id = 0; id < ID_MAX; ++id)
// {
// _surfaceHelpers[id]?.Release();
// _surfaceHelpers[id] = null;
// }
// foreach(var cb in _voutCallbacks)
// cb.OnSurfacesDestroyed(this);
// _surfaceCallback?.OnSurfacesDestroyed(this);
// if(Build.VERSION.SdkInt >= BuildVersionCodes.JellyBean)
// mSurfaceTextureThread.Release();
// }
// public bool AreViewsAttached => _surfaceState != SURFACE_STATE_INIT;
// void OnSurfaceCreated()
// {
// if (_surfaceState != SURFACE_STATE_ATTACHED)
// throw new IllegalArgumentException("Invalid state");
// var videoHelper = _surfaceHelpers[ID_VIDEO];
// var subtitlesHelper = _surfaceHelpers[ID_SUBTITLES];
// if (videoHelper == null)
// throw new NullReferenceException(nameof(videoHelper));
// if (videoHelper.Ready && (subtitlesHelper == null || subtitlesHelper.Ready))
// {
// Interlocked.Exchange(ref _surfaceState, SURFACE_STATE_READY);
// foreach(var cb in _voutCallbacks)
// cb.OnSurfaceCreated(this);
// _surfaceCallback?.OnSurfacesCreated(this);
// }
// }
// void OnSurfaceDestroyed() => DetachViews();
// bool AreSurfacesWaiting => _surfaceState == SURFACE_STATE_ATTACHED;
// public void SendMouseEvent(int action, int button, int x, int y)
// {
// lock (_nativeLock)
// {
// //if(_callbackNativeHandle != 0)
// }
// }
// public void AddCallback(ICallback callback)
// {
// if (_voutCallbacks.Contains(callback)) return;
// _voutCallbacks.Add(callback);
// }
// public void RemoveCallback(ICallback callback)
// {
// _voutCallbacks.Remove(callback);
// }
// //(long nativeHandle, int action, int button, int x, int y) signature: "(JIIII)V", connector:
// //[Register(name: "nativeOnMouseEvent")]
// //[Export]
// internal virtual void NativeOnMouseEvent(long nativeHandle, int action, int button, int x, int y)
// {
// System.Diagnostics.Debug.WriteLine("NativeOnMouseEvent");
// }
// //[Export]
// internal virtual void NativeOnWindowSize(long nativeHandle, int width, int height)
// {
// System.Diagnostics.Debug.WriteLine("NativeOnWindowSize");
// }
// // used by JNI
// // Get the valid Video surface
// // return can be null if the surface was destroyed.
// // ReSharper disable once UnusedMember.Local
// // ReSharper disable once InconsistentNaming
// //[Register("getVideoSurface", )]
// [Export("getVideoSurface")]
// Surface VideoSurface() => GetNativeSurface(ID_VIDEO);
// // Get the valid Subtitles surface.
// // return can be null if the surface was destroyed.
// // ReSharper disable once UnusedMember.Local
// // ReSharper disable once InconsistentNaming
// [Export("getSubtitlesSurface")]
// Surface SubtitlesSurface() => GetNativeSurface(ID_SUBTITLES);
// public void SetWindowSize(int width, int height)
// {
// lock (_nativeLock)
// {
// if (_callbackNativeHandle != 0 && (_windowHeight != height || _windowWidth != width))
// {
// NativeOnWindowSize(_callbackNativeHandle, width, height);
// }
// _windowHeight = height;
// _windowWidth = width;
// }
// }
// [Export("registerNative")]
// int RegisterNative(long handle)
// {
// //if(handle == IntPtr.Zero)
// if(handle == 0)
// throw new IllegalArgumentException("handle is null");
// lock (_nativeLock)
// {
// if (_callbackNativeHandle != 0)
// return AWINDOW_REGISTER_ERROR;
// _callbackNativeHandle = handle;
// if (_mouseAction != -1)
// {
// NativeOnMouseEvent(_callbackNativeHandle, _mouseAction, _mouseButton, _mouseX, _mouseY);
// }
// if (_windowWidth != -1 && _windowHeight != -1)
// {
// NativeOnWindowSize(_callbackNativeHandle, _windowWidth, _windowHeight);
// }
// var flags = AWINDOW_REGISTER_FLAGS_SUCCESS;
// if (_newVideoLayoutListener != null)
// flags |= AWINDOW__FLAGS_HAS_VIDEO_LAYOUT_LISTENER;
// return flags;
// }
// }
// [Export("unregisterNative")]
// void UnregisterNative()
// {
// lock (_nativeLock)
// {
// if(_callbackNativeHandle == 0)
// throw new IllegalArgumentException("unregister called when not registered");
// _callbackNativeHandle = 0;
// }
// }
// [Export("setBuffersGeometry")]
// bool SetBuffersGeometry(Surface surface, int width, int height, int format)
// {
// // TODO: add implementation if build <= ICS. Not used on newer versions.
// return false;
// }
// Surface GetNativeSurface(int id)
// {
// lock (_nativeLock)
// {
// return _surfaces[id];
// }
// }
// void SetNativeSurface(int id, Surface surface)
// {
// lock (_nativeLock)
// {
// _surfaces[id] = surface;
// }
// }
// [Export("setVideoLayout")]
// void SetVideoLayout(int width, int height, int visibleWidth, int visibleHeight, int sarNum, int sarDen)
// {
// _handler.Post(() =>
// {
// _newVideoLayoutListener?.OnNewVideoLayout(this, width, height, visibleWidth, visibleHeight, sarNum,
// sarDen);
// });
// }
// class SurfaceTextureThread : Java.Lang.Object, IRunnable, SurfaceTexture.IOnFrameAvailableListener
// {
// SurfaceTexture _surfaceTexture;
// Surface _surface;
// bool _frameAvailable;
// Looper _looper;
// Thread _thread;
// bool _isAttached;
// bool _doRelease;
// internal bool AttachToGLContext(int texName)
// {
// if (_surfaceTexture == null)
// {
// _thread = new Thread(this);
// _thread.Start();
// while (_surfaceTexture == null)
// {
// try
// {
// _thread.Wait();
// }
// catch (InterruptedException)
// {
// return false;
// }
// }