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.

Sign up for GitHub

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

Update lib.php #384

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update lib.php #384

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c1764c
Update lib.php
zcworld Mar 18, 2020
fc7f548
Update lib.php
zcworld Mar 18, 2020
c9ab4e1
Update lib.php
zcworld Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 50 additions & 51 deletions www/lib/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
Copyright (c) 2010-2011 Bluecherry, LLC.
Copyright (c) 2010-2011 Bluecherry, LLC.
http://www.bluecherrydvr.com / [email protected]
Confidential, all rights reserved. No distribution is permitted.
*/
Expand Down Expand Up @@ -1080,66 +1080,65 @@ public function move($command, $id=false){
}
}

private function moveOnvif($command)
{
if (is_array($command) && (Inp::get('command') == 'move')) {
$speed_pantilt_x = '0.5';
$speed_pantilt_y = '0.5';
$pantilt_x = 0;
$pantilt_y = 0;
$zoom = 0;
$zoom_speed = '0.5';

$xy_value = 5 / 100 ;

if ($command['pan'] == 'r') {
$pantilt_x = $xy_value;
}

if ($command['pan'] == 'l') {
$pantilt_x = -1 * $xy_value;
}
private function moveOnvif($command)
{
if (is_array($command) && (Inp::get('command') == 'move')) {
$speed_pantilt_x = '0.5';
$speed_pantilt_y = '0.5';
$pantilt_x = 0;
$pantilt_y = 0;
$zoom = 0;
$zoom_speed = '0.5';

$xy_value = 5 / 100 ;

if ($command['pan'] == 'r') {
$pantilt_x = $xy_value;
}

if ($command['tilt'] == 'u') {
$pantilt_y = $xy_value;
}
if ($command['pan'] == 'l') {
$pantilt_x = -1 * $xy_value;
}

if ($command['tilt'] == 'd') {
$pantilt_y = -1 * $xy_value;
}
if ($command['tilt'] == 'u') {
$pantilt_y = $xy_value;
}

if ($command['zoom'] == 't') {
$zoom = '0.1';
}
if ($command['tilt'] == 'd') {
$pantilt_y = -1 * $xy_value;
}

if ($command['zoom'] == 'w') {
$zoom = '-0.1';
}
if ($command['zoom'] == 't') {
$zoom = '0.1';
}

$ponvif = new Ponvif();
$ponvif->setIPAddress($this->camera->info['ipAddr'] . ':' . $this->camera->info['onvif_port']);
$ponvif->setUsername($this->camera->info['rtsp_username']);
$ponvif->setPassword($this->camera->info['rtsp_password']);
if ($command['zoom'] == 'w') {
$zoom = '-0.1';
}
$ponvif = new Ponvif();
$ponvif->setIPAddress($this->camera->info['ipAddr'] . ':' . $this->camera->info['onvif_port']);
$ponvif->setUsername($this->camera->info['rtsp_username']);
$ponvif->setPassword($this->camera->info['rtsp_password']);


try {
$init = $ponvif->initialize();
$sources = $ponvif->getSources();
try {
$init = $ponvif->initialize();
$sources = $ponvif->getSources();

if (empty($sources) || $ponvif->isFault($sources)) {
// error
} else {
$profileToken = $sources[0][0]['profiletoken'];
if (empty($sources) || $ponvif->isFault($sources)) {
// error
} else {
$profileToken = $sources[0][0]['profiletoken'];

if ($pantilt_x || $pantilt_y) {
$ponvif->ptz_ContinuousMove($profileToken, $pantilt_x, $pantilt_y, $speed_pantilt_x, $speed_pantilt_y);
}
if ($pantilt_x || $pantilt_y) {
$ponvif->ptz_ContinuousMove($profileToken, $pantilt_x, $pantilt_y, $speed_pantilt_x, $speed_pantilt_y);
}

if ($zoom) {
$ponvif->ptz_ContinuousMoveZoom($profileToken, $zoom, $zoom_speed);
}
}
} catch (Exception $e) {
if ($zoom) {
$ponvif->ptz_ContinuousMoveZoom($profileToken, $zoom, $zoom_speed);
}
}
} catch (Exception $e) {
}
} elseif (!is_array($command) && $command == 'stop') {

Expand Down