@@ -14,7 +14,7 @@ LIBS_poco = -lPocoXML -lPocoJSON -lPocoUtil -lPocoNet -lPocoFoundation
 
 LIBS_DIR=-L./lib
 
-P_Macro=-DH264_TB=1024*512 -DCAP_FPS=30 -DH264_IDR=5
+P_Macro=-DH264_TB=1024*512 -DCAP_FPS=30 -DH264_IDR=15
 OPT=-O2 $(INC) -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DC_DEBUG=0 -DCPP_DEBUG=0 $(P_Macro)
 
 CFLAGS =-Wall $(OPT) 
 
@@ -240,6 +240,7 @@ void FLVEncoder::encoder()
 			case IDR:
 				memcpy(idr->getData(), nalu->getData(), nalu->getLength());
 				idr->setLength(nalu->getLength());
+				idr->setTime(nalu->getTime());
 				if (idr->getLength())
 				{
 					if (!encodeKeyFrame())
 
@@ -30,7 +30,7 @@ void cdear(int type, void* cookie, void* data)
 
 /* 信号处理例程，其中dunno将会得到信号的值 */
 static void sigroutine(int dunno)
-{ 
+{
     stop_video_recorder(recorder);
 	free(recorder);
 	recorder = NULL;
@@ -43,7 +43,7 @@ void testCamera(void)
 	recorder->setDataCallBack(recorder, (void*) cdear, (void*) cdear);
 	start_video_recorder(recorder);
 }
-
+#ifndef NO_MAIN
 int main(int argc, char **argv)
 {
 	t = current_time_m();
@@ -53,4 +53,4 @@ int main(int argc, char **argv)
 	testCamera();
 	return 1;
 }
-
+#endif
@@ -38,7 +38,7 @@ static void onMatroskaDemuxCreation(MatroskaFileServerDemux* newDemux, void* /*c
 	demux = newDemux;
 	newMatroskaDemuxWatchVariable = 1;
 }
-
+#ifndef NO_MAIN
 int main(int argc, char** argv)
 {
 	// Begin by setting up our usage environment:
@@ -94,6 +94,7 @@ int main(int argc, char** argv)
 
 	return 0; // only to prevent compiler warning
 }
+#endif
 
 static void announceStream(RTSPServer* rtspServer, ServerMediaSession* sms, char const* streamName, char const* inputFileName)
 {
 
@@ -23,6 +23,7 @@ static void sigroutine(int dunno)
     run = 0;
 }
 
+#ifndef NO_MAIN
 int main(int argc, char **argv)
 {
 
@@ -106,3 +107,4 @@ int main(int argc, char **argv)
 
 }
 
+#endif
@@ -17,6 +17,7 @@ using namespace std;
 
 using namespace std;
 
+#ifndef NO_MAIN
 int main(int argc, char **argv)
 {
 	if (argc < 2)
@@ -29,3 +30,4 @@ int main(int argc, char **argv)
 	VideoLiveObservable::destory(oable);
 	return 1;
 }
+#endif
@@ -138,22 +138,23 @@ long long NetH264Reader::getHeadTime()
 	return head.getLong();
 }
 
+long long ht= 0;
 H264NALU* NetH264Reader::readH264()
 {
 	if (readHeadBytes(head.getCapacity()))
 	{
-		Poco::Timestamp t(getHeadTime());
-		Poco::DateTime ld(t);
+//		Poco::Timestamp t(getHeadTime());
+//		Poco::DateTime ld(t);
 
 		//cout << "getHeadTime 1 " << ld.minute() << " " <<ld.second() << endl;
 		//cout << "getHeadTime 2 " << Poco::LocalDateTime().minute() << " " << Poco::LocalDateTime().second() << endl;
 		if (readBytes(getHeadBodyLength()))
 		{
-			if (pretime != 0)
-			{
-				byte->setTime(getHeadTime() - pretime);
-			}
-			pretime = getHeadTime();
+			//cout << (getHeadTime() -ht) << endl;
+			byte->setTime((getHeadTime() -ht));
+			ht  = getHeadTime();
+			//cout << "time:" << getHeadTime()<<endl;
+			//byte->setTime((int)(0xFFFFFFFFFFFFFFFF & getHeadTime()));
 			return byte;
 		}
 	}
Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,7 @@ void FLVEncoder::encoder()`
`240`	`240`	`case IDR:`
`241`	`241`	`memcpy(idr->getData(), nalu->getData(), nalu->getLength());`
`242`	`242`	`idr->setLength(nalu->getLength());`
	`243`	`+ idr->setTime(nalu->getTime());`
`243`	`244`	`if (idr->getLength())`
`244`	`245`	`{`
`245`	`246`	`if (!encodeKeyFrame())`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ static void onMatroskaDemuxCreation(MatroskaFileServerDemux* newDemux, void* /*c`
`38`	`38`	`demux = newDemux;`
`39`	`39`	`newMatroskaDemuxWatchVariable = 1;`
`40`	`40`	`}`
`41`		`-`
	`41`	`+#ifndef NO_MAIN`
`42`	`42`	`int main(int argc, char** argv)`
`43`	`43`	`{`
`44`	`44`	`// Begin by setting up our usage environment:`
`@@ -94,6 +94,7 @@ int main(int argc, char** argv)`
`94`	`94`
`95`	`95`	`return 0; // only to prevent compiler warning`
`96`	`96`	`}`
	`97`	`+#endif`
`97`	`98`
`98`	`99`	`static void announceStream(RTSPServer* rtspServer, ServerMediaSession* sms, char const* streamName, char const* inputFileName)`
`99`	`100`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ static void sigroutine(int dunno)`
`23`	`23`	`run = 0;`
`24`	`24`	`}`
`25`	`25`
	`26`	`+#ifndef NO_MAIN`
`26`	`27`	`int main(int argc, char **argv)`
`27`	`28`	`{`
`28`	`29`
`@@ -106,3 +107,4 @@ int main(int argc, char **argv)`
`106`	`107`
`107`	`108`	`}`
`108`	`109`
	`110`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ using namespace std;`
`17`	`17`
`18`	`18`	`using namespace std;`
`19`	`19`
	`20`	`+#ifndef NO_MAIN`
`20`	`21`	`int main(int argc, char **argv)`
`21`	`22`	`{`
`22`	`23`	`if (argc < 2)`
`@@ -29,3 +30,4 @@ int main(int argc, char **argv)`
`29`	`30`	`VideoLiveObservable::destory(oable);`
`30`	`31`	`return 1;`
`31`	`32`	`}`
	`33`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -138,22 +138,23 @@ long long NetH264Reader::getHeadTime()`
`138`	`138`	`return head.getLong();`
`139`	`139`	`}`
`140`	`140`
	`141`	`+long long ht= 0;`
`141`	`142`	`H264NALU* NetH264Reader::readH264()`
`142`	`143`	`{`
`143`	`144`	`if (readHeadBytes(head.getCapacity()))`
`144`	`145`	`{`
`145`		`- Poco::Timestamp t(getHeadTime());`
`146`		`- Poco::DateTime ld(t);`
	`146`	`+// Poco::Timestamp t(getHeadTime());`
	`147`	`+// Poco::DateTime ld(t);`
`147`	`148`
`148`	`149`	`//cout << "getHeadTime 1 " << ld.minute() << " " <<ld.second() << endl;`
`149`	`150`	`//cout << "getHeadTime 2 " << Poco::LocalDateTime().minute() << " " << Poco::LocalDateTime().second() << endl;`
`150`	`151`	`if (readBytes(getHeadBodyLength()))`
`151`	`152`	`{`
`152`		`- if (pretime != 0)`
`153`		`- {`
`154`		`- byte->setTime(getHeadTime() - pretime);`
`155`		`- }`
`156`		`- pretime = getHeadTime();`
	`153`	`+ //cout << (getHeadTime() -ht) << endl;`
	`154`	`+ byte->setTime((getHeadTime() -ht));`
	`155`	`+ ht = getHeadTime();`
	`156`	`+ //cout << "time:" << getHeadTime()<<endl;`
	`157`	`+ //byte->setTime((int)(0xFFFFFFFFFFFFFFFF & getHeadTime()));`
`157`	`158`	`return byte;`
`158`	`159`	`}`
`159`	`160`	`}`