[ffmpeg_consumer] Retired old implementation in favour of the now updated streaming_c...

[casparcg] / modules / ffmpeg / ffmpeg.cpp

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 9073fdc393969ed96abd70227bce56d4eea4d5eb..9f9dc549fcc8e57c86ae87793579a901b6588734 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -24,7 +24,6 @@
 #include "ffmpeg.h"
 
 #include "consumer/ffmpeg_consumer.h"
-#include "consumer/streaming_consumer.h"
 #include "producer/ffmpeg_producer.h"
 #include "producer/util/util.h"
 
@@ -114,6 +113,8 @@ void log_callback(void* ptr, int level, const char* fmt, va_list vl)
        static char prev[1024];
        char line[8192];
        AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
+       if (level > AV_LOG_DEBUG)
+               return;
        line[0]=0;
 
 #undef fprintf
@@ -139,18 +140,24 @@ void log_callback(void* ptr, int level, const char* fmt, va_list vl)
        if(len > 0)
                line[len-1] = 0;
 
-       if(level == AV_LOG_DEBUG)
-               CASPAR_LOG(debug) << L"[ffmpeg] " << line;
-       else if(level == AV_LOG_INFO)
-               CASPAR_LOG(info) << L"[ffmpeg] " << line;
-       else if(level == AV_LOG_WARNING)
-               CASPAR_LOG(warning) << L"[ffmpeg] " << line;
-       else if(level == AV_LOG_ERROR)
-               CASPAR_LOG(error) << L"[ffmpeg] " << line;
-       else if(level == AV_LOG_FATAL)
-               CASPAR_LOG(fatal) << L"[ffmpeg] " << line;
-       else
-               CASPAR_LOG(trace) << L"[ffmpeg] " << line;
+       try
+       {
+               if (level == AV_LOG_VERBOSE)
+                       CASPAR_LOG(debug) << L"[ffmpeg] " << line;
+               else if (level == AV_LOG_INFO)
+                       CASPAR_LOG(info) << L"[ffmpeg] " << line;
+               else if (level == AV_LOG_WARNING)
+                       CASPAR_LOG(warning) << L"[ffmpeg] " << line;
+               else if (level == AV_LOG_ERROR)
+                       CASPAR_LOG(error) << L"[ffmpeg] " << line;
+               else if (level == AV_LOG_FATAL)
+                       CASPAR_LOG(fatal) << L"[ffmpeg] " << line;
+               else
+                       CASPAR_LOG(trace) << L"[ffmpeg] " << line;
+       }
+       catch (...)
+       {
+       }
 }
 
 std::wstring make_version(unsigned int ver)
@@ -245,10 +252,8 @@ void init(core::module_dependencies dependencies)
 
        auto info_repo = dependencies.media_info_repo;
 
-       dependencies.consumer_registry->register_consumer_factory(L"FFmpeg Consumer", create_consumer, describe_consumer);
-       dependencies.consumer_registry->register_consumer_factory(L"Streaming Consumer", create_streaming_consumer, describe_streaming_consumer);
-       dependencies.consumer_registry->register_preconfigured_consumer_factory(L"file", create_preconfigured_consumer);
-       dependencies.consumer_registry->register_preconfigured_consumer_factory(L"stream", create_preconfigured_streaming_consumer);
+       dependencies.consumer_registry->register_consumer_factory(L"FFmpeg Consumer", create_ffmpeg_consumer, describe_ffmpeg_consumer);
+       dependencies.consumer_registry->register_preconfigured_consumer_factory(L"ffmpeg", create_preconfigured_ffmpeg_consumer);
        dependencies.producer_registry->register_producer_factory(L"FFmpeg Producer", boost::bind(&create_producer, _1, _2, info_repo), describe_producer);
        dependencies.producer_registry->register_thumbnail_producer(boost::bind(&create_thumbnail_frame, _1, _2, info_repo));