From feb4a5a1761cb535f96d257b0f8001af0d492003 Mon Sep 17 00:00:00 2001
From: mpromonet <michel.promonet@free.fr>
Date: Wed, 20 Apr 2016 18:00:26 +0200
Subject: [PATCH] extract FrameSource creation

---
 src/main.cpp | 66 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 3d90e35..aa0142d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -279,6 +279,31 @@ RTSPServer* createRTSPServer(UsageEnvironment& env, unsigned short rtspPort, uns
 	return rtspServer;
 }
 
+
+// -----------------------------------------
+//    create FramedSource server
+// -----------------------------------------
+FramedSource* createFramedSource(UsageEnvironment* env, const V4L2DeviceParameters& param, V4l2Capture* videoCapture, int outfd, int queueSize, bool useThread, bool repeatConfig, bool muxTS)
+{
+	FramedSource* source = NULL;
+	int format = videoCapture->getFormat();
+	if (format == V4L2_PIX_FMT_H264)
+	{
+		source = H264_V4L2DeviceSource::createNew(*env, param, videoCapture, outfd, queueSize, useThread, repeatConfig, muxTS);
+		if (muxTS)
+		{
+			MPEG2TransportStreamFromESSource* muxer = MPEG2TransportStreamFromESSource::createNew(*env);
+			muxer->addNewVideoSource(source, 5);
+			source = muxer;
+		}
+	}
+	else
+	{
+		source = V4L2DeviceSource::createNew(*env, param, videoCapture, outfd, queueSize, useThread);
+	}
+	return source;
+}
+	
 // -----------------------------------------
 //    add an RTSP session
 // -----------------------------------------
@@ -300,16 +325,24 @@ void addSession(RTSPServer* rtspServer, const std::string & sessionName, ServerM
 	}
 }
 
-std::string getRtpFormat(int format)
+std::string getRtpFormat(int format, bool muxTS)
 {
 	std::string rtpFormat;
-	switch(format)
-	{	
-		case V4L2_PIX_FMT_H264 : rtpFormat = "video/H264"; break;
-#ifdef V4L2_PIX_FMT_VP8
-		case V4L2_PIX_FMT_VP8  : rtpFormat = "video/VP8" ; break;
-#endif
+	if (muxTS)
+	{
+		rtpFormat = "video/MP2T";
 	}
+	else
+	{
+		switch(format)
+		{	
+			case V4L2_PIX_FMT_H264 : rtpFormat = "video/H264"; break;
+#ifdef V4L2_PIX_FMT_VP8
+			case V4L2_PIX_FMT_VP8  : rtpFormat = "video/VP8" ; break;
+#endif
+		}
+	}
+	
 	return rtpFormat;
 }
 
@@ -480,23 +513,8 @@ int main(int argc, char** argv)
 				{
 					LOG(NOTICE) << "Cannot start V4L2 Capture for:" << deviceName;
 				}
-				FramedSource* videoES = NULL;
-				std::string rtpFormat(getRtpFormat(format));
-				if (format == V4L2_PIX_FMT_H264)
-				{
-					videoES = H264_V4L2DeviceSource::createNew(*env, param, videoCapture, outfd, queueSize, useThread, repeatConfig, muxTS);
-					if (muxTS)
-					{
-						MPEG2TransportStreamFromESSource* muxer = MPEG2TransportStreamFromESSource::createNew(*env);
-						muxer->addNewVideoSource(videoES, 5);
-						videoES = muxer;
-						rtpFormat = "video/MP2T";
-					}
-				}
-				else
-				{
-					videoES = V4L2DeviceSource::createNew(*env, param, videoCapture, outfd, queueSize, useThread);
-				}
+				std::string rtpFormat(getRtpFormat(format, muxTS));
+				FramedSource* videoES = createFramedSource(env, param, videoCapture, outfd, queueSize, useThread, repeatConfig, muxTS);
 				if (videoES == NULL) 
 				{
 					LOG(FATAL) << "Unable to create source for device " << deviceName;