From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 11 五月 2017 17:48:48 +0800 Subject: [PATCH] --- RtspFace/PL_RTSPClient.cpp | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/RtspFace/PL_RTSPClient.cpp b/RtspFace/PL_RTSPClient.cpp index ae885d7..8290f8a 100644 --- a/RtspFace/PL_RTSPClient.cpp +++ b/RtspFace/PL_RTSPClient.cpp @@ -7,12 +7,12 @@ void rtsp_client_fmtp_callback(void* arg, const char* val); void rtsp_client_frame_callback(void* arg, uint8_t* buffer, size_t buffSize, timeval presentationTime); void rtsp_client_continue_callback(void* arg); -//struct RTSPConfig; +//struct PL_RTSPClient_Config; #include "live555/testProgs/testRTSPClient.hpp" struct RTSPClient_Internal { - RTSPConfig rtspConfig; + PL_RTSPClient_Config rtspConfig; pthread_t live_daemon_thid; char eventLoopWatchVariable; bool live_daemon_running; @@ -50,7 +50,7 @@ void reset() { - RTSPConfig _rtspConfig; + PL_RTSPClient_Config _rtspConfig; rtspConfig = _rtspConfig; live_daemon_thid = 0; eventLoopWatchVariable = 0; @@ -117,7 +117,7 @@ if (args == nullptr) return false; - const RTSPConfig* config = reinterpret_cast<const RTSPConfig*>(args); + const PL_RTSPClient_Config* config = reinterpret_cast<const PL_RTSPClient_Config*>(args); RTSPClient_Internal* in = (RTSPClient_Internal*)internal; in->reset(); in->rtspConfig = *config; @@ -197,7 +197,7 @@ if (client->manager == nullptr) return; - client->manager->set_global_param(PLGP_RTSP_SDP, val); + client->manager->set_param(PLGP_RTSP_SDP, val); } void rtsp_client_fmtp_callback(void* arg, const char* val) @@ -210,7 +210,7 @@ if (client->manager == nullptr) return; - client->manager->set_global_param(PLGP_RTSP_FMTP, val); + client->manager->set_param(PLGP_RTSP_FMTP, val); } void rtsp_client_frame_callback(void* arg, uint8_t* buffer, size_t buffSize, timeval presentationTime) @@ -231,7 +231,7 @@ int ret = pthread_mutex_unlock(in->frame_mutex); if(ret != 0) { - printf("pthread_mutex_unlock frame_mutex: %s/n", strerror(ret)); + LOG_ERROR << "pthread_mutex_unlock frame_mutex: " << strerror(ret) << std::endl; } } @@ -246,6 +246,6 @@ int ret = pthread_mutex_lock(in->continue_mutex); if(ret != 0) { - printf("pthread_mutex_unlock continue_mutex: %s/n", strerror(ret)); + LOG_ERROR << "pthread_mutex_unlock continue_mutex: " << strerror(ret) << std::endl; } } -- Gitblit v1.8.0