Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
This commit is contained in:
Steve Gilvarry
commit
ea1ae815f1
|
|
@ -0,0 +1 @@
|
|||
.git
|
||||
|
|
@ -6,6 +6,7 @@ notifications:
|
|||
branches:
|
||||
except:
|
||||
- modern
|
||||
cache: ccache
|
||||
addons:
|
||||
sauce_connect:
|
||||
username: "zoneminder"
|
||||
|
|
|
|||
|
|
@ -795,3 +795,9 @@ configure_file(
|
|||
add_custom_target(uninstall
|
||||
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake)
|
||||
|
||||
# Configure CCache if available
|
||||
find_program(CCACHE_FOUND ccache)
|
||||
if(CCACHE_FOUND)
|
||||
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
|
||||
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
|
||||
endif(CCACHE_FOUND)
|
||||
|
|
|
|||
29
Dockerfile
29
Dockerfile
|
|
@ -3,11 +3,9 @@
|
|||
FROM ubuntu:trusty
|
||||
MAINTAINER Kyle Johnson <kjohnson@gnulnx.net>
|
||||
|
||||
# Let the container know that there is no tty
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
# Resynchronize the package index files
|
||||
RUN apt-get update && apt-get install -y \
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||
libpolkit-gobject-1-dev build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev \
|
||||
libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 \
|
||||
libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm cmake libjpeg-turbo8-dev \
|
||||
|
|
@ -16,7 +14,8 @@ RUN apt-get update && apt-get install -y \
|
|||
mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore7 vlc-data libcurl4-openssl-dev \
|
||||
libavformat-dev libswscale-dev libavutil-dev libavcodec-dev libavfilter-dev \
|
||||
libavresample-dev libavdevice-dev libpostproc-dev libv4l-dev libtool libnetpbm10-dev \
|
||||
libmime-lite-perl dh-autoreconf dpatch
|
||||
libmime-lite-perl dh-autoreconf dpatch \
|
||||
&& apt-get clean
|
||||
|
||||
# Copy local code into our container
|
||||
ADD . /ZoneMinder
|
||||
|
|
@ -31,11 +30,8 @@ WORKDIR /ZoneMinder
|
|||
#RUN ./configure --with-libarch=lib/$DEB_HOST_GNU_TYPE --disable-debug --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-webdir=/var/www/zm --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-mmap=yes --enable-onvif ZM_SSL_LIB=openssl ZM_DB_USER=zm ZM_DB_PASS=zm
|
||||
RUN cmake .
|
||||
|
||||
# Build ZoneMinder
|
||||
RUN make
|
||||
|
||||
# Install ZoneMinder
|
||||
RUN make install
|
||||
# Build & install ZoneMinder
|
||||
RUN make && make install
|
||||
|
||||
# ensure writable folders
|
||||
RUN ./zmlinkcontent.sh
|
||||
|
|
@ -43,10 +39,6 @@ RUN ./zmlinkcontent.sh
|
|||
# Adding the start script
|
||||
ADD utils/docker/start.sh /tmp/start.sh
|
||||
|
||||
# Ensure we can run this
|
||||
# TODO - Files ADD'ed have 755 already...why do we need this?
|
||||
RUN chmod 755 /tmp/start.sh
|
||||
|
||||
# give files in /usr/local/share/zoneminder/
|
||||
RUN chown -R www-data:www-data /usr/local/share/zoneminder/
|
||||
|
||||
|
|
@ -65,7 +57,10 @@ RUN useradd -m -s /bin/bash -G sudo zoneminder
|
|||
RUN echo 'zoneminder:zoneminder' | chpasswd
|
||||
|
||||
# Expose ssh and http ports
|
||||
EXPOSE 80
|
||||
EXPOSE 22
|
||||
EXPOSE 22 80
|
||||
|
||||
# Initial database and apache setup:
|
||||
RUN "/ZoneMinder/utils/docker/setup.sh"
|
||||
|
||||
CMD ["/ZoneMinder/utils/docker/start.sh"]
|
||||
|
||||
CMD "/tmp/start.sh"
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@
|
|||
weekly
|
||||
notifempty
|
||||
missingok
|
||||
create 660 http http
|
||||
create 660 @WEB_USER@ @WEB_GROUP@
|
||||
}
|
||||
|
|
|
|||
12
docs/api.rst
12
docs/api.rst
|
|
@ -272,7 +272,17 @@ This returns the full list of configuration parameters:
|
|||
|
||||
Each configuration parameter has an Id, Name, Value and other fields. Chances are you are likely only going to focus on these 3.
|
||||
|
||||
(Example of changing config TBD)
|
||||
The edit function of the Configs API is a little quirky at the moment. Its format deviates from the usual edit flow of other APIs. This will be fixed, eventually. For now, to change the "Value" of ZM_X10_HOUSE_CODE from A to B:
|
||||
|
||||
::
|
||||
|
||||
curl -XPUT http://server/zm/api/configs/edit/ZM_X10_HOUSE_CODE.json -d "Config[Value]=B"
|
||||
|
||||
To validate changes have been made:
|
||||
|
||||
::
|
||||
|
||||
curl -XGET http://server/zm/api/configs/view/ZM_X10_HOUSE_CODE.json
|
||||
|
||||
Run State Apis
|
||||
^^^^^^^^^^^^^^^
|
||||
|
|
|
|||
|
|
@ -698,7 +698,7 @@ Now go to http://zoneminder_IP/ and stop the ZM service. Continue to http://zon
|
|||
|
||||
I upgraded by distribution and ZM stopped working
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
Some possibilties (Incomplete list and subject to correction)
|
||||
Some possibilities (Incomplete list and subject to correction)
|
||||
``[[/usr/local/bin/zmfix: /usr/lib/libmysqlclient.so.15: version `MYSQL_5.0' not found (required by /usr/local/bin/zmfix)]]`` :: Solution: Recompile and reinstall Zoneminder.
|
||||
Any time you update a major version that ZoneMinder depends on, you need to recompile ZoneMinder.
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ Zmrepo supports the two most recent, major releases of each Redhat based distro.
|
|||
|
||||
The following notes are based on real problems which have occurred:
|
||||
|
||||
- Zmrepo assumes you have installed the underlying distrubution **using the official installation media for that distro**. Third party "Spins" are not supported and may not work correctly.
|
||||
- Zmrepo assumes you have installed the underlying distribution **using the official installation media for that distro**. Third party "Spins" are not supported and may not work correctly.
|
||||
|
||||
- ZoneMinder is intended to be installed in an environment dedicated to ZoneMinder. While ZoneMinder will play well with many applications, some invariably will not. Asterisk is one such example.
|
||||
|
||||
|
|
|
|||
|
|
@ -49,10 +49,10 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Analytics::Types::MetadataStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
VideoAnalytics => { # ONVIF::Analytics::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::Analytics::Types::Frame
|
||||
PTZStatus => { # ONVIF::Analytics::Types::PTZStatus
|
||||
Position => { # ONVIF::Analytics::Types::PTZVector
|
||||
|
|
@ -155,7 +155,7 @@ Constructor. The following data structure may be passed to new():
|
|||
},
|
||||
PTZ => { # ONVIF::Analytics::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::Analytics::Types::PTZStatus
|
||||
Position => { # ONVIF::Analytics::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@ of the corresponding class can be passed instead of the marked hash ref.
|
|||
You may pass any combination of objects, hash and list refs to these
|
||||
methods, as long as you meet the structure.
|
||||
|
||||
List items (i.e. multiple occurences) are not displayed in the synopsis.
|
||||
List items (i.e. multiple occurrences) are not displayed in the synopsis.
|
||||
You may generally pass a list ref of hash refs (or objects) instead of a hash
|
||||
ref - this may result in invalid XML if used improperly, though. Note that
|
||||
SOAP::WSDL always expects list references at maximum depth position.
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ of the corresponding class can be passed instead of the marked hash ref.
|
|||
You may pass any combination of objects, hash and list refs to these
|
||||
methods, as long as you meet the structure.
|
||||
|
||||
List items (i.e. multiple occurences) are not displayed in the synopsis.
|
||||
List items (i.e. multiple occurrences) are not displayed in the synopsis.
|
||||
You may generally pass a list ref of hash refs (or objects) instead of a hash
|
||||
ref - this may result in invalid XML if used improperly, though. Note that
|
||||
SOAP::WSDL always expects list references at maximum depth position.
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Analytics::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Analytics::Types::ColorspaceRange
|
||||
X => { # ONVIF::Analytics::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ get_/set_ methods:
|
|||
|
||||
=item * token
|
||||
|
||||
Token that uniquely refernces this configuration. Length up to 64 characters.
|
||||
Token that uniquely references this configuration. Length up to 64 characters.
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -114,10 +114,10 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Analytics::Types::MetadataStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
VideoAnalytics => { # ONVIF::Analytics::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::Analytics::Types::Frame
|
||||
PTZStatus => { # ONVIF::Analytics::Types::PTZStatus
|
||||
Position => { # ONVIF::Analytics::Types::PTZVector
|
||||
|
|
@ -220,7 +220,7 @@ Constructor. The following data structure may be passed to new():
|
|||
},
|
||||
PTZ => { # ONVIF::Analytics::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::Analytics::Types::PTZStatus
|
||||
Position => { # ONVIF::Analytics::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ Constructor. The following data structure may be passed to new():
|
|||
{ # ONVIF::Analytics::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Analytics::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Analytics::Types::ColorspaceRange
|
||||
X => { # ONVIF::Analytics::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ Constructor. The following data structure may be passed to new():
|
|||
FontColor => { # ONVIF::Analytics::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Analytics::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Analytics::Types::ColorspaceRange
|
||||
X => { # ONVIF::Analytics::Types::FloatRange
|
||||
|
|
@ -171,7 +171,7 @@ Constructor. The following data structure may be passed to new():
|
|||
BackgroundColor => { # ONVIF::Analytics::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Analytics::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Analytics::Types::ColorspaceRange
|
||||
X => { # ONVIF::Analytics::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ Constructor. The following data structure may be passed to new():
|
|||
FontColor => { # ONVIF::Analytics::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Analytics::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Analytics::Types::ColorspaceRange
|
||||
X => { # ONVIF::Analytics::Types::FloatRange
|
||||
|
|
@ -175,7 +175,7 @@ Constructor. The following data structure may be passed to new():
|
|||
BackgroundColor => { # ONVIF::Analytics::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Analytics::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Analytics::Types::ColorspaceRange
|
||||
X => { # ONVIF::Analytics::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Analytics::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ Constructor. The following data structure may be passed to new():
|
|||
{ # ONVIF::Analytics::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Analytics::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ Constructor. The following data structure may be passed to new():
|
|||
CurrentTourSpot => { # ONVIF::Analytics::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Analytics::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Analytics::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::Analytics::Types::PTZStatus
|
||||
Position => { # ONVIF::Analytics::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ Constructor. The following data structure may be passed to new():
|
|||
CurrentTourSpot => { # ONVIF::Analytics::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Analytics::Types::PTZVector
|
||||
|
|
@ -187,7 +187,7 @@ Constructor. The following data structure may be passed to new():
|
|||
TourSpot => { # ONVIF::Analytics::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Analytics::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Analytics::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::Analytics::Types::Frame
|
||||
PTZStatus => { # ONVIF::Analytics::Types::PTZStatus
|
||||
Position => { # ONVIF::Analytics::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -49,10 +49,10 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Device::Types::MetadataStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
VideoAnalytics => { # ONVIF::Device::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::Device::Types::Frame
|
||||
PTZStatus => { # ONVIF::Device::Types::PTZStatus
|
||||
Position => { # ONVIF::Device::Types::PTZVector
|
||||
|
|
@ -155,7 +155,7 @@ Constructor. The following data structure may be passed to new():
|
|||
},
|
||||
PTZ => { # ONVIF::Device::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::Device::Types::PTZStatus
|
||||
Position => { # ONVIF::Device::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -2205,7 +2205,7 @@ of the corresponding class can be passed instead of the marked hash ref.
|
|||
You may pass any combination of objects, hash and list refs to these
|
||||
methods, as long as you meet the structure.
|
||||
|
||||
List items (i.e. multiple occurences) are not displayed in the synopsis.
|
||||
List items (i.e. multiple occurrences) are not displayed in the synopsis.
|
||||
You may generally pass a list ref of hash refs (or objects) instead of a hash
|
||||
ref - this may result in invalid XML if used improperly, though. Note that
|
||||
SOAP::WSDL always expects list references at maximum depth position.
|
||||
|
|
@ -2358,7 +2358,7 @@ Returns a L<ONVIF::Device::Elements::GetSystemLogResponse|ONVIF::Device::Element
|
|||
|
||||
=head3 GetSystemSupportInformation
|
||||
|
||||
This operation gets arbitary device diagnostics information from the device.
|
||||
This operation gets arbitrary device diagnostics information from the device.
|
||||
|
||||
Returns a L<ONVIF::Device::Elements::GetSystemSupportInformationResponse|ONVIF::Device::Elements::GetSystemSupportInformationResponse> object.
|
||||
|
||||
|
|
@ -2602,7 +2602,7 @@ Returns a L<ONVIF::Device::Elements::GetHostnameResponse|ONVIF::Device::Elements
|
|||
|
||||
=head3 SetHostname
|
||||
|
||||
A device shall accept string formated according to RFC 1123 section 2.1 or alternatively to RFC 952, other string shall be considered as invalid strings.
|
||||
A device shall accept string formatted according to RFC 1123 section 2.1 or alternatively to RFC 952, other string shall be considered as invalid strings.
|
||||
|
||||
Returns a L<ONVIF::Device::Elements::SetHostnameResponse|ONVIF::Device::Elements::SetHostnameResponse> object.
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Device::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Device::Types::ColorspaceRange
|
||||
X => { # ONVIF::Device::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ get_/set_ methods:
|
|||
|
||||
=item * token
|
||||
|
||||
Token that uniquely refernces this configuration. Length up to 64 characters.
|
||||
Token that uniquely references this configuration. Length up to 64 characters.
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -114,10 +114,10 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Device::Types::MetadataStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
VideoAnalytics => { # ONVIF::Device::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::Device::Types::Frame
|
||||
PTZStatus => { # ONVIF::Device::Types::PTZStatus
|
||||
Position => { # ONVIF::Device::Types::PTZVector
|
||||
|
|
@ -220,7 +220,7 @@ Constructor. The following data structure may be passed to new():
|
|||
},
|
||||
PTZ => { # ONVIF::Device::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::Device::Types::PTZStatus
|
||||
Position => { # ONVIF::Device::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ Constructor. The following data structure may be passed to new():
|
|||
{ # ONVIF::Device::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Device::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Device::Types::ColorspaceRange
|
||||
X => { # ONVIF::Device::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ Constructor. The following data structure may be passed to new():
|
|||
FontColor => { # ONVIF::Device::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Device::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Device::Types::ColorspaceRange
|
||||
X => { # ONVIF::Device::Types::FloatRange
|
||||
|
|
@ -171,7 +171,7 @@ Constructor. The following data structure may be passed to new():
|
|||
BackgroundColor => { # ONVIF::Device::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Device::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Device::Types::ColorspaceRange
|
||||
X => { # ONVIF::Device::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ Constructor. The following data structure may be passed to new():
|
|||
FontColor => { # ONVIF::Device::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Device::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Device::Types::ColorspaceRange
|
||||
X => { # ONVIF::Device::Types::FloatRange
|
||||
|
|
@ -175,7 +175,7 @@ Constructor. The following data structure may be passed to new():
|
|||
BackgroundColor => { # ONVIF::Device::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Device::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Device::Types::ColorspaceRange
|
||||
X => { # ONVIF::Device::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Device::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Device::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ Constructor. The following data structure may be passed to new():
|
|||
{ # ONVIF::Device::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Device::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Device::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ Constructor. The following data structure may be passed to new():
|
|||
CurrentTourSpot => { # ONVIF::Device::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Device::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Device::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Device::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::Device::Types::PTZStatus
|
||||
Position => { # ONVIF::Device::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ Constructor. The following data structure may be passed to new():
|
|||
CurrentTourSpot => { # ONVIF::Device::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Device::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Device::Types::PTZVector
|
||||
|
|
@ -187,7 +187,7 @@ Constructor. The following data structure may be passed to new():
|
|||
TourSpot => { # ONVIF::Device::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Device::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Device::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Device::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::Device::Types::Frame
|
||||
PTZStatus => { # ONVIF::Device::Types::PTZStatus
|
||||
Position => { # ONVIF::Device::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ Constructor. The following data structure may be passed to new():
|
|||
FontColor => { # ONVIF::Media::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Media::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Media::Types::ColorspaceRange
|
||||
X => { # ONVIF::Media::Types::FloatRange
|
||||
|
|
@ -153,7 +153,7 @@ Constructor. The following data structure may be passed to new():
|
|||
BackgroundColor => { # ONVIF::Media::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Media::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Media::Types::ColorspaceRange
|
||||
X => { # ONVIF::Media::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -49,10 +49,10 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Media::Types::MetadataStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
VideoAnalytics => { # ONVIF::Media::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::Media::Types::Frame
|
||||
PTZStatus => { # ONVIF::Media::Types::PTZStatus
|
||||
Position => { # ONVIF::Media::Types::PTZVector
|
||||
|
|
@ -155,7 +155,7 @@ Constructor. The following data structure may be passed to new():
|
|||
},
|
||||
PTZ => { # ONVIF::Media::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::Media::Types::PTZStatus
|
||||
Position => { # ONVIF::Media::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -2127,7 +2127,7 @@ of the corresponding class can be passed instead of the marked hash ref.
|
|||
You may pass any combination of objects, hash and list refs to these
|
||||
methods, as long as you meet the structure.
|
||||
|
||||
List items (i.e. multiple occurences) are not displayed in the synopsis.
|
||||
List items (i.e. multiple occurrences) are not displayed in the synopsis.
|
||||
You may generally pass a list ref of hash refs (or objects) instead of a hash
|
||||
ref - this may result in invalid XML if used improperly, though. Note that
|
||||
SOAP::WSDL always expects list references at maximum depth position.
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Media::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Media::Types::ColorspaceRange
|
||||
X => { # ONVIF::Media::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ get_/set_ methods:
|
|||
|
||||
=item * token
|
||||
|
||||
Token that uniquely refernces this configuration. Length up to 64 characters.
|
||||
Token that uniquely references this configuration. Length up to 64 characters.
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -114,10 +114,10 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Media::Types::MetadataStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
VideoAnalytics => { # ONVIF::Media::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::Media::Types::Frame
|
||||
PTZStatus => { # ONVIF::Media::Types::PTZStatus
|
||||
Position => { # ONVIF::Media::Types::PTZVector
|
||||
|
|
@ -220,7 +220,7 @@ Constructor. The following data structure may be passed to new():
|
|||
},
|
||||
PTZ => { # ONVIF::Media::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::Media::Types::PTZStatus
|
||||
Position => { # ONVIF::Media::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ Constructor. The following data structure may be passed to new():
|
|||
{ # ONVIF::Media::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Media::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Media::Types::ColorspaceRange
|
||||
X => { # ONVIF::Media::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ Constructor. The following data structure may be passed to new():
|
|||
FontColor => { # ONVIF::Media::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Media::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Media::Types::ColorspaceRange
|
||||
X => { # ONVIF::Media::Types::FloatRange
|
||||
|
|
@ -171,7 +171,7 @@ Constructor. The following data structure may be passed to new():
|
|||
BackgroundColor => { # ONVIF::Media::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Media::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Media::Types::ColorspaceRange
|
||||
X => { # ONVIF::Media::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ Constructor. The following data structure may be passed to new():
|
|||
FontColor => { # ONVIF::Media::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Media::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Media::Types::ColorspaceRange
|
||||
X => { # ONVIF::Media::Types::FloatRange
|
||||
|
|
@ -175,7 +175,7 @@ Constructor. The following data structure may be passed to new():
|
|||
BackgroundColor => { # ONVIF::Media::Types::OSDColorOptions
|
||||
Color => { # ONVIF::Media::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::Media::Types::ColorspaceRange
|
||||
X => { # ONVIF::Media::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Media::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Media::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ Constructor. The following data structure may be passed to new():
|
|||
{ # ONVIF::Media::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Media::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Media::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ Constructor. The following data structure may be passed to new():
|
|||
CurrentTourSpot => { # ONVIF::Media::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Media::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Media::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Media::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::Media::Types::PTZStatus
|
||||
Position => { # ONVIF::Media::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ Constructor. The following data structure may be passed to new():
|
|||
CurrentTourSpot => { # ONVIF::Media::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Media::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Media::Types::PTZVector
|
||||
|
|
@ -187,7 +187,7 @@ Constructor. The following data structure may be passed to new():
|
|||
TourSpot => { # ONVIF::Media::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::Media::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::Media::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::Media::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::Media::Types::Frame
|
||||
PTZStatus => { # ONVIF::Media::Types::PTZStatus
|
||||
Position => { # ONVIF::Media::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ Constructor. The following data structure may be passed to new():
|
|||
CurrentTourSpot => { # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
@ -149,7 +149,7 @@ Constructor. The following data structure may be passed to new():
|
|||
TourSpot => { # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ Constructor. The following data structure may be passed to new():
|
|||
CurrentTourSpot => { # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
@ -149,7 +149,7 @@ Constructor. The following data structure may be passed to new():
|
|||
TourSpot => { # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -49,10 +49,10 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::PTZ::Types::MetadataStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
VideoAnalytics => { # ONVIF::PTZ::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::PTZ::Types::Frame
|
||||
PTZStatus => { # ONVIF::PTZ::Types::PTZStatus
|
||||
Position => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
@ -155,7 +155,7 @@ Constructor. The following data structure may be passed to new():
|
|||
},
|
||||
PTZ => { # ONVIF::PTZ::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::PTZ::Types::PTZStatus
|
||||
Position => { # ONVIF::PTZ::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ Constructor. The following data structure may be passed to new():
|
|||
CurrentTourSpot => { # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
@ -163,7 +163,7 @@ Constructor. The following data structure may be passed to new():
|
|||
TourSpot => { # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -775,7 +775,7 @@ of the corresponding class can be passed instead of the marked hash ref.
|
|||
You may pass any combination of objects, hash and list refs to these
|
||||
methods, as long as you meet the structure.
|
||||
|
||||
List items (i.e. multiple occurences) are not displayed in the synopsis.
|
||||
List items (i.e. multiple occurrences) are not displayed in the synopsis.
|
||||
You may generally pass a list ref of hash refs (or objects) instead of a hash
|
||||
ref - this may result in invalid XML if used improperly, though. Note that
|
||||
SOAP::WSDL always expects list references at maximum depth position.
|
||||
|
|
@ -1136,7 +1136,7 @@ Returns a L<ONVIF::PTZ::Elements::ModifyPresetTourResponse|ONVIF::PTZ::Elements:
|
|||
CurrentTourSpot => { # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
@ -1168,7 +1168,7 @@ Returns a L<ONVIF::PTZ::Elements::ModifyPresetTourResponse|ONVIF::PTZ::Elements:
|
|||
TourSpot => { # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::PTZ::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::PTZ::Types::ColorspaceRange
|
||||
X => { # ONVIF::PTZ::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ get_/set_ methods:
|
|||
|
||||
=item * token
|
||||
|
||||
Token that uniquely refernces this configuration. Length up to 64 characters.
|
||||
Token that uniquely references this configuration. Length up to 64 characters.
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -114,10 +114,10 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::PTZ::Types::MetadataStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
VideoAnalytics => { # ONVIF::PTZ::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::PTZ::Types::Frame
|
||||
PTZStatus => { # ONVIF::PTZ::Types::PTZStatus
|
||||
Position => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
@ -220,7 +220,7 @@ Constructor. The following data structure may be passed to new():
|
|||
},
|
||||
PTZ => { # ONVIF::PTZ::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::PTZ::Types::PTZStatus
|
||||
Position => { # ONVIF::PTZ::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ Constructor. The following data structure may be passed to new():
|
|||
{ # ONVIF::PTZ::Types::OSDColorOptions
|
||||
Color => { # ONVIF::PTZ::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::PTZ::Types::ColorspaceRange
|
||||
X => { # ONVIF::PTZ::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ Constructor. The following data structure may be passed to new():
|
|||
FontColor => { # ONVIF::PTZ::Types::OSDColorOptions
|
||||
Color => { # ONVIF::PTZ::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::PTZ::Types::ColorspaceRange
|
||||
X => { # ONVIF::PTZ::Types::FloatRange
|
||||
|
|
@ -171,7 +171,7 @@ Constructor. The following data structure may be passed to new():
|
|||
BackgroundColor => { # ONVIF::PTZ::Types::OSDColorOptions
|
||||
Color => { # ONVIF::PTZ::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::PTZ::Types::ColorspaceRange
|
||||
X => { # ONVIF::PTZ::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ Constructor. The following data structure may be passed to new():
|
|||
FontColor => { # ONVIF::PTZ::Types::OSDColorOptions
|
||||
Color => { # ONVIF::PTZ::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::PTZ::Types::ColorspaceRange
|
||||
X => { # ONVIF::PTZ::Types::FloatRange
|
||||
|
|
@ -175,7 +175,7 @@ Constructor. The following data structure may be passed to new():
|
|||
BackgroundColor => { # ONVIF::PTZ::Types::OSDColorOptions
|
||||
Color => { # ONVIF::PTZ::Types::ColorOptions
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
ColorList => ,
|
||||
ColorspaceRange => { # ONVIF::PTZ::Types::ColorspaceRange
|
||||
X => { # ONVIF::PTZ::Types::FloatRange
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ Constructor. The following data structure may be passed to new():
|
|||
{ # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ Constructor. The following data structure may be passed to new():
|
|||
CurrentTourSpot => { # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::PTZ::Types::PTZStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PTZStatus => { # ONVIF::PTZ::Types::PTZStatus
|
||||
Position => { # ONVIF::PTZ::Types::PTZVector
|
||||
PanTilt => ,
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ Constructor. The following data structure may be passed to new():
|
|||
CurrentTourSpot => { # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
@ -187,7 +187,7 @@ Constructor. The following data structure may be passed to new():
|
|||
TourSpot => { # ONVIF::PTZ::Types::PTZPresetTourSpot
|
||||
PresetDetail => { # ONVIF::PTZ::Types::PTZPresetTourPresetDetail
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
PresetToken => $some_value, # ReferenceToken
|
||||
Home => $some_value, # boolean
|
||||
PTZPosition => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Constructor. The following data structure may be passed to new():
|
|||
|
||||
{ # ONVIF::PTZ::Types::VideoAnalyticsStream
|
||||
# One of the following elements.
|
||||
# No occurance checks yet, so be sure to pass just one...
|
||||
# No occurrence checks yet, so be sure to pass just one...
|
||||
Frame => { # ONVIF::PTZ::Types::Frame
|
||||
PTZStatus => { # ONVIF::PTZ::Types::PTZStatus
|
||||
Position => { # ONVIF::PTZ::Types::PTZVector
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ of the corresponding class can be passed instead of the marked hash ref.
|
|||
You may pass any combination of objects, hash and list refs to these
|
||||
methods, as long as you meet the structure.
|
||||
|
||||
List items (i.e. multiple occurences) are not displayed in the synopsis.
|
||||
List items (i.e. multiple occurrences) are not displayed in the synopsis.
|
||||
You may generally pass a list ref of hash refs (or objects) instead of a hash
|
||||
ref - this may result in invalid XML if used improperly, though. Note that
|
||||
SOAP::WSDL always expects list references at maximum depth position.
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ of the corresponding class can be passed instead of the marked hash ref.
|
|||
You may pass any combination of objects, hash and list refs to these
|
||||
methods, as long as you meet the structure.
|
||||
|
||||
List items (i.e. multiple occurences) are not displayed in the synopsis.
|
||||
List items (i.e. multiple occurrences) are not displayed in the synopsis.
|
||||
You may generally pass a list ref of hash refs (or objects) instead of a hash
|
||||
ref - this may result in invalid XML if used improperly, though. Note that
|
||||
SOAP::WSDL always expects list references at maximum depth position.
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ of the corresponding class can be passed instead of the marked hash ref.
|
|||
You may pass any combination of objects, hash and list refs to these
|
||||
methods, as long as you meet the structure.
|
||||
|
||||
List items (i.e. multiple occurences) are not displayed in the synopsis.
|
||||
List items (i.e. multiple occurrences) are not displayed in the synopsis.
|
||||
You may generally pass a list ref of hash refs (or objects) instead of a hash
|
||||
ref - this may result in invalid XML if used improperly, though. Note that
|
||||
SOAP::WSDL always expects list references at maximum depth position.
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ sub loadConfigFromDB {
|
|||
#print( "Name = '$name'\n" );
|
||||
my $option = $options_hash{$name};
|
||||
if ( !$option ) {
|
||||
warn( "No option '$name' found, removing" );
|
||||
warn( "No option '$name' found, removing.\n" );
|
||||
next;
|
||||
}
|
||||
#next if ( $option->{category} eq 'hidden' );
|
||||
|
|
|
|||
|
|
@ -414,7 +414,7 @@ sub generateVideo
|
|||
or Fatal( "Can't execute '$sql': ".$sth->errstr() );
|
||||
if ( wantarray() )
|
||||
{
|
||||
return( $format, sprintf( "%s/%s", getEventPath( $event ), $output ) );
|
||||
return( $format, $output );
|
||||
}
|
||||
}
|
||||
return( 1 );
|
||||
|
|
|
|||
|
|
@ -222,6 +222,7 @@ foreach my $event_id ( @event_ids ) {
|
|||
my $video_file = $Event->GenerateVideo( $rate, $fps, $scale, $size, $overwrite, $format );
|
||||
if ( $video_file ) {
|
||||
push @video_files, $video_file;
|
||||
print( STDOUT $video_file."\n" );
|
||||
}
|
||||
} # end foreach event_id
|
||||
|
||||
|
|
@ -253,9 +254,6 @@ if ( $concat_name ) {
|
|||
Error( "Unable to generate video, check /ffmpeg.log for details");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
print( STDOUT $video_file."\n" );
|
||||
}
|
||||
#unlink $input_file_list;
|
||||
#print( STDOUT $event->{MonitorId}.'/'.$event->{Id}.'/'.$video_file."\n" );
|
||||
#print( STDOUT $video_file."\n" );
|
||||
exit( 0 );
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@ uint8_t* Image::WriteBuffer(const unsigned int p_width, const unsigned int p_hei
|
|||
}
|
||||
|
||||
if(!p_height || !p_width) {
|
||||
Error("WriteBuffer called with invaid width or height: %d %d",p_width,p_height);
|
||||
Error("WriteBuffer called with invalid width or height: %d %d",p_width,p_height);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Start MySQL
|
||||
/usr/bin/mysqld_safe &
|
||||
|
||||
# Give MySQL time to wake up
|
||||
SECONDS_LEFT=120
|
||||
while true; do
|
||||
sleep 1
|
||||
mysqladmin ping
|
||||
if [ $? -eq 0 ];then
|
||||
break; # Success
|
||||
fi
|
||||
let SECONDS_LEFT=SECONDS_LEFT-1
|
||||
|
||||
# If we have waited >120 seconds, give up
|
||||
# ZM should never have a database that large!
|
||||
# if $COUNTER -lt 120
|
||||
if [ $SECONDS_LEFT -eq 0 ];then
|
||||
return -1;
|
||||
fi
|
||||
done
|
||||
|
||||
# Create the ZoneMinder database
|
||||
mysql -u root < db/zm_create.sql
|
||||
|
||||
# Add the ZoneMinder DB user
|
||||
mysql -u root -e "grant insert,select,update,delete,lock tables,alter on zm.* to 'zmuser'@'localhost' identified by 'zmpass';"
|
||||
|
||||
# Activate CGI
|
||||
a2enmod cgi
|
||||
|
||||
# Activate modrewrite
|
||||
a2enmod rewrite
|
||||
|
||||
# Shut down mysql cleanly:
|
||||
kill $(cat /var/run/mysqld/mysqld.pid)
|
||||
sleep 5
|
||||
|
||||
exit 0
|
||||
|
|
@ -9,6 +9,9 @@ mount -t tmpfs -o rw,nosuid,nodev,noexec,relatime,size=512M tmpfs /dev/shm
|
|||
# Start MySQL
|
||||
/usr/bin/mysqld_safe &
|
||||
|
||||
# Ensure we shut down mysql cleanly later:
|
||||
trap close_mysql SIGTERM
|
||||
|
||||
# Give MySQL time to wake up
|
||||
SECONDS_LEFT=120
|
||||
while true; do
|
||||
|
|
@ -27,18 +30,6 @@ while true; do
|
|||
fi
|
||||
done
|
||||
|
||||
# Create the ZoneMinder database
|
||||
mysql -u root < db/zm_create.sql
|
||||
|
||||
# Add the ZoneMinder DB user
|
||||
mysql -u root -e "grant insert,select,update,delete,lock tables,alter on zm.* to 'zmuser'@'localhost' identified by 'zmpass';"
|
||||
|
||||
# Activate CGI
|
||||
a2enmod cgi
|
||||
|
||||
# Activate modrewrite
|
||||
a2enmod rewrite
|
||||
|
||||
# Restart apache
|
||||
service apache2 restart
|
||||
|
||||
|
|
@ -46,4 +37,14 @@ service apache2 restart
|
|||
/usr/local/bin/zmpkg.pl start
|
||||
|
||||
# Start SSHD
|
||||
/usr/sbin/sshd -D
|
||||
/usr/sbin/sshd
|
||||
|
||||
while :
|
||||
do
|
||||
sleep 3600
|
||||
done
|
||||
|
||||
function close_mysql {
|
||||
kill $(cat /var/run/mysqld/mysqld.pid)
|
||||
sleep 5
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue