Skip to content
Snippets Groups Projects
Commit 63e8cc8e authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

init gnutls in ringaccount ctor, re-order pixel_formats

Change-Id: I00640e8d10e72093b83f6791eb09ee507cde8b2f
parent 5e54047c
No related branches found
No related tags found
No related merge requests found
......@@ -415,7 +415,8 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
<SDLCheck>
</SDLCheck>
<AdditionalIncludeDirectories>..\..\FFmpegInterop\ffmpeg\Build\Windows10\x64\include;$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\iax;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib;$(ProjectDir)..\contrib\include;$(ProjectDir)..\contrib\include\pjlib;$(ProjectDir)..\..\libav;$(ProjectDir)..\..\libsamplerate-0.1.8\src;$(ProjectDir)..\..\libsamplerate-0.1.8\Win32;$(ProjectDir)..\contrib\pjproject\pjlib\include;$(ProjectDir)..\contrib\pjproject\pjnath\include;$(ProjectDir)..\contrib\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\pjproject\pjsip\include;$(ProjectDir)..\contrib\pjproject\third_party\speex\include;$(ProjectDir)..\contrib\pjproject\third_party;$(ProjectDir)..\contrib\pjproject\pjmedia\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\speexdsp\include;$(ProjectDir)..\..\libsndfile-MSVC\src;$(ProjectDir)..\..\pcre;$(ProjectDir)..\..\ffmpeg;$(ProjectDir)..\contrib\boost;$(ProjectDir)..\contrib\cryptopp;$(ProjectDir)..\..\restbed\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BOOST_SYSTEM_NO_DEPRECATED;PJ_OS_HAS_CHECK_STACK=1;STATIC_GETOPT;_USE_MATH_DEFINES;PCRE_STATIC;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4996;4503;4180;4244;4267;</DisableSpecificWarnings>
......@@ -423,6 +424,7 @@
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
<BufferSecurityCheck>false</BufferSecurityCheck>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
......
......@@ -46,10 +46,10 @@ typedef struct {
// have all formats map to bgra
static const std::array<uwp_fmt, 4> uwp_formats {
uwp_fmt { "NV12", VIDEO_PIXFMT_BGRA },
uwp_fmt { "MJPG", VIDEO_PIXFMT_BGRA },
uwp_fmt { "RGB24", VIDEO_PIXFMT_BGRA },
uwp_fmt { "NV12", VIDEO_PIXFMT_BGRA },
uwp_fmt { "YUY2", VIDEO_PIXFMT_BGRA }
uwp_fmt { "YUY2", VIDEO_PIXFMT_BGRA },
};
class VideoDeviceImpl {
......
......@@ -175,6 +175,9 @@ RingAccount::RingAccount(const std::string& accountID, bool /* presenceEnabled *
dataPath_(cachePath_ + DIR_SEPARATOR_STR "values"),
idPath_(fileutils::get_data_dir()+DIR_SEPARATOR_STR+getAccountID())
{
#ifdef WIN32_NATIVE
//gnutls_global_init();
#endif
}
RingAccount::~RingAccount()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment