]> 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>
Fri, 28 Oct 2011 10:18:33 +0000 (10:18 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 28 Oct 2011 10:18:33 +0000 (10:18 +0000)
modules/decklink/producer/decklink_producer.cpp

index c1159201a25f45d957e71eee89dd7273f6224b88..e74fd55851e28807de2e370202ed64a87ea0b04c 100644 (file)
@@ -278,23 +278,17 @@ public:
                                av_frame->interlaced_frame      = format_desc_.field_mode != core::field_mode::progressive;\r
                                av_frame->top_field_first       = format_desc_.field_mode == core::field_mode::upper ? 1 : 0;\r
                                        \r
-                               Concurrency::parallel_invoke(\r
-                               [&]\r
+                               Concurrency::send(video_frames_, av_frame);                                     \r
+                               \r
+                               // It is assumed that audio is always equal or ahead of video.\r
+                               if(audio && SUCCEEDED(audio->GetBytes(&bytes)))\r
                                {\r
-                                       Concurrency::send(video_frames_, av_frame);                                     \r
-                               },\r
-                               [&]\r
-                               {                                                                                                       \r
-                                       // It is assumed that audio is always equal or ahead of video.\r
-                                       if(audio && SUCCEEDED(audio->GetBytes(&bytes)))\r
-                                       {\r
-                                               auto sample_frame_count = audio->GetSampleFrameCount();\r
-                                               auto audio_data = reinterpret_cast<int32_t*>(bytes);\r
-                                               Concurrency::send(audio_buffers_, make_safe<core::audio_buffer>(audio_data, audio_data + sample_frame_count*format_desc_.audio_channels));\r
-                                       }\r
-                                       else\r
-                                               Concurrency::send(audio_buffers_, make_safe<core::audio_buffer>(format_desc_.audio_samples_per_frame, 0));      \r
-                               });\r
+                                       auto sample_frame_count = audio->GetSampleFrameCount();\r
+                                       auto audio_data = reinterpret_cast<int32_t*>(bytes);\r
+                                       Concurrency::send(audio_buffers_, make_safe<core::audio_buffer>(audio_data, audio_data + sample_frame_count*format_desc_.audio_channels));\r
+                               }\r
+                               else\r
+                                       Concurrency::send(audio_buffers_, make_safe<core::audio_buffer>(format_desc_.audio_samples_per_frame, 0));      \r
                        }\r
 \r
                }\r