Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 21.12 to master #174

Merged
merged 38 commits into from
Dec 17, 2021
Merged

Merge 21.12 to master #174

merged 38 commits into from
Dec 17, 2021

Conversation

HansBusch
Copy link
Member

Command below shows files modified. I've verified that all have version set to 21.12.

$ git diff --name-only HEAD 521411a28613b497230d8561d1fdf6fa7dc15ea0
README.md
doc/Analytics.xml
doc/AppMgmt.xml
doc/Core.xml
doc/ExportFileFormat.xml
doc/Media.xml
doc/Media2.xml
doc/Receiver.xml
doc/RecordingControl.xml
doc/RecordingSearch.xml
doc/Replay.xml
doc/Security.xml
doc/Streaming.xml
doc/index.html
doc/media/RecordingControl/image3.svg
wsdl/ver10/appmgmt/wsdl/appmgmt.wsdl
wsdl/ver10/device/wsdl/devicemgmt.wsdl
wsdl/ver10/schema/common.xsd
wsdl/ver10/schema/metadatastream.xsd
wsdl/ver10/schema/onvif.xsd
wsdl/ver20/analytics/humanbody.xsd
wsdl/ver20/media/wsdl/media.wsdl

HansBusch and others added 30 commits June 23, 2021 05:56
* Update Analytics.xml

Change 'shall' to 'should' in partial config updates requirement

* Align message source definition with Annex A update. Insert reference to avoid that the items are defined by examples.

* Clarify class likelihood. (#78)

* Clarify class likelihood.

* Range is [0..1].
* Remove requirement that sum shall be <= 1.
* Update example.

Change-Id: Ie0574ad87e2d6924c5c335e5b18ba20fb8026a6b

* Typo

Change-Id: I1adb70934a52a318db3772ee0d9af4648f16ce89

* Use enumerations for AudioClassType restriction values (#75)

Closes #72

* Add capability to signal no support for discovery. (#74)

* added CertPathValidationPolicyID to EventBrokerConfig (#76)

* added CertPathValidationPolicyID to EventBrokerConfig

* Annex D: updated to include analytics module and rule based on generic description language (#79)

* added common requirement for field parameter for region based detector rules (#81)

Co-authored-by: Sriram Bhetanabottla <sriramb@axis.com>

* Update counting rule based on new rule structure (#53)

* Split the counter into line crossing and occupancy counter.
* Clarify reset time as local time.
* Remove Direction from example to align OccupancyCounter example with specification.

* Move sigC definition to 5.4 since it may apply to any signing not onl… (#83)

* Move sigC definition to 5.4 since it may apply to any signing not only repeated.
Refactor layout since structure got lost in docbook format.

* Remove outdated explanation related to obsolete version zero using UUID references. (#84)

* Core/attr list (#87)

* Align simple item list types with elements for float and int.
Reuse onvif.xsd list types instead of redefining.

* Remove accidentally added file devicemgmt.xml.

* Core/app mgmt links (#82)

* Add two optional links for app configuration.

* Add error code for version mismatch.

* Clarify that the URI refers to the interface definition not the interface itself. Improve requirements.

* Improve section on timeout and keep-alive handling. (#88)

* Add reference to RTSP 2.0.
Improve section on timeout and keep-alive handling.
Improve chapter structure of the RTSP section.

* Related to #88: remove deprecated method SetTimeout also from chart.

* Replace text with xref in links to 5.2.3 section (#89)

Some places with links to 5.2.3 section in Analytic service spec are designed as a text instead of <xref linkend="_Ref9001629" />.

* Fix maxOccurrs to maxOccurs typo (#93)

Occurrence section has typo: maxOccurrs (double 'r')

* Fix order of parameter items in tt:LineCounting (#92)

Description of tt:LineCounting has invalid order of items inside Parameters.
ElementItemDescription shall follow after all SimpleItemDescription according to xml schema of ItemListDescription type.

* Fix incorrect xml, Class can only exist once per object (#99)

* Analytics/coordinate system (#94)

Replace Default by Normalized to align naming of standard coordinate system.
Related to ticket ext-2186.

* Add combined type bike. (#95)

* Update introduction section to GetEventProperties.  (#97)

Update introduction section to GetEventProperties.

* Fix ABNF missing example changes and improve readability by splitting long construct.  (#98)

* Fix ABNF missing example changes.

* Improve readability by splitting long construct.

* Change ABNF code to programlisting.

* Replace curved double quotes in ABNF by simple double quotes.

* Align example output with analytics spec.

* Remove superfluous curly bracket in JSON example

Co-authored-by: Fredrik Svensson <fredriks@axis.com>

* Sync credential.wsdl to 21.06 branch (#102)

This appears to have been lost in transition to github and should have been in 20.12.

* coordinates system clarification to media2 (#107)

* Add PasswordPolicySupported capability (#105)

* Add PasswordPolicySupported capability

* capabilities as stringlist

* Add flow.svg to new Use case examples appendix (annex) (#96)

flow.svg is based on source/flow.uml using http://www.plantuml.com

Change-Id: Id42e61714ebc6ead2a69a93b716237701175213c

Co-authored-by: Johan Adolfsson <johana@axis.com>

* doorcontrol.wsdl: Workaround for xs:any not last in Door (#100)

When Door extends DoorInfo it got the extensions in the "middle" of the
type which gsoap doesn't like causing occurance violation errors.
Instead extend DoorInfoBase and add the Capabilities element first
to Door type.

This solves https://wush.net/trac/onvif/ticket/2727

Change-Id: Ibb95984a41dfed35fa5cdd6ade5fbb9c45745be0

Co-authored-by: Johan Adolfsson <johana@axis.com>

* Fix typo in xml example

* Remove hidden annotation with wrong restriction (related to ext-2179) (#110)

* Remove hidden annotation with wrong restriction (related to ext-2179)

* Fix typo related to change.

* Change example coordinates to normative (related to ext-2214) (#109)

* Update revision information.

* Update revision information.

* Update version information.

* Update version information.

* Update version information.

* Update version information.

* Update version information.

* Update version information.

* Update version information.

* Update version information.

* Update replay.wsdl

* Update version information.

* Update version information.

* Apply review findings:
1. short title "AppMgmtSrv" vs "App Mgmt. Service". Other specs omit service. Should be corrected to "App Mgmt."
2. Missing line breaks in 6.2.1 after http codes
3. Missing explanation alignment of list in section 6.3.1
4. GetCapabilities response has wrong namespace timg (both old & new)
5. Figure 1 a bit too large and not centered because wrong dimensions (pixel instead of mm).
Fixed media directory name

* Review feedback: replace orderedlist because not supported by stylesheets.

* Correction of typos from specification review.

* Improve formatting based on review feedback.

* Move new item CertPathValidationPolicyID to extension point to avoid breaking change. (#117)

Co-authored-by: OksanaTyushkina <76164127+OksanaTyushkina@users.noreply.github.com>
Co-authored-by: Fredrik Svensson <fredriks@axis.com>
Co-authored-by: Matthew Brush <mbrush@codebrainz.ca>
Co-authored-by: Davide Cristanelli <davide.cristanelli@videotec.com>
Co-authored-by: sujith raman <67031640+sujithhanwha@users.noreply.github.com>
Co-authored-by: Sriram Bhetanabottla <1432443+bsriramprasad@users.noreply.github.com>
Co-authored-by: Sriram Bhetanabottla <sriramb@axis.com>
Co-authored-by: johado <papputten@gmail.com>
Co-authored-by: Johan Adolfsson <johana@axis.com>
Co-authored-by: Hans Busch <47081128+HansBusch@users.noreply.github.com>
Add security policy configuration APIs.
Co-authored-by: davide cristanelli <davide.cristanelli@videotec.com>
* Add optional Receiver configuration to Media2 specification and schema.
Fix broken links to
- humanbody.xsd
- humanface.xsd
Fix inconsistencies between spec table and schema for
* Color type, fix spec, xs:string -> tt:ColorDescriptor
* Smoking type, fix schema, bd:Smoking -> xs:string
* UsingMobile type, fix schema, bd:UsingMobile -> xs:string
* Activity type, fix spec, N/A -> xs:string

Change-Id: Icb18ee81f3353763f507c3340d03d1445b72b4c6
Fix inconsistency in the Media2 Service Specification for
the NoProfile fault message.
Change-Id: I9ffaa533da2336c6d6682d07fff3f2f5a9981fcc
Add capability MaxPasswordHistory
Fix typo. Replace 'avialable' by 'available'
* Remove DeviceID cap from schema as there is GetDeviceId call now.
* GetCapabilities -> GetServiceCapabilities in doc.

Change-Id: If7fca2c7ac6941dca5549806a6f45590a6701f3e
Fix inconsistency in the Security Configuration Service
Specification for the NoMatchingPrivateKey fault such that
it is consistent with Figure _Ref338934863 and with the table
that lists the Security configuration service specific fault codes.

It can be considered to make the corresponding fault an
Sender error.
Fix spelling in Media2 Service Specification.
Change-Id: Ia07dd5a8592dc52e2bf156574c5adefa07dfd761
* Add generic event data elements for Detector events

Change-Id: I21039e02b20d6048c133bdf6e8073d71f51c5280

* Merge section A1.1 and A1.1.1

- Describe event Data section in the Message Format section.
- Update Line, Field and Loitering Detector to refer to Data in the
  general Message Format section.

Change-Id: Ieacb9f16ea49a81ab4da8e72c6fd433ff5031cf8

* Add sentence about event data exensibility.

Change-Id: If0b70b4a21c8c593bc7c3d57a1ba26cc694ad8fc

* Align name ObjectID -> ObjectId

Change-Id: I6c327765463ac41bd4ed1161dee403cba137ddce
Change-Id: I005a38a8bd2a06ddc6e57673d605dcf337c5a62a
…ip by +gzip to standardize IANA registration. (#168)
* Compact color space definitions.

* Rework color space section. Combine two sections into one to improve readability without content change.
Add color space column to table and mention that it can be set on frame and object level.
Copy link
Contributor

@kieran242 kieran242 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved Hans.

@github-pages github-pages bot temporarily deployed to github-pages December 16, 2021 12:56 Inactive
@michael-msi michael-msi self-requested a review December 16, 2021 17:07
@HansBusch HansBusch merged commit 0dfaf1c into master Dec 17, 2021
@HansBusch HansBusch deleted the 21.12 branch December 17, 2021 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.