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 (25)
Showing
with 64 additions and 99 deletions
......@@ -521,9 +521,6 @@
/* host which ran configure */
#mesondefine VLC_COMPILE_HOST
/* Define to 1 if building for Windows Store. */
#mesondefine VLC_WINSTORE_APP
#ifdef _WIN32
/* Define to limit the scope of <windows.h>. */
......
......@@ -423,7 +423,6 @@ AS_IF([test "${SYS}" = "mingw32"],[
LDFLAGS="${LDFLAGS} -lwindowsappcompat"
VLC_ADD_LIBS([libvlccore], [-lruntimeobject])
AC_LIBOBJ([gai_strerror])
AC_DEFINE([VLC_WINSTORE_APP], [1], [Define to 1 if building for Windows Store.])
],[])
AC_SUBST([LIBCOM])
AC_SUBST([LIBCOMCXXFLAGS])
......
......@@ -434,7 +434,6 @@ ucrt_version_test = '''
# Check if we are building for Windows Store
if get_option('winstore_app')
have_win_store = true
cdata.set('VLC_WINSTORE_APP', 1)
add_project_arguments('-DWINSTORECOMPAT', language: ['c', 'cpp'])
windowsappcompat_lib = cc.find_library('windowsappcompat')
# TODO: enable when meson 0.63 is required
......
......@@ -99,7 +99,7 @@ static block_t *screen_Capture(demux_t *p_demux)
goto error;
}
#if defined(SCREEN_SUBSCREEN) && !defined(VLC_WINSTORE_APP)
#if defined(SCREEN_SUBSCREEN) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
if( p_sys->b_follow_mouse )
{
POINT pos;
......@@ -108,7 +108,7 @@ static block_t *screen_Capture(demux_t *p_demux)
pos.y -= p_data->screen_y;
FollowMouse( p_sys, pos.x, pos.y );
}
#endif // SCREEN_SUBSCREEN && !VLC_WINSTORE_APP
#endif // SCREEN_SUBSCREEN && WINAPI_PARTITION_DESKTOP
/* copy the texture into the block texture */
hr = resource.As(&d3d11res);
......@@ -177,19 +177,19 @@ int screen_InitCaptureDXGI(demux_t *p_demux)
return VLC_ENOTSUP;
}
#ifdef VLC_WINSTORE_APP
#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
if (p_sys->b_follow_mouse)
{
msg_Dbg(p_demux, "screen-follow-mouse not supported in UWP DXGI");
return VLC_ENOTSUP;
}
#endif // VLC_WINSTORE_APP
#endif // !WINAPI_PARTITION_DESKTOP
p_data = new (std::nothrow) screen_data_t();
if (unlikely(p_data == nullptr))
return VLC_ENOMEM;
#ifndef VLC_WINSTORE_APP
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
p_data->screen_x = GetSystemMetrics( SM_XVIRTUALSCREEN );
p_data->screen_y = GetSystemMetrics( SM_YVIRTUALSCREEN );
#endif
......@@ -290,7 +290,7 @@ int screen_InitCapture(demux_t *p_demux)
int ret = screen_InitCaptureDXGI(p_demux);
if (ret == VLC_SUCCESS)
return VLC_SUCCESS;
#if defined(_WIN32) && !defined(VLC_WINSTORE_APP)
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
return screen_InitCaptureGDI(p_demux);
#else
return ret;
......
......@@ -74,7 +74,7 @@ typedef struct
} demux_sys_t;
int screen_InitCapture ( demux_t * );
#if defined(_WIN32) && !defined(VLC_WINSTORE_APP)
#if defined(_WIN32)
int screen_InitCaptureGDI ( demux_t * );
#endif
......
......@@ -504,7 +504,6 @@ static int DxCreateDecoderSurfaces(vlc_va_t *va, int codec_id,
ID3D10Multithread_Release(pMultithread);
}
#ifdef VLC_WINSTORE_APP
/* On the Xbox 1/S, any decoding of H264 with one dimension over 2304
* crashes totally the device */
if (codec_id == AV_CODEC_ID_H264 &&
......@@ -515,7 +514,6 @@ static int DxCreateDecoderSurfaces(vlc_va_t *va, int codec_id,
d3d11_device_unlock(sys->d3d_dev);
return VLC_EGENERIC;
}
#endif
D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc;
ZeroMemory(&viewDesc, sizeof(viewDesc));
......
......@@ -503,6 +503,7 @@ static int InitVideoDecCommon( decoder_t *p_dec )
p_context->opaque = p_dec;
p_context->reordered_opaque = 0;
int max_thread_count;
int i_thread_count = p_sys->b_hardware_only ? 1 : var_InheritInteger( p_dec, "avcodec-threads" );
if( i_thread_count <= 0 )
{
......@@ -511,13 +512,17 @@ static int InitVideoDecCommon( decoder_t *p_dec )
i_thread_count++;
//FIXME: take in count the decoding time
#ifdef VLC_WINSTORE_APP
i_thread_count = __MIN( i_thread_count, 6 );
#else
i_thread_count = __MIN( i_thread_count, p_codec->id == AV_CODEC_ID_HEVC ? 10 : 6 );
max_thread_count = p_codec->id == AV_CODEC_ID_HEVC ? 10 : 6;
#if defined(_WIN32)
# if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
// reduce memory when decoding on Xbox
max_thread_count = 6 ;
# endif
#endif
}
i_thread_count = __MIN( i_thread_count, p_codec->id == AV_CODEC_ID_HEVC ? 32 : 16 );
else
max_thread_count = p_codec->id == AV_CODEC_ID_HEVC ? 32 : 16;
i_thread_count = __MIN( i_thread_count, max_thread_count );
msg_Dbg( p_dec, "allowing %d thread(s) for decoding", i_thread_count );
p_context->thread_count = i_thread_count;
#if LIBAVCODEC_VERSION_MAJOR < 60
......
......@@ -75,7 +75,9 @@ struct intf_sys_t
vlc_mutex_t clients_lock;
struct vlc_list clients;
#else
#if NTDDI_VERSION >= NTDDI_WIN10_RS1 || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
HANDLE hConsoleIn;
#endif
bool b_quiet;
int i_socket;
#endif
......@@ -577,7 +579,7 @@ static void *Run(void *data)
}
}
#else
#else // _WIN32
static void msg_vprint(intf_thread_t *p_intf, const char *psz_fmt, va_list args)
{
char fmt_eol[strlen (psz_fmt) + 3], *msg;
......@@ -616,7 +618,7 @@ int cli_printf(struct cli_client *cl, const char *fmt, ...)
return VLC_SUCCESS;
}
#ifndef VLC_WINSTORE_APP
#if NTDDI_VERSION >= NTDDI_WIN10_RS1 || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
static bool ReadWin32( intf_thread_t *p_intf, unsigned char *p_buffer, int *pi_size )
{
INPUT_RECORD input_record;
......@@ -704,7 +706,7 @@ static bool ReadWin32( intf_thread_t *p_intf, unsigned char *p_buffer, int *pi_s
static bool ReadCommand(intf_thread_t *p_intf, char *p_buffer, int *pi_size)
{
#ifndef VLC_WINSTORE_APP
#if NTDDI_VERSION >= NTDDI_WIN10_RS1 || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
if( p_intf->p_sys->i_socket == -1 && !p_intf->p_sys->b_quiet )
return ReadWin32( p_intf, (unsigned char*)p_buffer, pi_size );
else if( p_intf->p_sys->i_socket == -1 )
......@@ -773,7 +775,7 @@ static void *Run( void *data )
p_buffer[0] = 0;
#ifndef VLC_WINSTORE_APP
#if NTDDI_VERSION >= NTDDI_WIN10_RS1 || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
/* Get the file descriptor of the console input */
p_intf->p_sys->hConsoleIn = GetStdHandle(STD_INPUT_HANDLE);
if( p_intf->p_sys->hConsoleIn == INVALID_HANDLE_VALUE )
......@@ -816,7 +818,7 @@ static void *Run( void *data )
#undef msg_rc
#define msg_rc(...) msg_print(p_intf, __VA_ARGS__)
#include "../intromsg.h"
#endif
#endif // _WIN32
/*****************************************************************************
* Activate: initialize and create stuff
......@@ -959,7 +961,7 @@ static int Activate( vlc_object_t *p_this )
if (pi_socket != NULL)
#else
p_sys->i_socket = -1;
#ifdef VLC_WINSTORE_APP
#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
p_sys->b_quiet = true;
#else
p_sys->b_quiet = var_InheritBool( p_intf, "rc-quiet" );
......
......@@ -40,7 +40,7 @@ vlc_module_begin ()
set_description( N_("Dummy interface") )
set_capability( "interface", 0 )
set_callback( Open )
#if defined(_WIN32) && !defined(VLC_WINSTORE_APP)
#if defined(_WIN32)
add_obsolete_bool( "dummy-quiet" ) /* since 4.0.0 */
#endif
vlc_module_end ()
......
......@@ -762,8 +762,10 @@ static lua_State* GetLuaState( extensions_manager_t *p_mgr,
luaopen_rand(L);
luaopen_rd(L);
luaopen_ml(L);
#if defined(_WIN32) && !defined(VLC_WINSTORE_APP)
#if defined(_WIN32)
# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
luaopen_win(L);
# endif
#endif
/* Register extension specific functions */
......
......@@ -285,8 +285,10 @@ static int Start_LuaIntf( vlc_object_t *p_this, const char *name )
luaopen_rand( L );
luaopen_rd( L );
luaopen_ml( L );
#if defined(_WIN32) && !defined(VLC_WINSTORE_APP)
#if defined(_WIN32)
# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
luaopen_win( L );
# endif
#endif
/* clean up */
......
......@@ -33,7 +33,7 @@
#include "../vlc.h"
#include "../libs.h"
#ifndef VLC_WINSTORE_APP
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
/* Based on modules/control/rc.c and include/vlc_interface.h */
static HANDLE GetConsole( lua_State *L )
......@@ -183,4 +183,4 @@ void luaopen_win( lua_State *L )
lua_setfield( L, -2, "win" );
}
#endif /* !VLC_WINSTORE_APP */
#endif // WINAPI_PARTITION_DESKTOP
......@@ -22,11 +22,10 @@ if HAVE_WIN32
libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/dwrite.cpp
libfreetype_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(LIBCOMCXXFLAGS)
libfreetype_plugin_la_LINK = $(CXXLINK)
libfreetype_plugin_la_LIBADD += -ldwrite -luuid
if HAVE_WIN32_DESKTOP
libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/win32.c
libfreetype_plugin_la_LIBADD += -liconv -lz -lusp10 -lgdi32 -luuid
else
libfreetype_plugin_la_LIBADD += -ldwrite -luuid
libfreetype_plugin_la_LIBADD += -liconv -lz -lusp10 -lgdi32
endif
else
libfreetype_plugin_la_LINK = $(LINK)
......
......@@ -89,12 +89,12 @@ int DWrite_GetFallbacks( vlc_font_select_t *, const char *psz_family,
int InitDWrite( vlc_font_select_t * );
int ReleaseDWrite( vlc_font_select_t * );
int DWrite_GetFontStream( vlc_font_select_t *, int i_index, FT_Stream *pp_stream );
#ifndef VLC_WINSTORE_APP
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
int Win32_GetFallbacks( vlc_font_select_t *, const char *psz_family,
uni_char_t codepoint, vlc_family_t ** );
int Win32_GetFamily( vlc_font_select_t *, const char *psz_family, const vlc_family_t ** );
#endif /* !VLC_WINSTORE_APP */
#endif /* WINAPI_PARTITION_DESKTOP */
#endif /* _WIN32 */
#ifdef __APPLE__
......
......@@ -40,34 +40,18 @@
using Microsoft::WRL::ComPtr;
using namespace std;
typedef HRESULT ( WINAPI *DWriteCreateFactoryProc ) (
_In_ DWRITE_FACTORY_TYPE factory_type,
_In_ REFIID iid,
_Out_ IUnknown **pp_factory );
struct dw_sys_t
{
HMODULE p_dw_dll;
ComPtr< IDWriteFactory2 > p_dw_factory;
ComPtr< IDWriteFontCollection > p_dw_system_fonts;
ComPtr< IDWriteNumberSubstitution > p_dw_substitution;
ComPtr< IDWriteFontFallback > p_dw_fallbacks;
vector< FT_Stream > streams;
dw_sys_t( HMODULE p_dw_dll ) : p_dw_dll( p_dw_dll )
dw_sys_t( )
{
/* This will fail on versions of Windows prior to 8.1 */
DWriteCreateFactoryProc pf;
#ifdef VLC_WINSTORE_APP
pf = DWriteCreateFactory;
#else
pf = ( DWriteCreateFactoryProc ) GetProcAddress( p_dw_dll, "DWriteCreateFactory" );
if( pf == NULL )
throw runtime_error( "GetProcAddress() failed" );
#endif
if( pf( DWRITE_FACTORY_TYPE_SHARED, __uuidof( IDWriteFactory2 ),
if( DWriteCreateFactory( DWRITE_FACTORY_TYPE_SHARED, __uuidof( IDWriteFactory2 ),
&p_dw_factory ) )
throw runtime_error( "failed to create DWrite factory" );
......@@ -131,28 +115,14 @@ static inline void AppendFamily( vlc_family_t **pp_list, vlc_family_t *p_family
extern "C" int InitDWrite( vlc_font_select_t *fs )
{
dw_sys_t *p_dw_sys;
HMODULE p_dw_dll = NULL;
try
{
#ifdef VLC_WINSTORE_APP
p_dw_sys = new dw_sys_t( p_dw_dll );
#else
p_dw_dll = LoadLibrary( TEXT( "Dwrite.dll" ) );
if( p_dw_dll == NULL )
return VLC_EGENERIC;
p_dw_sys = new dw_sys_t( p_dw_dll );
#endif
p_dw_sys = new dw_sys_t( );
}
catch( const exception &e )
{
#ifndef VLC_WINSTORE_APP
FreeLibrary( p_dw_dll );
(void)e;
#else
msg_Err( fs->p_obj, "InitDWrite(): %s", e.what() );
#endif
return VLC_EGENERIC;
}
......@@ -166,16 +136,7 @@ extern "C" int ReleaseDWrite( vlc_font_select_t *fs )
{
dw_sys_t *p_dw_sys = ( dw_sys_t * ) fs->p_dw_sys;
#ifdef VLC_WINSTORE_APP
delete p_dw_sys;
#else
HMODULE p_dw_dll = NULL;
if( p_dw_sys && p_dw_sys->p_dw_dll )
p_dw_dll = p_dw_sys->p_dw_dll;
delete p_dw_sys;
if( p_dw_dll ) FreeLibrary( p_dw_dll );
#endif
return VLC_SUCCESS;
}
......
......@@ -57,7 +57,7 @@
#include "../platform_fonts.h"
#include "backends.h"
#ifndef VLC_WINSTORE_APP
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#define FONT_DIR_NT TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts")
#define FONT_LINKING_NT TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontLink\\SystemLink")
......@@ -683,6 +683,9 @@ done:
*pp_result = p_family;
return i_ret;
}
#else // !WINAPI_PARTITION_DESKTOP
#define GetWindowsFontPath() (NULL)
#endif // !WINAPI_PARTITION_DESKTOP
char * MakeFilePath( vlc_font_select_t *fs, const char *psz_filename )
{
......@@ -706,5 +709,3 @@ char * MakeFilePath( vlc_font_select_t *fs, const char *psz_filename )
return psz_filepath;
}
#endif
......@@ -841,7 +841,7 @@ static int StaticMap_GetFamily( vlc_font_select_t *fs, const char *psz_lcname,
}
#endif
#if !defined(_WIN32) || defined(VLC_WINSTORE_APP)
#if !defined(_WIN32)
char * MakeFilePath( vlc_font_select_t *fs, const char *psz_filename )
{
......@@ -902,7 +902,7 @@ vlc_font_select_t * FontSelectNew( filter_t *p_filter )
}
else
{
#ifdef VLC_WINSTORE_APP
#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
msg_Err( p_filter, "Error initializing DirectWrite" );
goto error;
#else
......
......@@ -284,7 +284,7 @@ done:
typedef struct
{
#ifndef VLC_WINSTORE_APP
#if !BUILD_FOR_UAP
HINSTANCE hdll; /* handle of the opened d3d11 dll */
#if !defined(NDEBUG) && defined(HAVE_DXGIDEBUG_H)
HINSTANCE dxgidebug_dll;
......@@ -305,7 +305,7 @@ typedef struct {
static int D3D11_Create(vlc_object_t *obj, d3d11_handle_t *hd3d)
{
#ifndef VLC_WINSTORE_APP
#if !BUILD_FOR_UAP
hd3d->hdll = LoadLibrary(TEXT("D3D11.DLL"));
if (!hd3d->hdll)
{
......@@ -331,13 +331,13 @@ static int D3D11_Create(vlc_object_t *obj, d3d11_handle_t *hd3d)
}
}
# endif // !NDEBUG && HAVE_DXGIDEBUG_H
#endif // !VLC_WINSTORE_APP
#endif // !BUILD_FOR_UAP
return VLC_SUCCESS;
}
static void D3D11_Destroy(d3d11_handle_t *hd3d)
{
#ifndef VLC_WINSTORE_APP
#if !BUILD_FOR_UAP
if (hd3d->hdll)
FreeLibrary(hd3d->hdll);
......@@ -429,7 +429,7 @@ static HRESULT CreateDevice(vlc_object_t *obj, d3d11_handle_t *hd3d,
IDXGIAdapter *adapter,
bool hw_decoding, d3d11_device_t *out)
{
#ifndef VLC_WINSTORE_APP
#if !BUILD_FOR_UAP
# define D3D11CreateDevice(a,b,c,d,e,f,g,h,i,j) pf_CreateDevice(a,b,c,d,e,f,g,h,i,j)
/* */
PFN_D3D11_CREATE_DEVICE pf_CreateDevice;
......@@ -438,7 +438,7 @@ static HRESULT CreateDevice(vlc_object_t *obj, d3d11_handle_t *hd3d,
msg_Err(obj, "Cannot locate reference to D3D11CreateDevice ABI in DLL");
return E_NOINTERFACE;
}
#endif /* VLC_WINSTORE_APP */
#endif
HRESULT hr = E_NOTIMPL;
UINT creationFlags = 0;
......@@ -562,7 +562,7 @@ d3d11_decoder_device_t *(D3D11_CreateDevice)(vlc_object_t *obj,
engineType == libvlc_video_engine_d3d11 )
{
/* internal decoder device */
#ifndef VLC_WINSTORE_APP
#if !BUILD_FOR_UAP
if (!forced)
{
/* Allow using D3D11 automatically starting from Windows 8.1 */
......@@ -573,7 +573,7 @@ d3d11_decoder_device_t *(D3D11_CreateDevice)(vlc_object_t *obj,
if (!isWin81OrGreater)
goto error;
}
#endif /* !VLC_WINSTORE_APP */
#endif
hr = CreateDevice( obj, &sys->hd3d, adapter, hw_decoding, &sys->dec_device.d3d_dev );
}
......@@ -615,10 +615,12 @@ bool isXboxHardware(const d3d11_device_t *d3ddev)
{
bool result = false;
#if BUILD_FOR_UAP
if (d3ddev->adapterDesc.VendorId == 0 &&
d3ddev->adapterDesc.DeviceId == 0 &&
!wcscmp(L"ROOT\\SraKmd\\0000", d3ddev->adapterDesc.Description))
result = true;
#endif
return result;
}
......@@ -929,7 +931,7 @@ error:
void D3D11_LogResources(d3d11_decoder_device_t *dev_sys)
{
#ifndef VLC_WINSTORE_APP
#if !BUILD_FOR_UAP
# if !defined(NDEBUG) && defined(HAVE_DXGIDEBUG_H)
d3d11_decoder_device *sys = container_of(dev_sys, d3d11_decoder_device, dec_device);
d3d11_handle_t *hd3d = &sys->hd3d;
......
......@@ -68,10 +68,8 @@ static void FillPresentationParameters(D3DPRESENT_PARAMETERS *d3dpp)
d3dpp->hDeviceWindow = NULL;
d3dpp->SwapEffect = D3DSWAPEFFECT_COPY;
d3dpp->BackBufferCount = 1;
#ifndef VLC_WINSTORE_APP
d3dpp->BackBufferWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
d3dpp->BackBufferHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
#endif // VLC_WINSTORE_APP
}
int D3D9_ResetDevice(vlc_object_t *o, d3d9_decoder_device_t *dec_dev)
......
......@@ -48,7 +48,7 @@ void CommonInit(display_win32_area_t *area, const video_format_t *src_fmt)
area->src_fmt = src_fmt;
}
#ifndef VLC_WINSTORE_APP
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
/* */
int CommonWindowInit(vout_display_t *vd, display_win32_area_t *area,
bool projection_gestures)
......@@ -70,7 +70,7 @@ HWND CommonVideoHWND(const display_win32_area_t *area)
{
return EventThreadVideoHWND(area->event);
}
#endif /* !VLC_WINSTORE_APP */
#endif /* WINAPI_PARTITION_DESKTOP */
/*****************************************************************************
* UpdateRects: update clipping rectangles
......@@ -101,25 +101,25 @@ void CommonPlacePicture(vout_display_t *vd, display_win32_area_t *area)
}
}
#ifndef VLC_WINSTORE_APP
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
/* */
void CommonWindowClean(display_win32_area_t *sys)
{
EventThreadDestroy(sys->event);
}
#endif /* !VLC_WINSTORE_APP */
#endif /* WINAPI_PARTITION_DESKTOP */
void CommonControl(vout_display_t *vd, display_win32_area_t *area, int query)
{
switch (query) {
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
#ifndef VLC_WINSTORE_APP
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
// Update dimensions
if (area->event != NULL)
{
EventThreadUpdateSize(area->event);
}
#endif /* !VLC_WINSTORE_APP */
#endif /* WINAPI_PARTITION_DESKTOP */
// fallthrough
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
case VOUT_DISPLAY_CHANGE_ZOOM:
......