From cc445067d1f61e12dbea4e6458f2c85ba58f01bf Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 30 十二月 2016 14:28:14 +0800
Subject: [PATCH] fix config, fix some log and todo
---
RtspFace/PL_RTSPClient.cpp | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/RtspFace/PL_RTSPClient.cpp b/RtspFace/PL_RTSPClient.cpp
index 71869db..0a1b163 100644
--- a/RtspFace/PL_RTSPClient.cpp
+++ b/RtspFace/PL_RTSPClient.cpp
@@ -1,17 +1,18 @@
#include "PL_RTSPClient.h"
#include "MaterialBuffer.h"
+#include "logger.h"
#include <pthread.h>
void rtsp_client_sdp_callback(void* arg, const char* val);
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;
@@ -49,7 +50,7 @@
void reset()
{
- RTSPConfig _rtspConfig;
+ PL_RTSPClient_Config _rtspConfig;
rtspConfig = _rtspConfig;
live_daemon_thid = 0;
eventLoopWatchVariable = 0;
@@ -116,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;
@@ -179,8 +180,8 @@
}
pm.type = PipeMaterial::PMT_FRAME;
- pm.buffer = (uint8_t*)(&(in->lastFrame));
- pm.buffSize = sizeof(in->lastFrame);
+ pm.buffer = &(in->lastFrame);
+ pm.buffSize = 0;
pm.former = this;
return true;
@@ -223,6 +224,8 @@
in->lastFrame.type = MB_Frame::MBFT_H264_NALU;
in->lastFrame.buffer = buffer;
in->lastFrame.buffSize = buffSize;
+ in->lastFrame.width = 0;
+ in->lastFrame.height = 0;
in->lastFrame.pts = presentationTime;
int ret = pthread_mutex_unlock(in->frame_mutex);
--
Gitblit v1.8.0