2.0.0.2:

 - Change project compilation settings.
 - ogl_consumer: No longer blocks frame rendering pipeline.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@684 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/common.vcxproj b/common/common.vcxproj
index 4432c2f0d6e60069b1d111384c84816688c90a74..9007bee22463cc6ed3471dfde7c352d76dd6ee5b 100644 (file)
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -187,7 +187,7 @@
       <ExceptionHandling>Async</ExceptionHandling>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
       <WholeProgramOptimization>false</WholeProgramOptimization>\r

diff --git a/common/compiler/vs/disable_silly_warnings.h b/common/compiler/vs/disable_silly_warnings.h
index a1ebe2d782273797742b3fed05f9fda24141a8f1..095e4826d77d3f9aa728a8ba62fb37bc2bacd598 100644 (file)
--- a/common/compiler/vs/disable_silly_warnings.h
+++ b/common/compiler/vs/disable_silly_warnings.h
@@ -29,5 +29,6 @@
 #pragma warning (disable : 4512) // assignment operator could not be generated\r
 #pragma warning (disable : 4702) //  unreachable code\r
 #pragma warning (disable : 4714) // marked as __forceinline not inlined\r
+#pragma warning (disable : 4505) //  unreferenced local function has been removed\r
 #endif\r
 \r

diff --git a/core/core.vcxproj b/core/core.vcxproj
index c2aae767d7a7ded708932adc73f18c0c1e90ae45..01b1aec250eb0b45062a0b55aaccacbb0e3bf3a0 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -217,7 +217,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/modules/bluefish/bluefish.vcxproj b/modules/bluefish/bluefish.vcxproj
index a562e8af307900833b6d46a9b3936ce87f97ea92..8d12be0775ccfaaaae723208231edcc975975102 100644 (file)
--- a/modules/bluefish/bluefish.vcxproj
+++ b/modules/bluefish/bluefish.vcxproj
@@ -209,7 +209,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/modules/decklink/decklink.vcxproj b/modules/decklink/decklink.vcxproj
index febe37dd9f856846b2e20bbcc02151c76f8e754f..52672adc2b881dbd96ca1309c04f23367a9b99f6 100644 (file)
--- a/modules/decklink/decklink.vcxproj
+++ b/modules/decklink/decklink.vcxproj
@@ -193,7 +193,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/modules/ffmpeg/ffmpeg.vcxproj b/modules/ffmpeg/ffmpeg.vcxproj
index 2dd810910848d7f3c4f04943e1d30a14b6cb85e7..8730803ab6295a751d48962d75267179937bd10e 100644 (file)
--- a/modules/ffmpeg/ffmpeg.vcxproj
+++ b/modules/ffmpeg/ffmpeg.vcxproj
@@ -217,7 +217,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/modules/flash/flash.vcxproj b/modules/flash/flash.vcxproj
index eafa30d9bf9f4132f7df8cbe983c59121cb9e407..460b06188200bcebc6d82a3e7c95a895f27bf4a5 100644 (file)
--- a/modules/flash/flash.vcxproj
+++ b/modules/flash/flash.vcxproj
@@ -193,7 +193,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/modules/image/image.vcxproj b/modules/image/image.vcxproj
index 0061564aaf9ce6130072c45801b9f7091d900530..2e1c8bde9aca216fd7624a7c4ee76503bdf463f7 100644 (file)
--- a/modules/image/image.vcxproj
+++ b/modules/image/image.vcxproj
@@ -193,7 +193,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/modules/oal/oal.vcxproj b/modules/oal/oal.vcxproj
index 468867c43a4ec1ce52f6f25fde065ba82ea29ba8..b9ddfc4eef98cf3e0262bf46fe97a66cf095de46 100644 (file)
--- a/modules/oal/oal.vcxproj
+++ b/modules/oal/oal.vcxproj
@@ -193,7 +193,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index e52674152f47c5777791a11cf788a67b474e3256..cd263460161dfa86add4371ac93ed76150cb597b 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -46,7 +46,6 @@ namespace caspar {
 \r
 struct ogl_consumer::implementation : boost::noncopyable\r
 {              \r
-       boost::timer clock_;\r
        boost::unique_future<void> active_;\r
                \r
        float width_;\r
@@ -81,6 +80,7 @@ public:
                , graph_(diagnostics::create_graph(narrow(print())))\r
                , executor_(print())\r
        {               \r
+               executor_.set_capacity(3);\r
                graph_->add_guide("frame-time", 0.5);\r
                graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
        }\r
@@ -177,7 +177,6 @@ public:
                        glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, format_desc_.size, 0, GL_STREAM_DRAW_ARB);\r
                        glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);\r
                });\r
-               active_ = executor_.begin_invoke([]{});\r
                CASPAR_LOG(info) << print() << " Sucessfully initialized.";\r
        }\r
 \r
@@ -272,8 +271,10 @@ public:
                \r
        void send(const safe_ptr<const core::read_frame>& frame)\r
        {\r
-               active_.get();\r
-               active_ = executor_.begin_invoke([=]\r
+               if(executor_.size() >= executor_.capacity()-1)\r
+                       return;\r
+\r
+               executor_.begin_invoke([=]\r
                {\r
                        perf_timer_.restart();\r
                        sf::Event e;\r

diff --git a/modules/ogl/ogl.vcxproj b/modules/ogl/ogl.vcxproj
index 7fbe3e797595f724212fae5fb6b349340ed3cff8..e9c1b37049a48b9435e640d4d01c67f1ae22c368 100644 (file)
--- a/modules/ogl/ogl.vcxproj
+++ b/modules/ogl/ogl.vcxproj
@@ -217,7 +217,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/modules/silverlight/silverlight.vcxproj b/modules/silverlight/silverlight.vcxproj
index 89e8e2d5ca03615d55daf2f11e8b41661b24bb8a..acb7ba49a052218004d3d78c492861f5efceb7ed 100644 (file)
--- a/modules/silverlight/silverlight.vcxproj
+++ b/modules/silverlight/silverlight.vcxproj
@@ -193,7 +193,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/protocol/protocol.vcxproj b/protocol/protocol.vcxproj
index f76a898e7b17d5af7e4a4603c50ddc1bc87e25f0..072ade50a1b80d2a86ec654b6d333ea1fc0413a2 100644 (file)
--- a/protocol/protocol.vcxproj
+++ b/protocol/protocol.vcxproj
@@ -269,6 +269,7 @@
       <ExceptionHandling>Async</ExceptionHandling>\r
       <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 695b53cd3ee25fba8ec1dcdff6801951502a93c2..fb194c6a2d4aded91cc8152d865f19ae6a7e103f 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -321,9 +321,9 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>\r
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories>\r
       <ExceptionHandling>Async</ExceptionHandling>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r