ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix_zmonvif' into storageareas

This commit is contained in:
Isaac Connor 2017-07-13 09:41:59 -04:00
parent e92974c5d4 5d96a8d14e
commit 171891cd52
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
onvif/scripts/zmonvif-probe.pl
View File

@ -253,13 +253,16 @@ sub profiles
foreach my $profile ( @{ $profiles } ) { foreach my $profile ( @{ $profiles } ) {
my $token = $profile->attr()->get_token() ; my $token = $profile->attr()->get_token() ;
print $token . ", " . my $VideoEncoderConfiguration = $profile->get_VideoEncoderConfiguration();
$profile->get_Name() . ", " . print join(', ', $token,
$profile->get_VideoEncoderConfiguration()->get_Encoding() . ", " . $profile->get_Name(),
$profile->get_VideoEncoderConfiguration()->get_Resolution()->get_Width() . ", " . ( $VideoEncoderConfiguration ? (
$profile->get_VideoEncoderConfiguration()->get_Resolution()->get_Height() . ", " . $VideoEncoderConfiguration->get_Encoding(),
$profile->get_VideoEncoderConfiguration()->get_RateControl()->get_FrameRateLimit() . $VideoEncoderConfiguration->get_Resolution()->get_Width(),
", "; $VideoEncoderConfiguration->get_Resolution()->get_Height(),
$VideoEncoderConfiguration->get_RateControl()->get_FrameRateLimit(),
) : () )
);
# Specification gives conflicting values for unicast stream types, try both. # Specification gives conflicting values for unicast stream types, try both.
# http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl#op.GetStreamUri # http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl#op.GetStreamUri