2.0. image_kernel: Don't render fully transparent frames.

     ffmeg: Started working on yadif deinterlacer.

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

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index 63c815f1723b9cb33d47086e60525d1c122329ea..35d17e9269f355d661866066b976d6c87b8d6edf 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -320,6 +320,9 @@ image_kernel::image_kernel() : impl_(new implementation()){}
 \r
 void image_kernel::draw(size_t width, size_t height, const core::pixel_format_desc& pix_desc, const core::image_transform& transform, bool local_key, bool layer_key)\r
 {\r
+       if(transform.get_opacity() < 0.001)\r
+               return;\r
+\r
        GL(glEnable(GL_TEXTURE_2D));\r
        GL(glDisable(GL_DEPTH_TEST));   \r
 \r

diff --git a/modules/decklink/interop/DeckLinkAPI_h.h b/modules/decklink/interop/DeckLinkAPI_h.h
index 95d4c333fc3e8ed0edbbb49bf62091c6cd1ccc4e..6042be118bc8fe5037f75a723b1d05c7e5baed6f 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPI_h.h
+++ b/modules/decklink/interop/DeckLinkAPI_h.h
@@ -4,7 +4,7 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Tue Jun 14 09:26:37 2011\r
+/* at Sat Jun 18 14:20:31 2011\r
  */\r
 /* Compiler settings for interop\DeckLinkAPI.idl:\r
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r

diff --git a/modules/decklink/interop/DeckLinkAPI_i.c b/modules/decklink/interop/DeckLinkAPI_i.c
index f14b03cc431bf7fca4b8314d4940326dae21718f..778f32b94e460afc3bcebe0783977e363d0aca28 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPI_i.c
+++ b/modules/decklink/interop/DeckLinkAPI_i.c
@@ -6,7 +6,7 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Tue Jun 14 09:26:37 2011\r
+/* at Sat Jun 18 14:20:31 2011\r
  */\r
 /* Compiler settings for interop\DeckLinkAPI.idl:\r
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index ad416eebdd6dbd6d243f9dec8b35ed4389cce796..837b8376dde126c9bddcb057f4d79711632f9c8e 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -81,8 +81,10 @@ int ffmpeg_lock_callback(void **mutex, enum AVLockOp op)
 \r
 void init_ffmpeg()\r
 {\r
+    avfilter_register_all();\r
        av_register_all();\r
        avcodec_init();\r
+    avcodec_register_all();\r
        av_lockmgr_register(ffmpeg_lock_callback);\r
        \r
        core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ffmpeg_consumer(params);});\r
@@ -91,6 +93,7 @@ void init_ffmpeg()
 \r
 void uninit_ffmpeg()\r
 {\r
+       avfilter_uninit();\r
        av_lockmgr_register(nullptr);\r
 }\r
 \r

diff --git a/modules/ffmpeg/ffmpeg.vcxproj b/modules/ffmpeg/ffmpeg.vcxproj
index 623f7065b259524b6e4f5d07224a9d7ae206bdae..4d4e64301896aa009b31a187f7acc4dea6789173 100644 (file)
--- a/modules/ffmpeg/ffmpeg.vcxproj
+++ b/modules/ffmpeg/ffmpeg.vcxproj
@@ -305,6 +305,12 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="tbb_avcodec.cpp" />\r
+    <ClCompile Include="util\deinterlacer.cpp">\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="consumer\ffmpeg_consumer.h" />\r
@@ -316,6 +322,7 @@
     <ClInclude Include="producer\video\video_decoder.h" />\r
     <ClInclude Include="StdAfx.h" />\r
     <ClInclude Include="tbb_avcodec.h" />\r
+    <ClInclude Include="util\deinterlacer.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\..\common\common.vcxproj">\r

diff --git a/modules/ffmpeg/ffmpeg.vcxproj.filters b/modules/ffmpeg/ffmpeg.vcxproj.filters
index 4a2c14912dacce9f8cfd67e98eb195260410ba70..43a8d2601917b31dc0425d0460937f919ce30772 100644 (file)
--- a/modules/ffmpeg/ffmpeg.vcxproj.filters
+++ b/modules/ffmpeg/ffmpeg.vcxproj.filters
@@ -16,6 +16,9 @@
     <Filter Include="source\producer\audio">\r
       <UniqueIdentifier>{6937307b-550f-48f8-9cc0-509de0e18ddc}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="source\util">\r
+      <UniqueIdentifier>{dbf0125b-6087-4b63-94b0-8d652b12a2ca}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="producer\ffmpeg_producer.cpp">\r
@@ -40,6 +43,9 @@
     <ClCompile Include="ffmpeg.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="util\deinterlacer.cpp">\r
+      <Filter>source\util</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="producer\ffmpeg_producer.h">\r
@@ -67,5 +73,8 @@
     <ClInclude Include="ffmpeg.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="util\deinterlacer.h">\r
+      <Filter>source\util</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file