From 4b23730e8645488fa2b8f9fc2e5bf43065ea59e6 Mon Sep 17 00:00:00 2001 From: MPR Date: Sat, 11 Oct 2014 19:07:53 +0000 Subject: [PATCH] fix warning --- inc/V4l2DeviceSource.h | 8 ++++---- src/V4l2DeviceSource.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/inc/V4l2DeviceSource.h b/inc/V4l2DeviceSource.h index 5370e47..fe9ea42 100644 --- a/inc/V4l2DeviceSource.h +++ b/inc/V4l2DeviceSource.h @@ -62,11 +62,11 @@ class V4L2DeviceSource: public FramedSource }; public: - static V4L2DeviceSource* createNew(UsageEnvironment& env, V4L2DeviceParameters params, V4L2Device * device, const std::string &outputFIle, int queueSize, int verbose) ; + static V4L2DeviceSource* createNew(UsageEnvironment& env, V4L2DeviceParameters params, V4L2Device * device, const std::string &outputFIle, unsigned int queueSize, int verbose) ; std::string getAuxLine() { return m_auxLine; }; protected: - V4L2DeviceSource(UsageEnvironment& env, V4L2DeviceParameters params, V4L2Device * device, const std::string &outputFIle, int queueSize, int verbose); + V4L2DeviceSource(UsageEnvironment& env, V4L2DeviceParameters params, V4L2Device * device, const std::string &outputFIle, unsigned int queueSize, int verbose); virtual ~V4L2DeviceSource(); protected: @@ -92,8 +92,8 @@ class V4L2DeviceSource: public FramedSource std::string m_auxLine; V4L2Device * m_device; std::string m_outputFIle; - int m_queueSize; + unsigned int m_queueSize; int m_verbose; }; -#endif \ No newline at end of file +#endif diff --git a/src/V4l2DeviceSource.cpp b/src/V4l2DeviceSource.cpp index 3b89e3d..d7c7b50 100644 --- a/src/V4l2DeviceSource.cpp +++ b/src/V4l2DeviceSource.cpp @@ -48,7 +48,7 @@ int V4L2DeviceSource::Stats::notify(int tv_sec, int framesize, int verbose) // --------------------------------- // V4L2 FramedSource // --------------------------------- -V4L2DeviceSource* V4L2DeviceSource::createNew(UsageEnvironment& env, V4L2DeviceParameters params, V4L2Device * device, const std::string &outputFIle, int queueSize, int verbose) +V4L2DeviceSource* V4L2DeviceSource::createNew(UsageEnvironment& env, V4L2DeviceParameters params, V4L2Device * device, const std::string &outputFIle, unsigned int queueSize, int verbose) { V4L2DeviceSource* source = NULL; if (device) @@ -59,7 +59,7 @@ V4L2DeviceSource* V4L2DeviceSource::createNew(UsageEnvironment& env, V4L2DeviceP } // Constructor -V4L2DeviceSource::V4L2DeviceSource(UsageEnvironment& env, V4L2DeviceParameters params, V4L2Device * device, const std::string &outputFIle, int queueSize, int verbose) +V4L2DeviceSource::V4L2DeviceSource(UsageEnvironment& env, V4L2DeviceParameters params, V4L2Device * device, const std::string &outputFIle, unsigned int queueSize, int verbose) : FramedSource(env), m_params(params), m_in("in"), @@ -139,7 +139,7 @@ void V4L2DeviceSource::deliverFrame() if (m_verbose >= 2) { - printf ("deliverFrame\ttimestamp:%d.%06d\tsize:%d diff:%d ms queue:%d\n",fPresentationTime.tv_sec, fPresentationTime.tv_usec, fFrameSize, (int)(diff.tv_sec*1000+diff.tv_usec/1000), m_captureQueue.size()); + printf ("deliverFrame\ttimestamp:%ld.%06ld\tsize:%d diff:%d ms queue:%d\n",fPresentationTime.tv_sec, fPresentationTime.tv_usec, fFrameSize, (int)(diff.tv_sec*1000+diff.tv_usec/1000), m_captureQueue.size()); } int offset = 0; @@ -185,7 +185,7 @@ void V4L2DeviceSource::getNextFrame() m_in.notify(tv.tv_sec, frameSize, m_verbose); if (m_verbose >=2) { - printf ("getNextFrame\ttimestamp:%d.%06d\tsize:%d diff:%d ms queue:%d\n", ref.tv_sec, ref.tv_usec, frameSize, (int)(diff.tv_sec*1000+diff.tv_usec/1000), m_captureQueue.size()); + printf ("getNextFrame\ttimestamp:%ld.%06ld\tsize:%d diff:%d ms queue:%d\n", ref.tv_sec, ref.tv_usec, frameSize, (int)(diff.tv_sec*1000+diff.tv_usec/1000), m_captureQueue.size()); } processFrame(buffer,frameSize,ref); if (!processConfigrationFrame(buffer,frameSize)) @@ -279,7 +279,7 @@ void V4L2DeviceSource::processFrame(char * frame, int &frameSize, const timeval if (m_verbose >=2) { - printf ("queueFrame\ttimestamp:%d.%06d\tsize:%d diff:%d ms queue:%d data:%02X%02X%02X%02X%02X...\n", ref.tv_sec, ref.tv_usec, frameSize, (int)(diff.tv_sec*1000+diff.tv_usec/1000), m_captureQueue.size(), frame[0], frame[1], frame[2], frame[3], frame[4]); + printf ("queueFrame\ttimestamp:%ld.%06ld\tsize:%d diff:%d ms queue:%d data:%02X%02X%02X%02X%02X...\n", ref.tv_sec, ref.tv_usec, frameSize, (int)(diff.tv_sec*1000+diff.tv_usec/1000), m_captureQueue.size(), frame[0], frame[1], frame[2], frame[3], frame[4]); } if (m_outfile) fwrite(frame, frameSize,1, m_outfile); }