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

print the line out all at once, fixing the missing comma after fps.

This commit is contained in:
Isaac Connor 2017-07-13 10:27:53 -04:00
parent 5d96a8d14e
commit 9d1d2c1ce4
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,19 +250,9 @@ sub profiles
my $profiles = $result->get_Profiles(); my $profiles = $result->get_Profiles();
foreach my $profile ( @{ $profiles } ) { foreach my $profile ( @{ $profiles } ) {
my $token = $profile->attr()->get_token() ; my $token = $profile->attr()->get_token() ;
my $VideoEncoderConfiguration = $profile->get_VideoEncoderConfiguration();
print join(', ', $token,
$profile->get_Name(),
( $VideoEncoderConfiguration ? (
$VideoEncoderConfiguration->get_Encoding(),
$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
@ -281,9 +271,18 @@ sub profiles
die $result if not $result; die $result if not $result;
# print $result . "\n"; # print $result . "\n";
print $result->get_MediaUri()->get_Uri() . my $VideoEncoderConfiguration = $profile->get_VideoEncoderConfiguration();
"\n"; print join(', ', $token,
} $profile->get_Name(),
( $VideoEncoderConfiguration ? (
$VideoEncoderConfiguration->get_Encoding(),
$VideoEncoderConfiguration->get_Resolution()->get_Width(),
$VideoEncoderConfiguration->get_Resolution()->get_Height(),
$VideoEncoderConfiguration->get_RateControl()->get_FrameRateLimit(),
) : () ),
$result->get_MediaUri()->get_Uri() ,
). "\n";
} # end foreach profile
# #
# use message parser without schema validation ??? # use message parser without schema validation ???