v4l2 Revisions

This commit includes:
1.  Consolidate functions into appropriate modules
2.  Rename modules to reflect contents (v4l2, bktr, common)
3.  Combines v4l2 and bktr so they can be used together
4.  Implements functional prefixes
5.  Uses HAVE_V4L2, HAVE_BKTR instead of WITHOUT_
6.  Include pthread_np.h for FreeBSD

Author: Mr-DaveDev

CMakeLists.txt

@@ -29,38 +29,36 @@ option(WITH_MYSQL "enable MySQL database support" ${MYSQL_FOUND})
 option(WITH_PGSQL "enable PostgreSQL database support" ${PostgreSQL_FOUND})
 option(WITH_SQLITE3 "enable SQLite database support" ${SQLITE3_FOUND})
 option(WITH_V4L2 "enable Video 4 Linux (2) webcam support" ON)
-option(WITH_PWCBSD "enable PWC webcam support (BSD only)" OFF)
+option(WITH_BKTR "enable BKTR support (BSD only)" OFF)
 
 set(HAVE_FFMPEG ${WITH_FFMPEG})
 set(HAVE_MMAL ${WITH_MMAL})
 set(HAVE_MYSQL ${WITH_MYSQL})
 set(HAVE_PGSQL ${WITH_PGSQL})
 set(HAVE_SQLITE3 ${WITH_SQLITE3})
 
-set(WITHOUT_V4L2 ON)
-  if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND NOT(WITH_PWCBSD))
+set(HAVE_V4L2 OFF)
+  check_include_files("linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H)
+  if(HAVE_LINUX_VIDEODEV2_H AND WITH_V4L2)
+    set(HAVE_V4L2 ON )
+  endif(HAVE_LINUX_VIDEODEV2_H AND WITH_V4L2)
+
+set(HAVE_BKTR OFF)
+  if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
     check_include_files("dev/bktr/ioctl_bt848.h" HAVE_FREEBSD_BT848)
     check_include_files("dev/bktr/ioctl_meteor.h" HAVE_FREEBSD_METEOR)
-    if(HAVE_FREEBSD_BT848 AND HAVE_FREEBSD_METEOR AND WITH_V4L2 )
-      set(WITHOUT_V4L2 OFF )
-    endif(HAVE_FREEBSD_BT848 AND HAVE_FREEBSD_METEOR AND WITH_V4L2 )
-  endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND NOT(WITH_PWCBSD))
+    if(HAVE_FREEBSD_BT848 AND HAVE_FREEBSD_METEOR AND WITH_BKTR)
+      set(HAVE_BKTR ON )
+    endif(HAVE_FREEBSD_BT848 AND HAVE_FREEBSD_METEOR AND WITH_BKTR)
+  endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 
   if(CMAKE_SYSTEM_NAME MATCHES "NetBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
     check_include_files("dev/ic/bt8xx.h" HAVE_NETOPEN_BT8XX)
-    if(HAVE_NETOPEN_BT8XX AND WITH_V4L2)
-      set(WITHOUT_V4L2 OFF )
-    endif(HAVE_NETOPEN_BT8XX AND WITH_V4L2)
+    if(HAVE_NETOPEN_BT8XX AND WITH_BKTR)
+      set(HAVE_BKTR ON )
+    endif(HAVE_NETOPEN_BT8XX AND WITH_BKTR)
   endif(CMAKE_SYSTEM_NAME MATCHES "NetBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
 
-  if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    check_include_files("linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H)
-    if(HAVE_LINUX_VIDEODEV2_H AND WITH_V4L2)
-      set(WITHOUT_V4L2 OFF )
-    endif(HAVE_LINUX_VIDEODEV2_H AND WITH_V4L2)
-  endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-
-set(PWCBSD WITH_PWCBSD)
 
 configure_file(config.h.in "${CMAKE_CURRENT_SOURCE_DIR}/config.h")
 configure_file(motion-dist.conf.in motion-dist.conf)
@@ -77,13 +75,8 @@ configure_file(motion.init-FreeBSD.sh.in motion.init-FreeBSD.sh)
 list(APPEND SRC_FILES
      conf.c motion.c alg.c draw.c event.c ffmpeg.c jpegutils.c logger.c md5.c
      netcam.c netcam_ftp.c netcam_jpeg.c netcam_rtsp.c netcam_wget.c
-     picture.c rotate.c stream.c track.c vloopback_motion2.c webhttpd.c)
-if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND NOT(WITH_PWCBSD))
-	list(APPEND SRC_FILES video_freebsd.c)
-else()
-	list(APPEND SRC_FILES video2.c video_common.c)
-endif()
-
+     picture.c rotate.c stream.c track.c video_loopback.c webhttpd.c
+     video_v4l2.c video_common.c video_bktr.c)
 include_directories(${JPEG_INCLUDE_DIR})
 list(APPEND LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES})
 
@@ -122,12 +115,13 @@ message("--   Config Dir:             " ${sysconfdir})
 message("--   Bin Dir:                " ${BIN_PATH})
 message("--   JPEG Include Dir:       " ${JPEG_INCLUDE_DIR})
 message("--   WITH_V4L2:              " ${WITH_V4L2})
-message("--   Without V4L2:           " ${WITHOUT_V4L2})
-message("--   With PWC BSD:           " ${WITH_PWCBSD})
-message("--   MYSQL:   " ${WITH_MYSQL} " Include Dir: " ${MYSQL_INCLUDE_DIRS} )
+message("--   HAVE_V4L2:              " ${HAVE_V4L2})
+message("--   WITH_BKTR:              " ${WITH_BKTR})
+message("--   HAVE_BKTR:              " ${HAVE_BKTR})
+message("--   MYSQL:   " ${WITH_MYSQL}   " Include Dir: " ${MYSQL_INCLUDE_DIRS} )
 message("--   SQLITE3: " ${WITH_SQLITE3} " Include Dir: " ${SQLITE3_INCLUDE_DIRS} )
-message("--   PGSQL:   " ${WITH_PGSQL} " Include Dir: " ${PostgreSQL_INCLUDE_DIRS} )
-message("--   FFMPEG:  " ${WITH_FFMPEG} " Include Dir: " ${FFMPEG_INCLUDE_DIRS} )
+message("--   PGSQL:   " ${WITH_PGSQL}   " Include Dir: " ${PostgreSQL_INCLUDE_DIRS} )
+message("--   FFMPEG:  " ${WITH_FFMPEG}  " Include Dir: " ${FFMPEG_INCLUDE_DIRS} )
 message("--   MMAL:    " ${WITH_MMAL} )
 message("--   CFLAGS:  " ${CMAKE_C_FLAGS} )
 

Makefile.in

@@ -24,7 +24,7 @@ mandir      = @mandir@
 sysconfdir  = @sysconfdir@
 datadir     = @datadir@
 datarootdir = @datarootdir@
-docdir      = $(datadir)/doc/@PACKAGE_NAME@ 
+docdir      = $(datadir)/doc/@PACKAGE_NAME@
 examplesdir = $(datadir)/@PACKAGE_NAME@/examples
 
 ################################################################################
@@ -34,13 +34,12 @@ examplesdir = $(datadir)/@PACKAGE_NAME@/examples
 CFLAGS       = @CFLAGS@ -Wall -DVERSION=\"@PACKAGE_VERSION@\" -Dsysconfdir=\"$(sysconfdir)\" @FFMPEG_CFLAGS@ @MMAL_CFLAGS@
 LDFLAGS      = @LDFLAGS@
 LIBS         = @LIBS@  @MMAL_LIBS@ @FFMPEG_LIBS@
-VIDEO_OBJ    = @VIDEO@
 OBJ          = motion.o logger.o conf.o draw.o jpegutils.o \
-		 vloopback_motion2.o $(VIDEO_OBJ) \
+			   video_loopback.o video_v4l2.o video_common.o video_bktr.o \
 			   netcam.o netcam_ftp.o netcam_jpeg.o netcam_wget.o track.o \
 			   alg.o event.o picture.o rotate.o webhttpd.o \
 			   stream.o md5.o netcam_rtsp.o ffmpeg.o \
-			   @MMAL_OBJ@
+			   @MMAL_OBJ@ @SQLITE_OBJ@
 SRC          = $(OBJ:.o=.c)
 DOC          = CHANGELOG COPYING CREDITS README.md motion_guide.html mask1.png normal.jpg outputmotion1.jpg outputnormal1.jpg
 EXAMPLES     = *.conf motion.service
@@ -52,10 +51,10 @@ DEPEND_FILE  = .depend
 # ALL and PROGS build Motion and, possibly, Motion-control.                    #
 ################################################################################
 all: progs
-ifneq (,$(findstring freebsd,$(VIDEO_OBJ)))
-	@echo "Build complete, run \"gmake install\" to install Motion!"
-else
+ifeq ("@DISTRO@","Linux")
 	@echo "Build complete, run \"make install\" to install Motion!"
+else
+	@echo "Build complete, run \"gmake install\" to install Motion!"
 endif
 	@echo
 
@@ -64,16 +63,16 @@ progs: pre-build-info $(PROGS)
 ################################################################################
 # PRE-BUILD-INFO outputs some general info before the build process starts.    #
 ################################################################################
-pre-build-info: 
+pre-build-info:
 	@echo "Welcome to the setup procedure for Motion, the motion detection daemon! If you get"
 	@echo "error messages during this procedure, please report them to the mailing list. The"
 	@echo "Motion Guide contains all information you should need to get Motion up and running."
 	@echo
 	@echo "Version: @PACKAGE_VERSION@"
-ifneq (,$(findstring freebsd,$(VIDEO_OBJ)))
-	@echo "Platform: FreeBSD"
-else
+ifeq ("@DISTRO@","Linux")
 	@echo "Platform: Linux (if this is incorrect, please read README.FreeBSD)"
+else
+	@echo "Platform: *BSD/Darwin"
 endif
 	@echo
 
@@ -92,7 +91,7 @@ motion-objects: dep pre-mobject-info $(OBJ)
 	@echo "--------------------------------------------------------------------------------"
 	@echo "Motion object files compiled."
 	@echo
-	
+
 pre-mobject-info:
 	@echo "Compiling Motion object files..."
 	@echo "--------------------------------------------------------------------------------"
@@ -138,28 +137,28 @@ dev: distclean autotools all
 
 autotools:
 	autoconf
-	./configure --with-developer-flags 
+	./configure --with-developer-flags
 
 set-version:
 	autoconf
 	./configure --with-developer-flags
 
 help:
 	@echo "--------------------------------------------------------------------------------"
-	@echo "make                   Build motion from local copy in your computer"	
+	@echo "make                   Build motion from local copy in your computer"
 	@echo "make current           Build last version of motion from svn"
 	@echo "make dev               Build motion with dev flags"
 	@echo "make dev-git           Build motion with dev flags for git"
 	@echo "make build-commit      Build last version of motion and prepare to commit to svn"
 	@echo "make build-commit-git  Build last version of motion and prepare to commit to git"
-	@echo "make clean             Clean objects" 
-	@echo "make distclean         Clean everything"	
+	@echo "make clean             Clean objects"
+	@echo "make distclean         Clean everything"
 	@echo "make install           Install binary , examples , docs and config files"
 	@echo "make uninstall         Uninstall all installed files"
 	@echo "--------------------------------------------------------------------------------"
 	@echo
 
-	
+
 ################################################################################
 # INSTALL installs all relevant files.                                         #
 ################################################################################
@@ -229,7 +228,7 @@ clean: pre-build-info
 ################################################################################
 # DIST restores the directory to distribution state.                           #
 ################################################################################
-dist: distclean 
+dist: distclean
 	@chmod -R 644 *
 	@chmod 755 configure
 	@chmod 755 version.sh

README.FreeBSD

@@ -1,23 +1,19 @@
 The following file explains how to build and run
-Motion on FreeBSD. It was tested on FreeBSD 10.3.
+Motion on FreeBSD. It was tested on FreeBSD 11.0
 
 To build Motion on FreeBSD, you need the following packages:
-* autoconf
-* automake
-* ffmpeg
-* gcc
-* gmake
-* libjpeg-turbo
-* pkgconf
+* pkg install autoconf pkgconf automake gmake
 
 For database backend support, also install one of the following:
 * mysql57-client
 * postgresql95-contrib
 * sqlite3
 
-For PWC based webcams, also install:
-* pwcbsd
-* v4l_compat
+For webcams:
+* pkg install v4l_compat webcamd
+* Add cuse_load="YES" in /boot/loader.conf
+* Add webcamd_enable="YES" in the /etc/rc.conf
+* chmod 666 /dev/video0
 
 Then, run the following commands:
  autoreconf

conf.c

@@ -29,12 +29,6 @@
 
 #include "motion.h"
 
-#if (defined(__FreeBSD__) && !defined(PWCBSD))
-#include "video_freebsd.h"
-#else
-#include "video2.h"
-#endif
-
 #define EXTENSION ".conf"
 
 #define stripnewline(x) {if ((x)[strlen(x)-1]=='\n') (x)[strlen(x) - 1] = 0; }
@@ -56,7 +50,7 @@ struct config conf_template = {
     .snapshot_interval =               0,
     .locate_motion_mode =              "off",
     .locate_motion_style =             "box",
-    .input =                           IN_DEFAULT,
+    .input =                           DEF_INPUT,
     .norm =                            0,
     .frame_limit =                     DEF_MAXFRAMERATE,
     .quiet =                           1,
@@ -102,10 +96,8 @@ struct config conf_template = {
     .tuner_number =                    0,
     .timelapse =                       0,
     .timelapse_mode =                  DEF_TIMELAPSE_MODE,
-#ifdef __FreeBSD__
-    tuner_device:                   NULL,
-#endif
-    .video_device =                    VIDEO_DEVICE,
+    .tuner_device =                    NULL,
+    .video_device =                    DEF_VIDEO_DEVICE,
     .v4l2_palette =                    DEF_PALETTE,
     .vidpipe =                         NULL,
     .filepath =                        NULL,

conf.h

@@ -86,9 +86,7 @@ struct config {
     int tuner_number;
     int timelapse;
     const char *timelapse_mode;
-#ifdef __FreeBSD__
     const char *tuner_device;
-#endif
     const char *video_device;
     int v4l2_palette;
     const char *vidpipe;

config.h.in

@@ -8,9 +8,9 @@
 #cmakedefine HAVE_MYSQL
 #cmakedefine HAVE_PGSQL
 #cmakedefine HAVE_SQLITE3
-#cmakedefine PWCBSD
-#cmakedefine WITHOUT_V4L2
+#cmakedefine HAVE_BKTR
+#cmakedefine HAVE_V4L2
 
 /* Optional headers */
 #cmakedefine HAVE_LINUX_VIDEODEV2_H
-#cmakedefine HAVE_SYS_VIDEOIO_H
+