]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 20 Mar 2012 01:12:54 +0000 (01:12 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 20 Mar 2012 01:12:54 +0000 (01:12 +0000)
modules/ffmpeg/producer/ffmpeg_producer.cpp

index 45645786bc07e2b2deef6638977627b61ecd30ce..834794fac8d07a4bb6556acfa2535761d1c16d88 100644 (file)
@@ -376,27 +376,12 @@ public:
                        \r
        void decode_next_frame()\r
        {\r
-               for(int n = 0; n < 64 && muxer_.empty(); ++n)\r
-               {               \r
-                       std::shared_ptr<AVFrame>                        video;\r
-                       std::shared_ptr<core::audio_buffer> audio;\r
-\r
-                       tbb::parallel_invoke\r
-                       (\r
-                               [&]\r
-                               {\r
-                                       if(!muxer_.video_ready())\r
-                                               video = video_decoder_();\r
-                               },\r
-                               [&]\r
-                               {               \r
-                                       if(!muxer_.audio_ready())\r
-                                               audio = audio_decoder_();               \r
-                               }\r
-                       );\r
-               \r
-                       muxer_.push(video);\r
-                       muxer_.push(audio);\r
+               for(int n = 0; n < 8 && muxer_.empty(); ++n)\r
+               {                               \r
+                       if(!muxer_.video_ready())\r
+                               muxer_.push(video_decoder_());\r
+                       if(!muxer_.audio_ready())\r
+                               muxer_.push(audio_decoder_());\r
                }\r
                graph_->set_text(print());\r
        }\r