From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析 并在RTSPServer判断
---
FaceServer/ev_server.cpp | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/FaceServer/ev_server.cpp b/FaceServer/ev_server.cpp
index ce9ebb1..5ba4372 100644
--- a/FaceServer/ev_server.cpp
+++ b/FaceServer/ev_server.cpp
@@ -132,6 +132,7 @@
}
evpHeader = (EVPHeader*)headerBuff;
+ evpHeader->ntoh();
// check header
if (evpHeader->proto <= EVPProto::EVPP__FIRST || evpHeader->proto >= EVPProto::EVPP__LAST ||
@@ -166,9 +167,10 @@
do
{
readSize = bufferevent_read(bufev, client->recvbuff + client->recvbuff_end, client->recvbuff_max - client->recvbuff_end);
- client->read_times++;
if (readSize == 0)
break;
+ else
+ client->read_times++;
client->recvbuff_end += readSize;
} while (readSize > 0);
@@ -204,10 +206,10 @@
}
else
{
- LOG_WARN << "recvbuff incomplete, evpHeader.size=" << evpHeader->size
- << ", recvbuff_end=" << client->recvbuff_end
- << ", read_times=" << client->read_times
- << LOG_ENDL;
+ //LOG_WARN << "recvbuff incomplete, evpHeader.size=" << evpHeader->size
+ // << ", recvbuff_end=" << client->recvbuff_end
+ // << ", read_times=" << client->read_times
+ // << LOG_ENDL;
}
// check read times
@@ -352,7 +354,9 @@
EVPHeader* evpHeader = new (client.sendBuff) EVPHeader;
evpHeader->cmd = EVPCommand::EVPC_STATUS;
evpHeader->size = client.sendBuffSize;
+ evpHeader->hton();
EVP_Status* evpStatus = new (client.sendBuff + sizeof(EVPHeader)) EVP_Status;
evpStatus->status = status;
+ evpHeader->hton();
}
--
Gitblit v1.8.0