On Thu, Aug 10, 2017 at 10:42 AM, <bha...@multicorewareinc.com> wrote:
> # HG changeset patch > # User Bhavna Hariharan <bha...@multicorewareinc.com> > # Date 1502196995 -19800 > # Tue Aug 08 18:26:35 2017 +0530 > # Node ID 4a2866922bb8241c90a1b76e4829ba0d1783097f > # Parent 3a4f36d1501a955db00e5d181210dcc472e61529 > testbench: include intrinsics header corresponding to target architecture > > Display warning when dhdr10 is enabled with MSVC version that does not > support c++11. > Pushed to default branch. > > diff -r 3a4f36d1501a -r 4a2866922bb8 source/CMakeLists.txt > --- a/source/CMakeLists.txt Fri Jul 28 12:19:16 2017 +0530 > +++ b/source/CMakeLists.txt Tue Aug 08 18:26:35 2017 +0530 > @@ -184,6 +184,9 @@ > endif() > # this option is to enable the inclusion of dynamic HDR10 library to the > libx265 compilation > option(ENABLE_HDR10_PLUS "Enable dynamic HDR10 compilation" OFF) > +if(MSVC AND (MSVC_VERSION LESS 1800) AND ENABLE_HDR10_PLUS) > + message(FATAL_ERROR "MSVC version 12.0 or above required to support > hdr10plus") > +endif() > if(GCC) > add_definitions(-Wall -Wextra -Wshadow) > add_definitions(-D__STDC_LIMIT_MACROS=1) > diff -r 3a4f36d1501a -r 4a2866922bb8 source/dynamicHDR10/ > metadataFromJson.cpp > --- a/source/dynamicHDR10/metadataFromJson.cpp Fri Jul 28 12:19:16 2017 > +0530 > +++ b/source/dynamicHDR10/metadataFromJson.cpp Tue Aug 08 18:26:35 2017 > +0530 > @@ -33,11 +33,7 @@ > > #include "BasicStructures.h" > #include "SeiMetadataDictionary.h" > - > -#define M_PI 3.14159265358979323846 > - > using namespace SeiMetadataDictionary; > - > class metadataFromJson::DynamicMetaIO > { > public: > diff -r 3a4f36d1501a -r 4a2866922bb8 source/test/testharness.h > --- a/source/test/testharness.h Fri Jul 28 12:19:16 2017 +0530 > +++ b/source/test/testharness.h Tue Aug 08 18:26:35 2017 +0530 > @@ -68,6 +68,10 @@ > #include <intrin.h> > #elif HAVE_RDTSC > #include <intrin.h> > +#elif (!defined(__APPLE__) && (defined (__GNUC__) && (defined(__x86_64__) > || defined(__i386__)))) > +#include <x86intrin.h> > +#elif ( !defined(__APPLE__) && defined (__GNUC__) && > defined(__ARM_NEON__)) > +#include <arm_neon.h> > #elif defined(__GNUC__) > /* fallback for older GCC/MinGW */ > static inline uint32_t __rdtsc(void) > > _______________________________________________ > x265-devel mailing list > x265-devel@videolan.org > https://mailman.videolan.org/listinfo/x265-devel > >
_______________________________________________ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel