Commit a7ff4fa8 authored by Mikhail Karpenko's avatar Mikhail Karpenko

WIP: compile other files without errors

parent a788783f
/** /**
* @file FILENAME * @file rtp_stream.h
* @brief BRIEF DESCRIPTION * @brief Base class for RTP streams
* @copyright Copyright (C) YEAR Elphel Inc. * @copyright Copyright (C) 2017 Elphel Inc.
* @author AUTHOR <EMAIL> * @author AUTHOR <EMAIL>
* *
* @par License: * @par License:
...@@ -23,12 +23,14 @@ ...@@ -23,12 +23,14 @@
#define __H_RTP_STREAM__ #define __H_RTP_STREAM__
#include <sys/time.h> #include <sys/time.h>
#include <string> #include <cstring>
#include <pthread.h> #include <pthread.h>
#include <semaphore.h> #include <semaphore.h>
#include "socket.h"
#include <stdint.h> #include <stdint.h>
#include "socket.h"
#include "parameters.h"
using namespace std; using namespace std;
extern int fd_stream; extern int fd_stream;
...@@ -74,6 +76,8 @@ protected: ...@@ -74,6 +76,8 @@ protected:
void rtcp_send_sdes(void); void rtcp_send_sdes(void);
string stream_name; string stream_name;
Parameters *params;
int sensor_port;
}; };
#endif //__H_RTP_STREAM__ #endif //__H_RTP_STREAM__
/** /**
* @file FILENAME * @file socket.cpp
* @brief BRIEF DESCRIPTION * @brief Extends interface to sockets for streamer
* @copyright Copyright (C) YEAR Elphel Inc. * @copyright Copyright (C) YEAR Elphel Inc.
* @author AUTHOR <EMAIL> * @author AUTHOR <EMAIL>
* *
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <cstdlib>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
...@@ -39,8 +40,10 @@ using namespace std; ...@@ -39,8 +40,10 @@ using namespace std;
#include "socket.h" #include "socket.h"
#include "helpers.h" #include "helpers.h"
#undef RTSP_DEBUG //#undef RTSP_DEBUG
#undef RTSP_DEBUG_2 //#undef RTSP_DEBUG_2
#define RTSP_DEBUG
#define RTSP_DEBUG_2
#ifdef RTSP_DEBUG #ifdef RTSP_DEBUG
#define D(a) a #define D(a) a
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment