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

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index bb89cea857c1884b046d937a31f78f2e38fa9fb8..31cc810a88095b18ac4fea781885ca5f96a81bd9 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -146,22 +146,15 @@ public:
                file_write_executor_.stop();\r
                file_write_executor_.join();\r
                \r
-               try\r
-               {\r
-                       THROW_ON_ERROR2(av_write_trailer(oc_.get()), "[ffmpeg_consumer]");\r
+               LOG_ON_ERROR2(av_write_trailer(oc_.get()), "[ffmpeg_consumer]");\r
                \r
-                       audio_st_.reset();\r
-                       video_st_.reset();\r
+               audio_st_.reset();\r
+               video_st_.reset();\r
                          \r
-                       if (!(oc_->oformat->flags & AVFMT_NOFILE)) \r
-                               THROW_ON_ERROR2(avio_close(oc_->pb), "[ffmpeg_consumer]"); // Close the output ffmpeg.\r
+               if (!(oc_->oformat->flags & AVFMT_NOFILE)) \r
+                       LOG_ON_ERROR2(avio_close(oc_->pb), "[ffmpeg_consumer]"); // Close the output ffmpeg.\r
 \r
-                       CASPAR_LOG(info) << print() << L" Successfully Uninitialized."; \r
-               }\r
-               catch(...)\r
-               {\r
-                       CASPAR_LOG_CURRENT_EXCEPTION();\r
-               }\r
+               CASPAR_LOG(info) << print() << L" Successfully Uninitialized."; \r
        }\r
                        \r
        std::wstring print() const\r
@@ -219,7 +212,7 @@ public:
                        c->pix_fmt = PIX_FMT_YUV420P;    \r
                        av_opt_set(c->priv_data, "preset", "ultrafast", 0);\r
                        av_opt_set(c->priv_data, "tune",   "film",   0);\r
-                       av_opt_set(c->priv_data, "crf",    "10",     0);\r
+                       av_opt_set(c->priv_data, "crf",    "5",     0);\r
                        \r
                        THROW_ON_ERROR2(av_set_options_string(c->priv_data, options.c_str(), "=", ":"), "[ffmpeg_consumer]");\r
                }\r
@@ -229,7 +222,7 @@ public:
                        CASPAR_LOG(warning) << " Potentially unsupported output parameters.";\r
                }\r
                \r
-               c->max_b_frames = 0; // b-franes bit supported.\r
+               c->max_b_frames = 0; // b-franes not supported.\r
 \r
                if(oc_->oformat->flags & AVFMT_GLOBALHEADER)\r
                        c->flags |= CODEC_FLAG_GLOBAL_HEADER;\r
@@ -239,7 +232,7 @@ public:
 \r
                return std::shared_ptr<AVStream>(st, [](AVStream* st)\r
                {\r
-                       avcodec_close(st->codec);\r
+                       LOG_ON_ERROR2(avcodec_close(st->codec), "[ffmpeg_consumer]");\r
                        av_freep(&st->codec);\r
                        av_freep(&st);\r
                });\r
@@ -268,7 +261,7 @@ public:
 \r
                return std::shared_ptr<AVStream>(st, [](AVStream* st)\r
                {\r
-                       avcodec_close(st->codec);\r
+                       LOG_ON_ERROR2(avcodec_close(st->codec), "[ffmpeg_consumer]");;\r
                        av_freep(&st->codec);\r
                        av_freep(&st);\r
                });\r