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判断
---
RtspFace/FFmpegRTSPServer/FFmpegH264Source.cpp | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/RtspFace/FFmpegRTSPServer/FFmpegH264Source.cpp b/RtspFace/FFmpegRTSPServer/FFmpegH264Source.cpp
index c2d5ab5..68fd872 100644
--- a/RtspFace/FFmpegRTSPServer/FFmpegH264Source.cpp
+++ b/RtspFace/FFmpegRTSPServer/FFmpegH264Source.cpp
@@ -49,13 +49,18 @@
static unsigned newFrameSize = 0;
/* get the data frame from the Encoding thread.. */
- if (Encoding_Source->GetFrame(&newFrameDataStart, &newFrameSize)){
- if (newFrameDataStart!=NULL) {
+ if (Encoding_Source->GetFrame(&newFrameDataStart, &newFrameSize) != 0)
+ {
+ if (newFrameDataStart != NULL && newFrameSize > 0)
+ {
/* This should never happen, but check anyway.. */
- if (newFrameSize > fMaxSize) {
+ if (newFrameSize > fMaxSize)
+ {
fFrameSize = fMaxSize;
fNumTruncatedBytes = newFrameSize - fMaxSize;
- } else {
+ }
+ else
+ {
fFrameSize = newFrameSize;
}
@@ -67,12 +72,14 @@
Encoding_Source->ReleaseFrame();
}
- else {
+ else
+ {
fFrameSize=0;
fTo=NULL;
handleClosure(this);
}
- }else
+ }
+ else
{
fFrameSize = 0;
}
--
Gitblit v1.8.0