Refactor how frames are sent from receiver

frame_serialize/ZMQStream2PusherGroup.cpp

@@ -24,31 +24,45 @@ ZMQStream2PusherGroup::ZMQStream2PusherGroup(const std::vector<std::string> &add
                                     (a, send_buffer_high_watermark, send_buffer_size));
 }
 
-bool ZMQStream2PusherGroup::SendImage(const DataMessage& message)  {
-    if (pusher.empty())
+bool ZMQStream2PusherGroup::SendImage(const uint8_t *image_data, size_t image_size, int64_t image_number) {
+    if (!pusher.empty()) {
+        auto socket_number = (image_number / images_per_file) % pusher.size();
+        return pusher[socket_number]->SendImage(image_data, image_size, image_number);
+    } else
         return false;
-    auto socket_number = (message.number / images_per_file) % pusher.size();
-
-    return pusher[socket_number]->SendImage(message);
 }
 
-void ZMQStream2PusherGroup::StartDataCollection(const StartMessage& message) {
+void ZMQStream2PusherGroup::SendImage(const uint8_t *image_data, size_t image_size, int64_t image_number,
+                                      ZeroCopyReturnValue *z) {
+    if (!pusher.empty()) {
+        auto socket_number = (image_number / images_per_file) % pusher.size();
+        pusher[socket_number]->SendImage(image_data, image_size, image_number, z);
+    }
+}
+
+void ZMQStream2PusherGroup::StartDataCollection(StartMessage& message) {
     if (message.images_per_file < 1)
         throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
                               "Images per file cannot be zero or negative");
     images_per_file = message.images_per_file;
 
-    for (auto &p: pusher)
+    for (auto &p: pusher) {
         p->StartDataCollection(message);
+        message.write_master_file = false;
+    }
 }
 
+bool ZMQStream2PusherGroup::SendCalibration(const CompressedImage &message) {
+    if (pusher.empty())
+        return false;
+    return pusher[0]->SendCalibration(message);
+}
 
 bool ZMQStream2PusherGroup::EndDataCollection(const EndMessage& message) {
-    EndMessage end_message = message;
     bool ret = true;
     for (auto &p: pusher) {
-        ret = ret && p->EndDataCollection(end_message);
-        end_message.write_master_file = false;
+        if (!p->EndDataCollection(message))
+            ret = false;
     }
     return ret;
 }
@@ -58,4 +72,4 @@ std::vector<std::string> ZMQStream2PusherGroup::GetAddress() {
     for (auto &p: pusher)
         ret.push_back(p->GetAddress());
     return ret;
-}
+}