scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 06:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation when HTTP SDP is disabled

Browse Source
This commit is contained in:
Martin Pulec
2021-11-25 15:47:42 +01:00
parent e28c79f717
commit f74ea13cc1
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/sdp.c
View File

@@ -86,7 +86,9 @@ struct stream_info {
};
struct sdp {
#ifdef SDP_HTTP
struct Server http_server;
#endif // defined SDP_HTTP
pthread_t http_server_thr;
int ip_version;
char version[STR_LENGTH];
@@ -138,7 +140,9 @@ struct sdp *new_sdp(int ip_version, const char *receiver) {
snprintf(sdp->connection, STR_LENGTH, "c=IN IP%d %s\n", ip_version, connection_address);
strncpy(sdp->times, "t=0 0\n", STR_LENGTH - 1);
#ifdef SDP_HTTP
serverInit(&sdp->http_server);
#endif // defined SDP_HTTP
return sdp;
}
@@ -271,7 +275,9 @@ void clean_sdp(struct sdp *sdp){
return;
}
free(sdp->sdp_dump);
#ifdef SDP_HTTP
serverDeInit(&sdp->http_server);
#endif // defined SDP_HTTP
free(sdp);
}
@@ -351,6 +357,7 @@ static void print_http_path(struct sdp *sdp) {
}
}
#ifdef SDP_HTTP
bool sdp_run_http_server(struct sdp *sdp, int port, address_callback_t addr_callback, void *addr_callback_udata)
{
assert(port >= 0 && port < 65536);
@@ -375,6 +382,7 @@ void sdp_stop_http_server(struct sdp *sdp)
pthread_join(sdp->http_server_thr, NULL);
}
#endif // defined SDP_HTTP
#endif // SDP_HTTP

4
src/video_rxtx/h264_sdp.cpp
View File

@@ -160,6 +160,8 @@ void h264_sdp_video_rxtx::sdp_add_video(codec_t codec)
if (!sdp_run_http_server(m_sdp, m_requested_http_port, h264_sdp_video_rxtx::change_address_callback, this)) {
LOG(LOG_LEVEL_ERROR) << "[SDP] Server run failed!\n";
}
#else
LOG(LOG_LEVEL_WARNING) << "[SDP] HTTP support not enabled - skipping server creation!\n";
#endif
}
@@ -233,7 +235,9 @@ void h264_sdp_video_rxtx::send_frame(shared_ptr<video_frame> tx_frame)
h264_sdp_video_rxtx::~h264_sdp_video_rxtx()
{
if (m_sdp_configured_codec != VIDEO_CODEC_NONE) {
#ifdef SDP_HTTP
sdp_stop_http_server(m_sdp);
#endif // defined SDP_HTTP
}
clean_sdp(m_sdp);
}