2.0.0.2: Added some more comments.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@669 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/mixer/frame_mixer_device.cpp b/core/mixer/frame_mixer_device.cpp
index 2b254637364c637348b095e3e7be3bd0c97e672a..0f731f3bb776376c05639c78575b98b8c96563c4 100644 (file)
--- a/core/mixer/frame_mixer_device.cpp
+++ b/core/mixer/frame_mixer_device.cpp
@@ -130,6 +130,7 @@ public:
                auto image = image_mixer_.begin_pass();\r
                BOOST_FOREACH(auto& frame, frames)\r
                {\r
+                       // Apply root transform and render.\r
                        if(format_desc_.mode != core::video_mode::progressive)\r
                        {\r
                                auto frame1 = make_safe<core::basic_frame>(frame.second);\r

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index aa9741db76445bd0763ebc63d0db97c4a00329f4..aa714f26ed8deca91f7a6d89218a1ef7b1ea8ede 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -157,10 +157,10 @@ public:
        {\r
                return context_->begin_invoke([=]() -> safe_ptr<const host_buffer>\r
                {\r
-                       reading_->map();\r
-                       render_targets_[0]->attach(0);\r
-                       GL(glClear(GL_COLOR_BUFFER_BIT));\r
-                       return safe_ptr<const host_buffer>(reading_);\r
+                       reading_->map(); // Open host buffer for reading.\r
+                       render_targets_[0]->attach(0); // Render to the next target\r
+                       GL(glClear(GL_COLOR_BUFFER_BIT)); // Clear the new target\r
+                       return make_safe(reading_);\r
                });\r
        }\r
 \r
@@ -168,9 +168,9 @@ public:
        {\r
                context_->begin_invoke([=]\r
                {\r
-                       reading_ = context_->create_host_buffer(format_desc_.size, host_buffer::read_only);\r
-                       render_targets_[0]->write(*reading_);\r
-                       std::rotate(render_targets_.begin(), render_targets_.begin() + 1, render_targets_.end());\r
+                       reading_ = context_->create_host_buffer(format_desc_.size, host_buffer::read_only); // Create a new host buffer.\r
+                       render_targets_[0]->write(*reading_); // Move data to host buffer.\r
+                       std::rotate(render_targets_.begin(), render_targets_.begin() + 1, render_targets_.end()); // Set new render target.\r
                });\r
        }\r
                \r