git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 830461d5b9841ca7a31c73bc28e0285033b1c88a..3cf7e50107fcc7ad38a2acf8de243e6569b9ac27 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -23,6 +23,7 @@
 \r
 #include <boost/noncopyable.hpp>\r
 \r
+#include <algorithm>\r
 #include <functional>\r
 #include <string>\r
 #include <vector>\r
@@ -72,4 +73,21 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>&, c
 \r
 safe_ptr<core::frame_producer> create_destroy_producer_proxy(executor& destroy_context, const safe_ptr<frame_producer>& producer);\r
 \r
+template<typename T>\r
+typename std::decay<T>::type get_param(const std::wstring& name, const std::vector<std::wstring>& params, T fail_value)\r
+{      \r
+       auto it = std::find(params.begin(), params.end(), name);\r
+       if(it == params.end() || ++it == params.end())  \r
+               return fail_value;\r
+       \r
+       T value = fail_value;\r
+       try\r
+       {\r
+               value = boost::lexical_cast<std::decay<T>::type>(*it);\r
+       }\r
+       catch(boost::bad_lexical_cast&){}\r
+\r
+       return value;\r
+}\r
+\r
 }}\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 3db902f5fe64b8e93776972bebce1a95e3de7e65..d20cbaca4f0a73f4d0280d3e121e1720b8ccdbd1 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -36,6 +36,7 @@
 #include <core/producer/frame/frame_factory.h>\r
 #include <core/producer/frame/basic_frame.h>\r
 \r
+#include <boost/algorithm/string.hpp>\r
 #include <boost/assign.hpp>\r
 #include <boost/timer.hpp>\r
 #include <boost/foreach.hpp>\r
@@ -204,7 +205,19 @@ public:
 safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 {              \r
        static const std::vector<std::wstring> extensions = boost::assign::list_of\r
-               (L"mpg")(L"mpeg")(L"avi")(L"mov")(L"qt")(L"webm")(L"dv")(L"mp4")(L"f4v")(L"flv")(L"mkv")(L"mka")(L"wmv")(L"wma")(L"ogg")(L"divx")(L"xvid")(L"wav")(L"mp3")(L"m2v");\r
+               (L"mpg")(L"mpeg")(L"m2v")(L"m4v")(L"mp3")(L"mp4")(L"mpga")\r
+               (L"avi")\r
+               (L"mov")\r
+               (L"qt")\r
+               (L"webm")\r
+               (L"dv")         \r
+               (L"f4v")(L"flv")\r
+               (L"mkv")(L"mka")\r
+               (L"wmv")(L"wma")(L"wav")\r
+               (L"rm")(L"ram")\r
+               (L"ogg")(L"ogv")(L"oga")(L"ogx")\r
+               (L"divx")(L"xvid");\r
+\r
        std::wstring filename = env::media_folder() + L"\\" + params[0];\r
        \r
        auto ext = boost::find_if(extensions, [&](const std::wstring& ex)\r
@@ -215,35 +228,16 @@ safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame
        if(ext == extensions.end())\r
                return core::frame_producer::empty();\r
 \r
-       std::wstring path = filename + L"." + *ext;\r
-       bool loop = boost::find(params, L"LOOP") != params.end();\r
-\r
-       size_t start = 0;\r
-       size_t length = std::numeric_limits<size_t>::max();\r
-       \r
-       auto seek_it = boost::find(params, L"SEEK");\r
-       if(seek_it != params.end())\r
-       {\r
-               if(++seek_it != params.end())\r
-                       start = boost::lexical_cast<size_t>(*seek_it);\r
-       }\r
+       auto path               = filename + L"." + *ext;\r
+       auto loop               = boost::range::find(params, L"LOOP") != params.end();\r
+       auto start              = core::get_param(L"SEEK", params, 0);\r
+       auto length             = core::get_param(L"LENGTH", params, std::numeric_limits<size_t>::max());\r
+       auto filter_str = core::get_param<std::wstring>(L"FILTER", params, L"");        \r
+               \r
+       boost::replace_all(filter_str, L"DEINTERLACE", L"YADIF=0:-1");\r
+       boost::replace_all(filter_str, L"DEINTERLACE_BOB", L"YADIF=1:-1");\r
        \r
-       auto length_it = boost::find(params, L"LENGTH");\r
-       if(length_it != params.end())\r
-       {\r
-               if(++length_it != params.end())\r
-                       length = boost::lexical_cast<size_t>(*length_it);\r
-       }\r
-\r
-       std::wstring filter = L"";\r
-       auto filter_it = boost::find(params, L"FILTER");\r
-       if(filter_it != params.end())\r
-       {\r
-               if(++filter_it != params.end())\r
-                       filter = *filter_it;\r
-       }\r
-\r
-       return make_safe<ffmpeg_producer>(frame_factory, path, filter, loop, start, length);\r
+       return make_safe<ffmpeg_producer>(frame_factory, path, filter_str, loop, start, length);\r
 }\r
 \r
 }
\ No newline at end of file

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index 6fb766cfe7102aaaf7580eb8cafe795b401c6f4b..7186dc74c3db129e6432a822b059b2e922d033e4 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -125,7 +125,7 @@ public:
 \r
 safe_ptr<core::frame_consumer> create_oal_consumer(const std::vector<std::wstring>& params)\r
 {\r
-       if(params.size() < 1 || params[0] != L"OAL")\r
+       if(params.size() < 1 || params[0] != L"AUDIO")\r
                return core::frame_consumer::empty();\r
 \r
        return make_safe<oal_consumer>();\r