diff --git a/inc/H264_V4l2DeviceSource.h b/inc/H264_V4l2DeviceSource.h index cf306fa..0ed6ab9 100644 --- a/inc/H264_V4l2DeviceSource.h +++ b/inc/H264_V4l2DeviceSource.h @@ -24,10 +24,10 @@ const char H264shortmarker[] = {0,0,1}; class H264_V4L2DeviceSource : public V4L2DeviceSource { public: - static H264_V4L2DeviceSource* createNew(UsageEnvironment& env, V4L2DeviceParameters params, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread, bool repeatConfig, bool keepMarker) ; + static H264_V4L2DeviceSource* createNew(UsageEnvironment& env, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread, bool repeatConfig, bool keepMarker) ; protected: - H264_V4L2DeviceSource(UsageEnvironment& env, V4L2DeviceParameters params, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread, bool repeatConfig, bool keepMarker); + H264_V4L2DeviceSource(UsageEnvironment& env, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread, bool repeatConfig, bool keepMarker); virtual ~H264_V4L2DeviceSource(); unsigned char* extractFrame(unsigned char* frame, size_t& size, size_t& outsize); diff --git a/inc/V4l2DeviceSource.h b/inc/V4l2DeviceSource.h index 530ac2f..2203811 100644 --- a/inc/V4l2DeviceSource.h +++ b/inc/V4l2DeviceSource.h @@ -64,11 +64,11 @@ class V4L2DeviceSource: public FramedSource }; public: - static V4L2DeviceSource* createNew(UsageEnvironment& env, V4L2DeviceParameters params, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread) ; + static V4L2DeviceSource* createNew(UsageEnvironment& env, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread) ; std::string getAuxLine() { return m_auxLine; }; protected: - V4L2DeviceSource(UsageEnvironment& env, V4L2DeviceParameters params, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread); + V4L2DeviceSource(UsageEnvironment& env, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread); virtual ~V4L2DeviceSource(); protected: @@ -90,7 +90,6 @@ class V4L2DeviceSource: public FramedSource virtual void doStopGettingFrames(); protected: - V4L2DeviceParameters m_params; std::list m_captureQueue; Stats m_in; Stats m_out; diff --git a/src/H264_V4l2DeviceSource.cpp b/src/H264_V4l2DeviceSource.cpp index 1c83ac0..055131b 100644 --- a/src/H264_V4l2DeviceSource.cpp +++ b/src/H264_V4l2DeviceSource.cpp @@ -21,19 +21,19 @@ // --------------------------------- // H264 V4L2 FramedSource // --------------------------------- -H264_V4L2DeviceSource* H264_V4L2DeviceSource::createNew(UsageEnvironment& env, V4L2DeviceParameters params, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread, bool repeatConfig, bool keepMarker) +H264_V4L2DeviceSource* H264_V4L2DeviceSource::createNew(UsageEnvironment& env, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread, bool repeatConfig, bool keepMarker) { H264_V4L2DeviceSource* source = NULL; if (device) { - source = new H264_V4L2DeviceSource(env, params, device, outputFd, queueSize, useThread, repeatConfig, keepMarker); + source = new H264_V4L2DeviceSource(env, device, outputFd, queueSize, useThread, repeatConfig, keepMarker); } return source; } // Constructor -H264_V4L2DeviceSource::H264_V4L2DeviceSource(UsageEnvironment& env, V4L2DeviceParameters params, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread, bool repeatConfig, bool keepMarker) - : V4L2DeviceSource(env, params, device, outputFd, queueSize,useThread), m_repeatConfig(repeatConfig), m_keepMarker(keepMarker), m_frameType(0) +H264_V4L2DeviceSource::H264_V4L2DeviceSource(UsageEnvironment& env, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread, bool repeatConfig, bool keepMarker) + : V4L2DeviceSource(env, device, outputFd, queueSize,useThread), m_repeatConfig(repeatConfig), m_keepMarker(keepMarker), m_frameType(0) { } diff --git a/src/V4l2DeviceSource.cpp b/src/V4l2DeviceSource.cpp index b7a9f10..6d3572d 100644 --- a/src/V4l2DeviceSource.cpp +++ b/src/V4l2DeviceSource.cpp @@ -37,20 +37,19 @@ int V4L2DeviceSource::Stats::notify(int tv_sec, int framesize) // --------------------------------- // V4L2 FramedSource // --------------------------------- -V4L2DeviceSource* V4L2DeviceSource::createNew(UsageEnvironment& env, V4L2DeviceParameters params, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread) +V4L2DeviceSource* V4L2DeviceSource::createNew(UsageEnvironment& env, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread) { V4L2DeviceSource* source = NULL; if (device) { - source = new V4L2DeviceSource(env, params, device, outputFd, queueSize, useThread); + source = new V4L2DeviceSource(env, device, outputFd, queueSize, useThread); } return source; } // Constructor -V4L2DeviceSource::V4L2DeviceSource(UsageEnvironment& env, V4L2DeviceParameters params, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread) +V4L2DeviceSource::V4L2DeviceSource(UsageEnvironment& env, V4l2Capture * device, int outputFd, unsigned int queueSize, bool useThread) : FramedSource(env), - m_params(params), m_in("in"), m_out("out") , m_outfd(outputFd), diff --git a/src/main.cpp b/src/main.cpp index 3658b41..e822b90 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -97,13 +97,13 @@ RTSPServer* createRTSPServer(UsageEnvironment& env, unsigned short rtspPort, uns // ----------------------------------------- // create FramedSource server // ----------------------------------------- -FramedSource* createFramedSource(UsageEnvironment* env, const V4L2DeviceParameters& param, V4l2Capture* videoCapture, int outfd, int queueSize, bool useThread, bool repeatConfig, bool muxTS) +FramedSource* createFramedSource(UsageEnvironment* env, 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); + source = H264_V4L2DeviceSource::createNew(*env, videoCapture, outfd, queueSize, useThread, repeatConfig, muxTS); if (muxTS) { MPEG2TransportStreamFromESSource* muxer = MPEG2TransportStreamFromESSource::createNew(*env); @@ -113,7 +113,7 @@ FramedSource* createFramedSource(UsageEnvironment* env, const V4L2DeviceParamete } else { - source = V4L2DeviceSource::createNew(*env, param, videoCapture, outfd, queueSize, useThread); + source = V4L2DeviceSource::createNew(*env, videoCapture, outfd, queueSize, useThread); } return source; } @@ -366,7 +366,7 @@ int main(int argc, char** argv) LOG(NOTICE) << "Create Source ..." << deviceName; std::string rtpFormat(getRtpFormat(format, muxTS)); - FramedSource* videoSource = createFramedSource(env, param, videoCapture, outfd, queueSize, useThread, repeatConfig, muxTS); + FramedSource* videoSource = createFramedSource(env, videoCapture, outfd, queueSize, useThread, repeatConfig, muxTS); if (videoSource == NULL) { LOG(FATAL) << "Unable to create source for device " << deviceName;