2.0. Renamed scalable_yadif to parallel_yadif.

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

diff --git a/modules/ffmpeg/ffmpeg.vcxproj b/modules/ffmpeg/ffmpeg.vcxproj
index 892ef7b713d7de68e07a7a2eb101c57e1458fcd0..88c40fb98dd245f9abd6f67d4da85445e31729b3 100644 (file)
--- a/modules/ffmpeg/ffmpeg.vcxproj
+++ b/modules/ffmpeg/ffmpeg.vcxproj
@@ -292,7 +292,7 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
     </ClCompile>\r
-    <ClCompile Include="producer\filter\scalable_yadif.cpp">\r
+    <ClCompile Include="producer\filter\parallel_yadif.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
@@ -331,7 +331,7 @@
     <ClInclude Include="producer\audio\audio_decoder.h" />\r
     <ClInclude Include="producer\ffmpeg_producer.h" />\r
     <ClInclude Include="producer\filter\filter.h" />\r
-    <ClInclude Include="producer\filter\scalable_yadif.h" />\r
+    <ClInclude Include="producer\filter\parallel_yadif.h" />\r
     <ClInclude Include="producer\frame_muxer.h" />\r
     <ClInclude Include="producer\input.h" />\r
     <ClInclude Include="producer\util.h" />\r

diff --git a/modules/ffmpeg/ffmpeg.vcxproj.filters b/modules/ffmpeg/ffmpeg.vcxproj.filters
index 2b2948849e54ed7437a5bac3d63e65166959d97b..18830bbdd16e3566481cae865bb5912594b0cbf9 100644 (file)
--- a/modules/ffmpeg/ffmpeg.vcxproj.filters
+++ b/modules/ffmpeg/ffmpeg.vcxproj.filters
@@ -49,7 +49,7 @@
     <ClCompile Include="producer\frame_muxer.cpp">\r
       <Filter>source\producer</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="producer\filter\scalable_yadif.cpp">\r
+    <ClCompile Include="producer\filter\parallel_yadif.cpp">\r
       <Filter>source\producer\filter</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
@@ -88,7 +88,7 @@
     <ClInclude Include="producer\frame_muxer.h">\r
       <Filter>source\producer</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="producer\filter\scalable_yadif.h">\r
+    <ClInclude Include="producer\filter\parallel_yadif.h">\r
       <Filter>source\producer\filter</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r

diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index d5918f0b97c191a3128654e479716c096bfe2a67..57fa4885f36a548e78be5244dbbf320cae4e053b 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -2,7 +2,7 @@
 \r
 #include "filter.h"\r
 \r
-#include "scalable_yadif.h"\r
+#include "parallel_yadif.h"\r
 \r
 #include "../../ffmpeg_error.h"\r
 \r
@@ -39,18 +39,18 @@ struct filter::implementation
        std::shared_ptr<AVFilterGraph>  graph_; \r
        AVFilterContext*                                buffersink_ctx_;\r
        AVFilterContext*                                buffersrc_ctx_;\r
-       int                                                             scalable_yadif_tag_;\r
+       int                                                             parallel_yadif_tag_;\r
                \r
        implementation(const std::wstring& filters) \r
                : filters_(filters.empty() ? "null" : narrow(filters))\r
-               , scalable_yadif_tag_(-1)\r
+               , parallel_yadif_tag_(-1)\r
        {\r
                std::transform(filters_.begin(), filters_.end(), filters_.begin(), ::tolower);\r
        }\r
 \r
        ~implementation()\r
        {\r
-               release_scalable_yadif(scalable_yadif_tag_);\r
+               uninit_parallel_yadif(parallel_yadif_tag_);\r
        }\r
 \r
        std::vector<safe_ptr<AVFrame>> execute(const std::shared_ptr<AVFrame>& frame)\r
@@ -136,7 +136,7 @@ struct filter::implementation
                        {\r
                                auto filter_name = graph_->filters[n]->name;\r
                                if(strstr(filter_name, "yadif") != 0)\r
-                                       scalable_yadif_tag_ = make_scalable_yadif(graph_->filters[n]);\r
+                                       parallel_yadif_tag_ = init_parallel_yadif(graph_->filters[n]);\r
                        }\r
                }\r
        \r

diff --git a/modules/ffmpeg/producer/filter/scalable_yadif.cpp b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
similarity index 81%
rename from modules/ffmpeg/producer/filter/scalable_yadif.cpp
rename to modules/ffmpeg/producer/filter/parallel_yadif.cpp
index 1dee933bdabcb7b463d43f44545b9a88af606840..4b2483ba95bd06bd5a70c3d3281c8dea9c568cc9 100644 (file)
--- a/modules/ffmpeg/producer/filter/scalable_yadif.cpp
+++ b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
@@ -1,6 +1,6 @@
 #include "../../StdAfx.h"\r
 \r
-#include "scalable_yadif.h"\r
+#include "parallel_yadif.h"\r
 \r
 extern "C" \r
 {\r
@@ -24,7 +24,7 @@ typedef struct {
     //const AVPixFmtDescriptor *csp;\r
 } YADIFContext;\r
 \r
-struct scalable_yadif_context\r
+struct parallel_yadif_context\r
 {\r
        struct arg\r
        {\r
@@ -42,14 +42,14 @@ struct scalable_yadif_context
        arg     args[64];\r
        int     index;\r
 \r
-       scalable_yadif_context() : index(0){}\r
+       parallel_yadif_context() : index(0){}\r
 };\r
 \r
 void (*org_yadif_filter_line)(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int prefs, int mrefs, int parity, int mode) = 0;\r
 \r
-void scalable_yadif_filter_line(scalable_yadif_context& ctx, uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int prefs, int mrefs, int parity, int mode)\r
+void parallel_yadif_filter_line(parallel_yadif_context& ctx, uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int prefs, int mrefs, int parity, int mode)\r
 {\r
-       scalable_yadif_context::arg arg = {dst, prev, cur, next, w, prefs, mrefs, parity, mode};\r
+       parallel_yadif_context::arg arg = {dst, prev, cur, next, w, prefs, mrefs, parity, mode};\r
        ctx.args[ctx.index++] = arg;\r
        \r
        if(ctx.index == 64)\r
@@ -68,8 +68,8 @@ void scalable_yadif_filter_line(scalable_yadif_context& ctx, uint8_t *dst, uint8
 #define ff(x) \\r
 void RENAME(x)(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int prefs, int mrefs, int parity, int mode) \\r
 {\\r
-       static scalable_yadif_context ctx;\\r
-       scalable_yadif_filter_line(ctx, dst, prev, cur, next, w, prefs, mrefs, parity, mode);\\r
+       static parallel_yadif_context ctx;\\r
+       parallel_yadif_filter_line(ctx, dst, prev, cur, next, w, prefs, mrefs, parity, mode);\\r
 }\r
 \r
 ff(0); ff(1); ff(2); ff(3); ff(4); ff(5); ff(6); ff(7); ff(8); ff(9); ff(10); ff(11); ff(12); ff(13); ff(14); ff(15); ff(16); ff(17);\r
@@ -82,16 +82,16 @@ namespace caspar {
        \r
 tbb::concurrent_bounded_queue<int> tags;\r
 \r
-void init()\r
+void init_pool()\r
 {\r
        for(int n = 0; n < 18; ++n)\r
                tags.push(n);\r
 }\r
 \r
-int make_scalable_yadif(AVFilterContext* ctx)\r
+int init(AVFilterContext* ctx)\r
 {\r
        static boost::once_flag flag = BOOST_ONCE_INIT;\r
-       boost::call_once(&init, flag);\r
+       boost::call_once(&init_pool, flag);\r
 \r
        YADIFContext* yadif = (YADIFContext*)ctx->priv;\r
        org_yadif_filter_line = yadif->filter_line; // Data race is not a problem.\r
@@ -107,7 +107,7 @@ int make_scalable_yadif(AVFilterContext* ctx)
        return tag;\r
 }\r
 \r
-void release_scalable_yadif(int tag)\r
+void uninit(int tag)\r
 {\r
        if(tag != -1)\r
                tags.push(tag);\r

diff --git a/modules/ffmpeg/producer/filter/parallel_yadif.h b/modules/ffmpeg/producer/filter/parallel_yadif.h
new file mode 100644 (file)
index 0000000..8c93a22
--- /dev/null
+++ b/modules/ffmpeg/producer/filter/parallel_yadif.h
@@ -0,0 +1,10 @@
+#pragma once\r
+\r
+struct AVFilterContext;\r
+\r
+namespace caspar {\r
+       \r
+int init_parallel_yadif(AVFilterContext* ctx);\r
+void uninit_parallel_yadif(int tag);\r
+\r
+}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/filter/scalable_yadif.h b/modules/ffmpeg/producer/filter/scalable_yadif.h
deleted file mode 100644 (file)
index 0b61b8d..0000000
--- a/modules/ffmpeg/producer/filter/scalable_yadif.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once\r
-\r
-struct AVFilterContext;\r
-\r
-namespace caspar {\r
-       \r
-int make_scalable_yadif(AVFilterContext* ctx);\r
-void release_scalable_yadif(int tag);\r
-\r
-}
\ No newline at end of file