Commit 78aac604 authored by Richard Gonlag's avatar Richard Gonlag
Browse files

Custom colorspace

parent 2383029d
Pipeline #239051 passed with stages
in 19 minutes and 12 seconds
......@@ -8,110 +8,6 @@ variables:
VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20210803114245
VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20210915065913
.variables-trial: &variables-trial
ARGS_TRIAL: -t
.base-template:
tags:
- docker
- amd64
stage: build-libvlc
artifacts:
paths:
- nightlies/*
expire_in: 2 weeks
# ANDROID
.variables-android-armv7: &variables-android-armv7
ANDROID_ABI: armeabi-v7a
.variables-android-armv8: &variables-android-armv8
ANDROID_ABI: arm64-v8a
.variables-android-x86: &variables-android-x86
ANDROID_ABI: x86
.variables-android-x86_64: &variables-android-x86_64
ANDROID_ABI: x86_64
.libvlc-android-common:
extends: .base-template
image:
name: $VLC_ANDROID_IMAGE
script: |
git clone https://code.videolan.org/mfkl/vlc-android && cd vlc-android && git checkout 4.0-reloaded
git apply ../patches/disable-rav1e.patch
git clone https://code.videolan.org/videolan/vlc/ --depth=1
./buildsystem/compile.sh -l -b -r -a ${ANDROID_ABI}
after_script:
- mkdir nightlies
- cp vlc-android/libvlc/jni/libs/${ANDROID_ABI}/libvlc.so nightlies
- cp vlc-android/libvlc/jni/libs/${ANDROID_ABI}/libc++_shared.so nightlies
- cp vlc-android/libvlc/build/intermediates/aar_main_jar/release/classes.jar nightlies
.unity-android-common:
extends: .base-template
image:
name: $VLC_ANDROID_IMAGE
stage: build-unity-plugin
script:
- mkdir -p Assets/VLCUnity/Plugins/Android/${ANDROID_ABI}
- mv nightlies/* Assets/VLCUnity/Plugins/Android/${ANDROID_ABI}
- ./build.sh -p android -a ${ANDROID_ABI} -r ${ARGS_TRIAL}
after_script:
- cp -r Assets/VLCUnity/Plugins/Android/${ANDROID_ABI} nightlies
# libvlc android
libvlc-android-armv7:
extends: .libvlc-android-common
variables: *variables-android-armv7
libvlc-android-armv8:
extends: .libvlc-android-common
variables: *variables-android-armv8
libvlc-android-x86:
extends: .libvlc-android-common
variables: *variables-android-x86
libvlc-android-x86_64:
extends: .libvlc-android-common
variables: *variables-android-x86_64
# unity android
unity-android-armv7:
extends: .unity-android-common
variables: *variables-android-armv7
dependencies:
- libvlc-android-armv7
unity-android-armv8:
extends: .unity-android-common
variables: *variables-android-armv8
dependencies:
- libvlc-android-armv8
unity-android-x86:
extends: .unity-android-common
variables: *variables-android-x86
dependencies:
- libvlc-android-x86
unity-android-x86_64:
extends: .unity-android-common
variables: *variables-android-x86_64
dependencies:
- libvlc-android-x86_64
unity-android-armv7-trial:
extends: .unity-android-common
variables:
<<: [*variables-android-armv7, *variables-trial]
dependencies:
- libvlc-android-armv7
# Windows Classic
......@@ -164,14 +60,6 @@ unity-android-armv7-trial:
- nightlies/*
expire_in: 2 weeks
libvlc-x86_64-debug:
extends: .libvlc-win-common
image:
name: $VLC_WIN_LLVM_IMAGE
variables:
ARGS: -c -z -d -x -a x86_64
ARTIFACT: vlc-4.0.0-dev-win64-debug.7z
BUILD_FOLDER: win64
libvlc-x86_64:
extends: .libvlc-win-common
......@@ -182,30 +70,9 @@ libvlc-x86_64:
ARTIFACT: vlc-4.0.0-dev-win64.7z
BUILD_FOLDER: win64
libvlc-uwp64-llvm:
extends: .libvlc-win-common
image:
name: $VLC_UWP_LLVM_IMAGE
variables:
ARGS: -w -u -c -z -r -x -a x86_64 -i nope
ARTIFACT: vlc-4.0.0-dev-win64.7z
BUILD_FOLDER: win64-uwp
libvlc-uwp64-llvm-debug:
extends: .libvlc-win-common
image:
name: $VLC_UWP_LLVM_IMAGE
variables:
ARGS: -w -u -c -z -d -x -a x86_64
ARTIFACT: vlc-4.0.0-dev-win64-debug.7z
BUILD_FOLDER: win64-uwp
unity-plugin-windows:
extends: .unity-win-common
unity-plugin-windows-trial:
extends: .unity-win-common
variables: *variables-trial
# LibVLCSharp
......
......@@ -233,7 +233,7 @@ void ReadWriteTexture::Update(UINT width, UINT height, ID3D11Device *m_d3deviceU
texDesc.Usage = D3D11_USAGE_DEFAULT;
texDesc.CPUAccessFlags = 0;
texDesc.ArraySize = 1;
texDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
texDesc.Format = DXGI_FORMAT_R16G16B16A16_UNORM;
texDesc.Height = height;
texDesc.Width = width;
......@@ -423,14 +423,14 @@ bool RenderAPI_D3D11::UpdateOutput( const libvlc_video_render_cfg_t *cfg, libvlc
{
DEBUG("Entering UpdateOutput_cb.\n");
DXGI_FORMAT renderFormat = DXGI_FORMAT_R8G8B8A8_UNORM;
DXGI_FORMAT renderFormat = DXGI_FORMAT_R16G16B16A16_UNORM;
Update(cfg->width, cfg->height);
out->dxgi_format = renderFormat;
out->full_range = true;
out->colorspace = libvlc_video_colorspace_BT709;
out->primaries = libvlc_video_primaries_BT709;
out->transfer = m_linear ? libvlc_video_transfer_func_LINEAR : libvlc_video_transfer_func_SRGB;
out->transfer = libvlc_video_transfer_func_LINEAR;
out->orientation = libvlc_video_orient_top_right;
DEBUG("Exiting UpdateOutput_cb \n");
......@@ -474,7 +474,7 @@ bool RenderAPI_D3D11::MakeCurrent( bool enter )
bool RenderAPI_D3D11::SelectPlane( size_t plane, void *output )
{
if ( plane != 0 || m_d3dctxVLC == NULL ) // we only support one packed RGBA plane (DXGI_FORMAT_R8G8B8A8_UNORM)
if ( plane != 0 || m_d3dctxVLC == NULL ) // we only support one packed RGBA plane (DXGI_FORMAT_R16G16B16A16_UNORM)
return false;
if( current_texture )
......
Supports Markdown
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