Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (4)
......@@ -204,7 +204,7 @@ libdirect3d11_plugin_la_SOURCES = video_output/win32/direct3d11.cpp \
video_output/win32/d3d_dynamic_shader.c video_output/win32/d3d_dynamic_shader.h \
video_output/win32/common.c video_output/win32/common.h
libdirect3d11_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(LIBCOMCXXFLAGS)
libdirect3d11_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la $(LIBCOM) -luuid
libdirect3d11_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la $(LIBCOM) -luuid -ldxgi
libdirect3d11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
if !HAVE_WINSTORE
libdirect3d11_plugin_la_CPPFLAGS += -DHAVE_WIN32_SENSORS
......
......@@ -95,27 +95,4 @@ void D3D11_ClearRenderTargets(d3d11_device_t *, const d3d_format_t *,
void D3D11_ReleaseVertexShader(d3d11_vertex_shader_t *);
enum d3d11_hdr
{
hdr_Auto,
hdr_Never,
hdr_Always,
hdr_Fake,
};
static inline enum d3d11_hdr HdrModeFromString(vlc_logger *logger, const char *psz_hdr)
{
if (strcmp("auto", psz_hdr) == 0)
return hdr_Auto;
if (strcmp("never", psz_hdr) == 0)
return hdr_Never;
if (strcmp("always", psz_hdr) == 0)
return hdr_Always;
if (strcmp("generate", psz_hdr) == 0)
return hdr_Fake;
vlc_warning(logger, "unknown HDR mode %s, using auto mode", psz_hdr);
return hdr_Auto;
}
#endif /* VLC_D3D11_SHADERS_H */
......@@ -49,6 +49,7 @@ struct d3d11_local_swapchain
vlc_object_t *obj = nullptr;
d3d11_device_t *d3d_dev = nullptr;
bool match_display = true;
ComPtr<ID3D11RenderTargetView> swapchainTargetView[DXGI_MAX_RENDER_TARGET];
};
......@@ -114,12 +115,8 @@ static bool UpdateSwapchain( d3d11_local_swapchain *display, const libvlc_video_
return false;
}
char *psz_hdr = var_InheritString(display->obj, "d3d11-hdr-mode");
auto hdrMode = HdrModeFromString(vlc_object_logger(display->obj), psz_hdr);
free(psz_hdr);
if (!DXGI_UpdateSwapChain( display->sys, dxgiadapter.Get(), display->d3d_dev->d3ddevice,
newPixelFormat, cfg, hdrMode == hdr_Auto ))
newPixelFormat, cfg, display->match_display ))
return false;
ComPtr<ID3D11Resource> pBackBuffer;
......@@ -189,36 +186,16 @@ bool D3D11_LocalSwapchainSelectPlane( void *opaque, size_t plane, void *out )
return true;
}
void *D3D11_CreateLocalSwapchainHandleHwnd(vlc_object_t *o, HWND hwnd, d3d11_device_t *d3d_dev)
{
d3d11_local_swapchain *display = new (std::nothrow) d3d11_local_swapchain();
if (unlikely(display == NULL))
return NULL;
display->sys = DXGI_CreateLocalSwapchainHandleHwnd(o, hwnd);
if (unlikely(display->sys == NULL))
return NULL;
display->obj = o;
display->d3d_dev = d3d_dev;
return display;
}
#if defined(HAVE_DCOMP_H)
void *D3D11_CreateLocalSwapchainHandleDComp(vlc_object_t *o, void* dcompDevice, void* dcompVisual, d3d11_device_t *d3d_dev)
void *D3D11_CreateLocalSwapchain(vlc_object_t *o, d3d11_device_t *d3d_dev, dxgi_swapchain *sys, bool match_display)
{
d3d11_local_swapchain *display = new (std::nothrow) d3d11_local_swapchain();
if (unlikely(display == NULL))
return NULL;
display->sys = DXGI_CreateLocalSwapchainHandleDComp(o, dcompDevice, dcompVisual);
if (unlikely(display->sys == NULL))
return NULL;
display->sys = sys;
display->obj = o;
display->d3d_dev = d3d_dev;
display->match_display = match_display;
return display;
}
#endif // HAVE_DCOMP_H
......@@ -29,11 +29,7 @@
#include "../../video_chroma/d3d11_fmt.h"
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
void *D3D11_CreateLocalSwapchainHandleHwnd(vlc_object_t *, HWND, d3d11_device_t *d3d_dev);
#if defined(HAVE_DCOMP_H)
void *D3D11_CreateLocalSwapchainHandleDComp(vlc_object_t *, void* dcompDevice, void* dcompVisual, d3d11_device_t *d3d_dev);
#endif // HAVE_DCOMP_H
void *D3D11_CreateLocalSwapchain(vlc_object_t *, d3d11_device_t *, struct dxgi_swapchain *, bool match_display);
void D3D11_LocalSwapchainCleanupDevice( void *opaque );
bool D3D11_LocalSwapchainUpdateOutput( void *opaque, const libvlc_video_render_cfg_t *cfg, libvlc_video_output_cfg_t *out );
bool D3D11_LocalSwapchainStartEndRendering( void *opaque, bool enter );
......
......@@ -53,6 +53,10 @@
#include "common.h"
#include "../../video_chroma/copy.h"
#ifdef HAVE_DXGI1_6_H
# include <dxgi1_6.h>
#endif
using Microsoft::WRL::ComPtr;
static int Open(vout_display_t *,
......@@ -106,6 +110,14 @@ enum d3d11_upscale
upscale_SuperResolution,
};
enum d3d11_hdr
{
hdr_Auto,
hdr_Never,
hdr_Always,
hdr_Fake,
};
typedef struct vout_display_sys_t
{
display_win32_area_t area = {};
......@@ -404,6 +416,74 @@ static int UpdateStaging(vout_display_t *vd, const video_format_t *fmt)
return VLC_SUCCESS;
}
static enum d3d11_hdr HdrModeFromString(vlc_logger *logger, const char *psz_hdr)
{
if (strcmp("auto", psz_hdr) == 0)
return hdr_Auto;
if (strcmp("never", psz_hdr) == 0)
return hdr_Never;
if (strcmp("always", psz_hdr) == 0)
return hdr_Always;
if (strcmp("generate", psz_hdr) == 0)
return hdr_Fake;
vlc_warning(logger, "unknown HDR mode %s, using auto mode", psz_hdr);
return hdr_Auto;
}
static void InitTonemapProcessor(vout_display_t *vd, const video_format_t *fmt_in)
{
vout_display_sys_t *sys = static_cast<vout_display_sys_t *>(vd->sys);
if (sys->hdrMode != hdr_Fake)
return;
#ifdef HAVE_DXGI1_6_H
{ // check the main display is in HDR mode
HRESULT hr;
ComPtr<IDXGIAdapter> adapter;
ComPtr<IDXGIFactory2> factory;
ComPtr<IDXGIOutput> dxgiOutput;
ComPtr<IDXGIOutput6> dxgiOutput6;
DXGI_OUTPUT_DESC1 desc1;
hr = CreateDXGIFactory1(IID_GRAPHICS_PPV_ARGS(factory.GetAddressOf()));
if (FAILED(hr))
goto error;
UINT adapter_index = 0;
hr = factory->EnumAdapters(adapter_index, adapter.GetAddressOf());
if (FAILED(hr))
goto error;
UINT output_index = 0;
hr = adapter->EnumOutputs(output_index, dxgiOutput.GetAddressOf());
if (FAILED(hr))
goto error;
hr = dxgiOutput.As(&dxgiOutput6);
if (FAILED(hr))
goto error;
hr = dxgiOutput6->GetDesc1(&desc1);
if (FAILED(hr))
goto error;
if (desc1.ColorSpace != DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020)
{
msg_Warn(vd, "not an HDR display");
goto error;
}
}
#endif
sys->tonemapProc = D3D11_TonemapperCreate(VLC_OBJECT(vd), sys->d3d_dev, fmt_in);
if (sys->tonemapProc != NULL)
{
msg_Dbg(vd, "Using tonemapper");
return;
}
error:
sys->hdrMode = hdr_Auto;
msg_Dbg(vd, "failed to create the tone mapper, using default HDR mode");
}
static const auto ops = []{
struct vlc_display_operations ops {};
ops.close = Close;
......@@ -422,6 +502,10 @@ static int Open(vout_display_t *vd,
return VLC_ENOMEM;
vd->sys = sys;
char *psz_hdr = var_InheritString(vd, "d3d11-hdr-mode");
sys->hdrMode = HdrModeFromString(vlc_object_logger(vd), psz_hdr);
free(psz_hdr);
d3d11_decoder_device_t *dev_sys = NULL;
int ret = D3D_CreateShaderCompiler(VLC_OBJECT(vd), &sys->shaders);
......@@ -450,6 +534,8 @@ static int Open(vout_display_t *vd,
}
sys->d3d_dev = &dev_sys->d3d_dev;
InitTonemapProcessor(vd, vd->source);
if ( sys->swapCb == NULL || sys->startEndRenderingCb == NULL || sys->updateOutputCb == NULL )
{
#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
......@@ -464,17 +550,26 @@ static int Open(vout_display_t *vd,
}
/* use our internal swapchain callbacks */
dxgi_swapchain *swap = nullptr;
#if defined(HAVE_DCOMP_H)
if (vd->cfg->window->type == VLC_WINDOW_TYPE_DCOMP)
sys->outside_opaque =
D3D11_CreateLocalSwapchainHandleDComp(VLC_OBJECT(vd),
vd->cfg->window->display.dcomp_device,
vd->cfg->window->handle.dcomp_visual, sys->d3d_dev);
swap = DXGI_CreateLocalSwapchainHandleDComp(VLC_OBJECT(vd),
vd->cfg->window->display.dcomp_device,
vd->cfg->window->handle.dcomp_visual);
else
#endif //HAVE_DCOMP_H
sys->outside_opaque = D3D11_CreateLocalSwapchainHandleHwnd(VLC_OBJECT(vd), CommonVideoHWND(&sys->area), sys->d3d_dev);
swap = DXGI_CreateLocalSwapchainHandleHwnd(VLC_OBJECT(vd), CommonVideoHWND(&sys->area));
if (unlikely(swap == NULL))
goto error;
sys->outside_opaque = D3D11_CreateLocalSwapchain(VLC_OBJECT(vd), sys->d3d_dev, swap,
sys->hdrMode != hdr_Never && sys->hdrMode != hdr_Always);
if (unlikely(sys->outside_opaque == NULL))
{
DXGI_LocalSwapchainCleanupDevice(swap);
goto error;
}
sys->updateOutputCb = D3D11_LocalSwapchainUpdateOutput;
sys->swapCb = D3D11_LocalSwapchainSwap;
sys->startEndRenderingCb = D3D11_LocalSwapchainStartEndRendering;
......@@ -839,23 +934,6 @@ static const d3d_format_t *GetBlendableFormat(vout_display_t *vd, vlc_fourcc_t i
return FindD3D11Format( vd, sys->d3d_dev, i_src_chroma, DXGI_RGB_FORMAT|DXGI_YUV_FORMAT, 0, 0, 0, 8, DXGI_CHROMA_CPU, supportFlags );
}
static void InitTonemapProcessor(vout_display_t *vd, const video_format_t *fmt_in)
{
vout_display_sys_t *sys = static_cast<vout_display_sys_t *>(vd->sys);
if (sys->hdrMode != hdr_Fake)
return;
sys->tonemapProc = D3D11_TonemapperCreate(VLC_OBJECT(vd), sys->d3d_dev, fmt_in);
if (sys->tonemapProc == NULL)
{
sys->hdrMode = hdr_Auto;
msg_Dbg(vd, "failed to create the tone mapper, using default HDR mode");
return;
}
msg_Dbg(vd, "Using tonemapper");
}
static void InitScaleProcessor(vout_display_t *vd)
{
vout_display_sys_t *sys = static_cast<vout_display_sys_t *>(vd->sys);
......@@ -878,12 +956,6 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmtp, vlc_video_co
vout_display_sys_t *sys = static_cast<vout_display_sys_t *>(vd->sys);
video_format_t fmt;
char *psz_hdr = var_InheritString(vd, "d3d11-hdr-mode");
sys->hdrMode = HdrModeFromString(vlc_object_logger(vd), psz_hdr);
free(psz_hdr);
InitTonemapProcessor(vd, vd->source);
video_format_Copy(&fmt, vd->source);
video_format_Copy(&sys->picQuad.quad_fmt, &fmt);
int err = SetupOutputFormat(vd, &fmt, vctx, &sys->picQuad.quad_fmt);
......
......@@ -9,7 +9,7 @@ d3d11_sources = files('direct3d11.cpp', 'd3d11_quad.cpp', 'd3d11_scaler.cpp',
d3d11_link_with = [ d3d11_common_lib ]
d3d11_cargs = []
d3d11_cxxargs = [ libcom_cppflags ]
d3d11_deps = []
d3d11_deps = [ cc.find_library('dxgi') ]
if get_option('winstore_app')
d3d11_deps += [
cc.find_library('d3d11'),
......