rough in record_audio, and do lots of whitespace cleanups

src/zm_curl_camera.cpp

@@ -30,8 +30,8 @@ const char* content_type_match = "Content-Type:";
 size_t content_length_match_len;
 size_t content_type_match_len;
 
-cURLCamera::cURLCamera( int p_id, const std::string &p_path, const std::string &p_user, const std::string &p_pass, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
-    Camera( p_id, CURL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture ),
+cURLCamera::cURLCamera( int p_id, const std::string &p_path, const std::string &p_user, const std::string &p_pass, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
+    Camera( p_id, CURL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
     mPath( p_path ), mUser( p_user ), mPass ( p_pass ), bTerminate( false ), bReset( false ), mode ( MODE_UNSET )
 {
 
@@ -313,6 +313,7 @@ int cURLCamera::PostCapture()
 
 int cURLCamera::CaptureAndRecord( Image &image, bool recording, char* event_directory )
 {
+	Error("Capture and Record not implemented for the cURL camera type");
     // Nothing to do here
     return( 0 );
 }

src/zm_curl_camera.h

@@ -65,7 +65,7 @@ protected:
 	pthread_cond_t request_complete_cond;
 
 public:
-	cURLCamera( int p_id, const std::string &path, const std::string &username, const std::string &password,  int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
+	cURLCamera( int p_id, const std::string &path, const std::string &username, const std::string &password,  int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
 	~cURLCamera();
 
 	const std::string &Path() const { return( mPath ); }

src/zm_ffmpeg_camera.cpp

@@ -36,8 +36,8 @@ extern "C"{
 #include <pthread.h>
 #endif
 
-FfmpegCamera::FfmpegCamera( int p_id, const std::string &p_path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
-    Camera( p_id, FFMPEG_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture ),
+FfmpegCamera::FfmpegCamera( int p_id, const std::string &p_path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
+    Camera( p_id, FFMPEG_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
     mPath( p_path ),
     mMethod( p_method ),
     mOptions( p_options )

src/zm_ffmpeg_camera.h

@@ -73,7 +73,7 @@ protected:
     int64_t             startTime;
     
 public:
-	FfmpegCamera( int p_id, const std::string &path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
+	FfmpegCamera( int p_id, const std::string &path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
 	~FfmpegCamera();
 
     const std::string &Path() const { return( mPath ); }
@@ -86,7 +86,7 @@ public:
 	int PrimeCapture();
 	int PreCapture();
 	int Capture( Image &image );
-        int CaptureAndRecord( Image &image, bool recording, char* event_directory );
+	int CaptureAndRecord( Image &image, bool recording, char* event_directory );
 	int PostCapture();
 };
 

src/zm_libvlc_camera.cpp

@@ -61,8 +61,8 @@ void LibvlcUnlockBuffer(void* opaque, void* picture, void *const *planes)
     }
 }
 
-LibvlcCamera::LibvlcCamera( int p_id, const std::string &p_path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
-    Camera( p_id, LIBVLC_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture ),
+LibvlcCamera::LibvlcCamera( int p_id, const std::string &p_path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
+    Camera( p_id, LIBVLC_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
     mPath( p_path ),
     mMethod( p_method ),
     mOptions( p_options )

src/zm_libvlc_camera.h

@@ -57,7 +57,7 @@ protected:
     libvlc_media_player_t *mLibvlcMediaPlayer;
 
 public:
-	LibvlcCamera( int p_id, const std::string &path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
+	LibvlcCamera( int p_id, const std::string &path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
 	~LibvlcCamera();
 
     const std::string &Path() const { return( mPath ); }
@@ -70,7 +70,7 @@ public:
 	int PrimeCapture();
 	int PreCapture();
 	int Capture( Image &image );
-        int CaptureAndRecord( Image &image, bool recording, char* event_directory );
+	int CaptureAndRecord( Image &image, bool recording, char* event_directory );
 	int PostCapture();
 };
 

src/zm_local_camera.cpp

@@ -286,13 +286,32 @@ AVFrame **LocalCamera::capturePictures = 0;
 
 LocalCamera *LocalCamera::last_camera = NULL;
 
-LocalCamera::LocalCamera( int p_id, const std::string &p_device, int p_channel, int p_standard, bool p_v4l_multi_buffer, unsigned int p_v4l_captures_per_frame, const std::string &p_method, int p_width, int p_height, int p_colours, int p_palette, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, unsigned int p_extras) :
+LocalCamera::LocalCamera(
+	int p_id,
+	const std::string &p_device,
+	int p_channel,
+	int p_standard,
+	bool p_v4l_multi_buffer,
+	unsigned int p_v4l_captures_per_frame,
+	const std::string &p_method,
+	int p_width,
+	int p_height,
+	int p_colours,
+	int p_palette,
+	int p_brightness,	
+	int p_contrast,
+	int p_hue,
+	int p_colour,
+	bool p_capture,
+	bool p_record_audio,
+	unsigned int p_extras) :
     Camera( p_id, LOCAL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture ),
     device( p_device ),
     channel( p_channel ),
     standard( p_standard ),
     palette( p_palette ),
     channel_index( 0 ),
+	record_audio( p_record_audio ),
     extras ( p_extras )
 {
     // If we are the first, or only, input on this device then

src/zm_local_camera.h

@@ -116,7 +116,25 @@ protected:
 	static LocalCamera      *last_camera;
 
 public:
-	LocalCamera( int p_id, const std::string &device, int p_channel, int p_format, bool v4lmultibuffer, unsigned int v4lcapturesperframe, const std::string &p_method, int p_width, int p_height, int p_colours, int p_palette, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, unsigned int p_extras = 0);
+	LocalCamera(
+		int p_id,
+		const std::string &device,
+		int p_channel,
+		int p_format,
+		bool v4lmultibuffer,
+		unsigned int v4lcapturesperframe,
+		const std::string &p_method,
+		int p_width,
+		int p_height,
+		int p_colours,
+		int p_palette,
+		int p_brightness,
+		int p_contrast,
+		int p_hue,
+		int p_colour,
+		bool p_capture,
+		bool p_record_audio,
+		unsigned int p_extras = 0);
 	~LocalCamera();
 
 	void Initialise();
@@ -138,7 +156,7 @@ public:
 	int PreCapture();
 	int Capture( Image &image );
 	int PostCapture();
-    	int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);};
+   	int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);};
 
 	static bool GetCurrentSettings( const char *device, char *output, int version, bool verbose );
 };

src/zm_remote_camera.cpp

@@ -21,8 +21,23 @@
 
 #include "zm_utils.h"
 
-RemoteCamera::RemoteCamera( int p_id, const std::string &p_protocol, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
-    Camera( p_id, REMOTE_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture ),
+RemoteCamera::RemoteCamera(
+	int p_id,
+	const std::string &p_protocol,
+	const std::string &p_host,
+	const std::string &p_port,
+	const std::string &p_path,
+	int p_width,
+	int p_height,
+	int p_colours,
+	int p_brightness,
+	int p_contrast,
+	int p_hue,
+	int p_colour,
+	bool p_capture,
+	bool p_record_audio
+ ) :
+    Camera( p_id, REMOTE_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
     protocol( p_protocol ),
     host( p_host ),
     port( p_port ),

src/zm_remote_camera.h

@@ -55,7 +55,22 @@ protected:
 	struct addrinfo *hp;
 
 public:
-	RemoteCamera( int p_id, const std::string &p_proto, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
+	RemoteCamera(
+		int p_id,
+		const std::string &p_proto,
+		const std::string &p_host,
+		const std::string &p_port,
+		const std::string &p_path,
+		int p_width,
+		int p_height,
+		int p_colours,
+		int p_brightness,
+		int p_contrast,
+		int p_hue,
+		int p_colour,
+		bool p_capture,
+		bool p_record_audio
+	);
 	virtual ~RemoteCamera();
 
 	const std::string &Protocol() const { return( protocol ); }
@@ -73,7 +88,7 @@ public:
 	virtual int PreCapture() = 0;
 	virtual int Capture( Image &image ) = 0;
 	virtual int PostCapture() = 0;
-    	virtual int CaptureAndRecord( Image &image, bool recording, char* event_directory )=0;
+   	virtual int CaptureAndRecord( Image &image, bool recording, char* event_directory )=0;
 };
 
 #endif // ZM_REMOTE_CAMERA_H

src/zm_remote_camera_http.cpp

@@ -31,8 +31,8 @@
 #include <sys/filio.h> // FIONREAD and friends
 #endif
 
-RemoteCameraHttp::RemoteCameraHttp( int p_id, const std::string &p_method, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
-    RemoteCamera( p_id, "http", p_host, p_port, p_path, p_width, p_height, p_colours, p_brightness, p_contrast, p_hue, p_colour, p_capture )
+RemoteCameraHttp::RemoteCameraHttp( int p_id, const std::string &p_method, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
+    RemoteCamera( p_id, "http", p_host, p_port, p_path, p_width, p_height, p_colours, p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio )
 {
     sd = -1;
 

src/zm_remote_camera_http.h

@@ -45,7 +45,7 @@ protected:
     enum { SIMPLE, REGEXP } method;
 
 public:
-	RemoteCameraHttp( int p_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
+	RemoteCameraHttp( int p_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
 	~RemoteCameraHttp();
 
 	void Initialise();
@@ -58,7 +58,7 @@ public:
 	int PreCapture();
 	int Capture( Image &image );
 	int PostCapture();
-    	int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);};
+    int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);};
 };
 
 #endif // ZM_REMOTE_CAMERA_HTTP_H

src/zm_remote_camera_rtsp.cpp

@@ -28,8 +28,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-RemoteCameraRtsp::RemoteCameraRtsp( int p_id, const std::string &p_method, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
-	RemoteCamera( p_id, "rtsp", p_host, p_port, p_path, p_width, p_height, p_colours, p_brightness, p_contrast, p_hue, p_colour, p_capture ),
+RemoteCameraRtsp::RemoteCameraRtsp( int p_id, const std::string &p_method, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
+	RemoteCamera( p_id, "rtsp", p_host, p_port, p_path, p_width, p_height, p_colours, p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
 	rtsp_describe( p_rtsp_describe ),
 	rtspThread( 0 )
 
@@ -505,12 +505,16 @@ int RemoteCameraRtsp::CaptureAndRecord( Image &image, bool recording, char* even
 			} else if ( packet.stream_index == mAudioStreamId ) {
 				Debug( 4, "Got audio packet" );
 				if ( videoStore && recording ) {
-					if ( recordAudio ) {
+					if ( record_audio ) {
 						Debug( 4, "Storing Audio packet" );
 						//Write the packet to our video store
 						int ret = videoStore->writeAudioFramePacket(&packet, mFormatContext->streams[packet.stream_index]); //FIXME no relevance of last key frame
 						if ( ret < 0 ) { //Less than zero and we skipped a frame
+#if LIBAVCODEC_VERSION_CHECK(57, 8, 0, 12, 100)
+							av_packet_unref( &packet );
+#else
 							av_free_packet( &packet );
+#endif
 							return 0;	  
 						}
 					} else {
@@ -520,7 +524,7 @@ int RemoteCameraRtsp::CaptureAndRecord( Image &image, bool recording, char* even
 			} // end if video or audio packet
 		 
 #if LIBAVCODEC_VERSION_CHECK(57, 8, 0, 12, 100)
-			av_packet_unref( &packet);
+			av_packet_unref( &packet );
 #else
 			av_free_packet( &packet );
 #endif

src/zm_remote_camera_rtsp.h

@@ -41,11 +41,11 @@ protected:
 	int rtsp_sd;
 	int rtp_sd;
 	int rtcp_sd;
-        bool rtsp_describe;
+	bool rtsp_describe;
 
 	Buffer buffer;
-        Buffer lastSps;
-        Buffer lastPps;
+	Buffer lastSps;
+	Buffer lastPps;
 
     RtspThread::RtspMethod method;
 
@@ -73,19 +73,19 @@ protected:
 #endif
 
 public:
-	RemoteCameraRtsp( int p_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
+	RemoteCameraRtsp( int p_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
 	~RemoteCameraRtsp();
 
 	void Initialise();
 	void Terminate();
-        int Connect();
-        int Disconnect();
+	int Connect();
+	int Disconnect();
 
 	int PrimeCapture();
 	int PreCapture();
 	int Capture( Image &image );
 	int PostCapture();
-    	int CaptureAndRecord( Image &image, bool recording, char* event_directory );
+	int CaptureAndRecord( Image &image, bool recording, char* event_directory );
 };
 
 #endif // ZM_REMOTE_CAMERA_RTSP_H