diff options
Diffstat (limited to 'testing/motion/motion-dist.conf.in.patch')
| -rw-r--r-- | testing/motion/motion-dist.conf.in.patch | 184 |
1 files changed, 52 insertions, 132 deletions
diff --git a/testing/motion/motion-dist.conf.in.patch b/testing/motion/motion-dist.conf.in.patch index 9d6d82da61..0fddba9b8b 100644 --- a/testing/motion/motion-dist.conf.in.patch +++ b/testing/motion/motion-dist.conf.in.patch @@ -1,124 +1,43 @@ ---- motion-3.2.12/motion-dist.conf.in +--- motion-4.0.1/motion-dist.conf.in +++ ./motion-dist.conf.in @@ -1,6 +1,6 @@ # Rename this distribution example file to motion.conf # -# This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@ -+# This config file was generated by motion 3.2.12 - - ++# This config file was generated by motion 4.0.1 + + ############################################################ -@@ -237,57 +237,6 @@ - - - ############################################################ --# FFMPEG related options --# Film (mpeg) file output, and deinterlacing of the video input --# The options movie_filename and timelapse_filename are also used --# by the ffmpeg feature --############################################################ -- --# Use ffmpeg to encode mpeg movies in realtime (default: off) --ffmpeg_cap_new on -- --# Use ffmpeg to make movies with only the pixels moving --# object (ghost images) (default: off) --ffmpeg_cap_motion off -- --# Use ffmpeg to encode a timelapse movie --# Default value 0 = off - else save frame every Nth second --ffmpeg_timelapse 0 -- --# The file rollover mode of the timelapse video --# Valid values: hourly, daily (default), weekly-sunday, weekly-monday, monthly, manual --ffmpeg_timelapse_mode daily -- --# Bitrate to be used by the ffmpeg encoder (default: 400000) --# This option is ignored if ffmpeg_variable_bitrate is not 0 (disabled) --ffmpeg_bps 500000 -- --# Enables and defines variable bitrate for the ffmpeg encoder. --# ffmpeg_bps is ignored if variable bitrate is enabled. --# Valid values: 0 (default) = fixed bitrate defined by ffmpeg_bps, --# or the range 2 - 31 where 2 means best quality and 31 is worst. --ffmpeg_variable_bitrate 0 -- --# Codec to used by ffmpeg for the video compression. --# Timelapse mpegs are always made in mpeg1 format independent from this option. --# Supported formats are: mpeg1 (ffmpeg-0.4.8 only), mpeg4 (default), and msmpeg4. --# mpeg1 - gives you files with extension .mpg --# mpeg4 or msmpeg4 - gives you files with extension .avi --# msmpeg4 is recommended for use with Windows Media Player because --# it requires no installation of codec on the Windows client. --# swf - gives you a flash film with extension .swf --# flv - gives you a flash video with extension .flv --# ffv1 - FF video codec 1 for Lossless Encoding ( experimental ) --# mov - QuickTime ( testing ) --ffmpeg_video_codec mpeg4 -- --# Use ffmpeg to deinterlace video. Necessary if you use an analog camera --# and see horizontal combing on moving objects in video or pictures. --# (default: off) --ffmpeg_deinterlace off -- -- --############################################################ - # Snapshots (Traditional Periodic Webcam File Output) - ############################################################ - -@@ -356,7 +305,7 @@ - +@@ -447,7 +447,7 @@ + # Target base directory for pictures and films # Recommended to use absolute path. (Default: current working directory) --target_dir /usr/local/apache2/htdocs/cam1 -+target_dir /home/motion/motion_captures - +-#target_dir /tmp/motion ++target_dir /var/lib/motion + # File path for snapshots (jpeg or ppm) relative to target_dir # Default: %v-%Y%m%d%H%M%S-snapshot -@@ -376,22 +325,7 @@ - # convention for preview shots. See motion guide for details - jpeg_filename %v-%Y%m%d%H%M%S-%q - --# File path for motion triggered ffmpeg films (mpeg) relative to target_dir --# Default: %v-%Y%m%d%H%M%S --# Default value is equivalent to legacy oldlayout option --# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H%M%S --# File extension .mpg or .avi is automatically added so do not include this --# This option was previously called ffmpeg_filename --movie_filename %v-%Y%m%d%H%M%S - --# File path for timelapse mpegs relative to target_dir --# Default: %Y%m%d-timelapse --# Default value is near equivalent to legacy oldlayout option --# For Motion 3.0 compatible mode choose: %Y/%m/%d-timelapse --# File extension .mpg is automatically added so do not include this --timelapse_filename %Y%m%d-timelapse -- -- - ############################################################ - # Live Webcam Server - ############################################################ -@@ -540,69 +474,6 @@ - # It depends on the driver, some drivers don't detect a lost camera at all - # Some hang the motion thread. Some even hang the PC! (default: none) +@@ -666,70 +666,6 @@ + # It depends on the driver, some drivers dosn't detect a lost camera at all + # Some hangs the motion thread. Some even hangs the PC! (default: none) ; on_camera_lost value - --############################################################ --# Common Options For MySQL and PostgreSQL database features. --# Options require the MySQL/PostgreSQL options to be active also. --############################################################ +-##################################################################### +-# Common Options for database features. +-# Options require database options to be active also. +-##################################################################### - --# Log to the database when creating motion triggered image file (default: on) --sql_log_image on +-# Log to the database when creating motion triggered picture file (default: on) +-; sql_log_picture on - -# Log to the database when creating a snapshot image file (default: on) --sql_log_snapshot on +-; sql_log_snapshot on - --# Log to the database when creating motion triggered mpeg file (default: off) --sql_log_mpeg off +-# Log to the database when creating motion triggered movie file (default: off) +-; sql_log_movie off - --# Log to the database when creating timelapse mpeg file (default: off) --sql_log_timelapse off +-# Log to the database when creating timelapse movies file (default: off) +-; sql_log_timelapse off - -# SQL query string that is sent to the database -# Use same conversion specifiers has for text features @@ -126,45 +45,46 @@ -# %n = the number representing the file_type -# %f = filename with full path -# Default value: +-# Create tables : +-## +-# Mysql +-# CREATE TABLE security (camera int, filename char(80) not null, frame int, file_type int, time_stamp timestamp(14), event_time_stamp timestamp(14)); +-# +-# Postgresql +-# CREATE TABLE security (camera int, filename char(80) not null, frame int, file_type int, time_stamp timestamp without time zone, event_time_stamp timestamp without time zone); +-# -# insert into security(camera, filename, frame, file_type, time_stamp, text_event) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') --sql_query insert into security(camera, filename, frame, file_type, time_stamp, event_time_stamp) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') +-; sql_query insert into security(camera, filename, frame, file_type, time_stamp, event_time_stamp) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') - - -############################################################ --# Database Options For MySQL +-# Database Options -############################################################ - --# Mysql database to log to (default: not defined) --; mysql_db value -- --# The host on which the database is located (default: localhost) --; mysql_host value -- --# User account name for MySQL database (default: not defined) --; mysql_user value +-# database type : mysql, postgresql, sqlite3 (default : not defined) +-; database_type value - --# User password for MySQL database (default: not defined) --; mysql_password value +-# database to log to (default: not defined) +-# for sqlite3, the full path and name for the database. +-; database_dbname value - +-# The host on which the database is located (default: localhost) +-; database_host value - --############################################################ --# Database Options For PostgreSQL --############################################################ -- --# PostgreSQL database to log to (default: not defined) --; pgsql_db value +-# User account name for database (default: not defined) +-; database_user value - --# The host on which the database is located (default: localhost) --; pgsql_host value +-# User password for database (default: not defined) +-; database_password value - --# User account name for PostgreSQL database (default: not defined) --; pgsql_user value +-# Port on which the database is located +-# mysql 3306 , postgresql 5432 (default: not defined) +-; database_port value - --# User password for PostgreSQL database (default: not defined) --; pgsql_password value +-# Database wait time in milliseconds for locked database to +-# be unlocked before returning database locked error (default 0) +-; database_busy_timeout 0 - --# Port on which the PostgreSQL database is located (default: 5432) --; pgsql_port 5432 - - + + ############################################################ |