Merge pull request IntelRealSense#31 from IntelRealSense/michalpr_tmp…

…branch

Add a callback function in ip_device and rthernet_device

src/ethernet/ethernet-device.cpp

@@ -23,6 +23,12 @@ std::mutex mtx;
 rs2_stream_profile* depth_stream;
 volatile bool is_active = false;
 
+// michalpr - remove this. this is a workaround until callback branch will be merged
+void ethernetDeviceFrameCallBack(u_int8_t* buf, unsigned int size, struct timeval presentationTime)
+{
+    std::cout << "myFrameCallBack. size = " << size << " time (sec) = " << presentationTime.tv_sec << "\n";
+}
+
 char stop_flag = 0;
 void sig_handler(int signo)
 {
@@ -280,7 +286,7 @@ void rs2::ethernet_device::start(std::string url) {
 	{
 		if (rtsp_clients[i]==NULL)
 			continue;
-		rtsp_clients[i]->addStream(available_streams[i]);
+		rtsp_clients[i]->addStream(available_streams[i], &ethernetDeviceFrameCallBack);
 		rtsp_clients[i]->start();
 	}
 

src/ethernet/ip_device.cpp

@@ -1,6 +1,12 @@
 #include "ip_device.hh"
 #include <librealsense2/rs.hpp>
 
+// michalpr - remove this. this is a workaround until callback branch will be merged
+void ipDeviceFrameCallBack(u_int8_t* buf, unsigned int size, struct timeval presentationTime)
+{
+    std::cout << "myFrameCallBack. size = " << size << " time (sec) = " << presentationTime.tv_sec << "\n";
+}
+
 ip_device::~ip_device()
 {
     is_device_alive = false;
@@ -126,7 +132,7 @@ void ip_device::update_sensor_stream(int sensor_index,std::vector<rs2::stream_pr
 
         std::cout << "Starting new stream" << st.type << "  " << st.fps << "\n" ;
 
-        rtsp_clients[sensor_index]->addStream(st);
+        rtsp_clients[sensor_index]->addStream(st, &ipDeviceFrameCallBack);
         rtsp_clients[sensor_index]->start();
     }
 }