2.0. Updated namespaces.

[casparcg] / modules / ffmpeg / ffmpeg.cpp

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 6dfb68b6a0fb708bb541ffb1cadeda9d7e595862..87e1e00833d8308f08941dcb4e6e5eeddc33b14c 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -46,7 +46,7 @@ extern "C"
        #include <libavfilter/avfilter.h>\r
 }\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
 int ffmpeg_lock_callback(void **mutex, enum AVLockOp op) \r
 { \r
@@ -135,12 +135,23 @@ void log_callback(void* ptr, int level, const char* fmt, va_list vl)
     strcpy(prev, line);\r
     sanitize((uint8_t*)line);\r
        \r
-       CASPAR_LOG(trace) << L"[FFMPEG] [" << av_clip(level>>3, 0, 6) << L"] " << line;\r
+       if(level == AV_LOG_DEBUG)\r
+               CASPAR_LOG(debug) << L"[ffmpeg] " << line;\r
+       else if(level == AV_LOG_INFO)\r
+               CASPAR_LOG(info) << L"[ffmpeg] " << line;\r
+       else if(level == AV_LOG_WARNING)\r
+               CASPAR_LOG(warning) << L"[ffmpeg] " << line;\r
+       else if(level == AV_LOG_ERROR)\r
+               CASPAR_LOG(error) << L"[ffmpeg] " << line;\r
+       else if(level == AV_LOG_FATAL)\r
+               CASPAR_LOG(fatal) << L"[ffmpeg] " << line;\r
+       else\r
+               CASPAR_LOG(trace) << L"[ffmpeg] " << line;\r
 \r
     //colored_fputs(av_clip(level>>3, 0, 6), line);\r
 }\r
 \r
-void init_ffmpeg()\r
+void init()\r
 {\r
     avfilter_register_all();\r
        av_register_all();\r
@@ -149,11 +160,11 @@ void init_ffmpeg()
        av_lockmgr_register(ffmpeg_lock_callback);\r
        av_log_set_callback(log_callback);\r
        \r
-       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ffmpeg_consumer(params);});\r
-       core::register_producer_factory(create_ffmpeg_producer);\r
+       //core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ffmpeg_consumer(params);});\r
+       core::register_producer_factory(create_producer);\r
 }\r
 \r
-void uninit_ffmpeg()\r
+void uninit()\r
 {\r
        avfilter_uninit();\r
        av_lockmgr_register(nullptr);\r
@@ -191,4 +202,4 @@ std::wstring get_swscale_version()
        return make_version(swscale_version());\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file