Merge branch 'develop' of http://mayun.itc.cmbchina.cn/QD_RemoteBankArea/LR04.02_RVCTerminalPlus into develop

Other/libaudioqueue/libaudioqueue.cpp

@@ -12,17 +12,17 @@
 
 void Debug(const char* fmt, ...)
 {
-	char strfmt[512] = { 0 };
-	va_list args;
-	va_start(args, fmt);
-	vsprintf(strfmt, fmt, args);
-#ifdef TESTSHAREMEM
-	printf("%s\n", strfmt);
-#else
-	//Dbg("%s", strfmt);
-#endif
-	va_end(args);
-	fflush(stdout);
+//	char strfmt[512] = { 0 };
+//	va_list args;
+//	va_start(args, fmt);
+//	vsprintf(strfmt, fmt, args);
+//#ifdef TESTSHAREMEM
+//	printf("%s\n", strfmt);
+//#else
+//	//Dbg("%s", strfmt);
+//#endif
+//	va_end(args);
+//	fflush(stdout);
 }
 
 

Other/libsharememory/libsharememory.cpp

@@ -11,17 +11,17 @@
 
 void Debug(const char* fmt, ...)
 {
-	char strfmt[512] = { 0 };
-	va_list args;
-	va_start(args, fmt);
-	vsprintf(strfmt, fmt, args);
-#ifdef TESTSHAREMEM
-	printf("%s\n", strfmt);
-#else
-	//Dbg("%s", strfmt);
-#endif
-	va_end(args);
-	fflush(stdout);
+//	char strfmt[512] = { 0 };
+//	va_list args;
+//	va_start(args, fmt);
+//	vsprintf(strfmt, fmt, args);
+//#ifdef TESTSHAREMEM
+//	printf("%s\n", strfmt);
+//#else
+//	//Dbg("%s", strfmt);
+//#endif
+//	va_end(args);
+//	fflush(stdout);
 }
 
 

Other/libvideocapture/libvideocapture.cpp

@@ -658,13 +658,14 @@ int VideoCaptureImpl::StartVideoCapture()
 			streamparms.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 			streamparms.parm.capture.timeperframe.numerator = 1;
 			streamparms.parm.capture.timeperframe.denominator = (int32_t)m_capture->param.fps;
+			m_callback->Debug("Set Camera video capture timeperframe numerator is %d, denominator is %d.", streamparms.parm.capture.timeperframe.numerator, streamparms.parm.capture.timeperframe.denominator);
 			if (ioctl(m_deviceFd, VIDIOC_S_PARM, &streamparms) < 0) {
 				m_callback->Debug("Failed to set the framerate. error info is %s.", strerror(errno));
 				driver_framerate_support = false;
 			}
 			else {
 				m_currentFrameRate = (int32_t)m_capture->param.fps;
-				m_callback->Debug("Set Camera video capture rate to %d.", m_currentFrameRate);
+				m_callback->Debug("Set Camera video capture rate to %d, and numerator is %d, denominator is %d.", m_currentFrameRate, streamparms.parm.capture.timeperframe.numerator, streamparms.parm.capture.timeperframe.denominator);
 				if (ioctl(m_deviceFd, VIDIOC_G_PARM, &streamparms) == 0) {
 					m_callback->Debug("Get video capture numerator is %d, denominator is %d.", streamparms.parm.capture.timeperframe.numerator, streamparms.parm.capture.timeperframe.denominator);
 				}