Commit a7ff4fa8 authored by Mikhail Karpenko's avatar Mikhail Karpenko
Browse files

WIP: compile other files without errors

parent a788783f

src/rtp_stream.h

+9 −5
Original line number Diff line number Diff line 
/**

 * @file FILENAME

 * @brief BRIEF DESCRIPTION

 * @copyright Copyright (C) YEAR Elphel Inc.

 * @file rtp_stream.h

 * @brief Base class for RTP streams

 * @copyright Copyright (C) 2017 Elphel Inc.

 * @author AUTHOR <EMAIL>

 *

 * @par License:
@@ -23,12 +23,14 @@ 
#define __H_RTP_STREAM__



#include <sys/time.h>

#include <string>

#include <cstring>

#include <pthread.h>

#include <semaphore.h>

#include "socket.h"

#include <stdint.h>



#include "socket.h"

#include "parameters.h"



using namespace std;



extern int fd_stream;
@@ -74,6 +76,8 @@ protected: 
	void rtcp_send_sdes(void);



	string stream_name;

	Parameters *params;

	int sensor_port;

};



#endif //__H_RTP_STREAM__

src/socket.cpp

+7 −4
Original line number Diff line number Diff line 
/**

 * @file FILENAME

 * @brief BRIEF DESCRIPTION

 * @file socket.cpp

 * @brief Extends interface to sockets for streamer

 * @copyright Copyright (C) YEAR Elphel Inc.

 * @author AUTHOR <EMAIL>

 *
@@ -21,6 +21,7 @@ 


#include <string>

#include <iostream>

#include <cstdlib>



#include <sys/types.h>

#include <sys/socket.h>
@@ -39,8 +40,10 @@ using namespace std; 
#include "socket.h"

#include "helpers.h"



#undef RTSP_DEBUG

#undef RTSP_DEBUG_2

//#undef RTSP_DEBUG

//#undef RTSP_DEBUG_2

#define RTSP_DEBUG

#define RTSP_DEBUG_2



#ifdef RTSP_DEBUG

	#define D(a) a