diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index 7602ae1c9..ea167c812 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -1049,7 +1049,7 @@ bool Monitor::Analyse() struct timeval now; gettimeofday( &now, NULL ); - if ( image_count && !(image_count%fps_report_interval) ) + if ( image_count && fps_report_interval && !(image_count%fps_report_interval) ) { fps = double(fps_report_interval)/(now.tv_sec-last_fps_time); Info( "%s: %d - Processing at %.2f fps", name, image_count, fps ); @@ -2589,7 +2589,7 @@ int Monitor::Capture() image_count++; - if ( image_count && !(image_count%fps_report_interval) ) + if ( image_count && fps_report_interval && !(image_count%fps_report_interval) ) { time_t now = image_buffer[index].timestamp->tv_sec; fps = double(fps_report_interval)/(now-last_fps_time); diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php index 233536975..fe665e5de 100644 --- a/web/lang/big5_big5.php +++ b/web/lang/big5_big5.php @@ -131,7 +131,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php index 96bd11946..712e40aa6 100644 --- a/web/lang/cn_zh.php +++ b/web/lang/cn_zh.php @@ -127,7 +127,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => '报警最大帧率必须是正整数或正浮点数', 'BadChannel' => '通é�“必须设为大于零的整数', 'BadDevice' => '必须为器件设置有效值', - 'BadFPSReportInterval' => 'FPS帧数报告间隔缓冲数必须是100以上整数', + 'BadFPSReportInterval' => 'FPS帧数报告间隔缓冲数必须是0以上整数', 'BadFormat' => 'æ ¼å¼�必须设为大于零的整数', 'BadFrameSkip' => '跳帧数必须设为大于零的整数', 'BadHeight' => '高度必须设为有效值', diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php index 2f4d91115..c58eb73b1 100644 --- a/web/lang/cs_cz.php +++ b/web/lang/cs_cz.php @@ -127,7 +127,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/de_de.php b/web/lang/de_de.php index 577d0c991..e5110f82e 100644 --- a/web/lang/de_de.php +++ b/web/lang/de_de.php @@ -127,7 +127,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm-Maximum-FPS muss eine positive Ganzzahl oder eine Gleitkommazahl sein', 'BadChannel' => 'Der Kanal muss ganzzahlig 0 oder größer sein', 'BadDevice' => 'Das Gerät muss eine gültige Systemresource sein', - 'BadFPSReportInterval' => 'Der FPS-Intervall-Puffer-Zähler muss ganzzahlig 100 oder größer sein', + 'BadFPSReportInterval' => 'Der FPS-Intervall-Puffer-Zähler muss ganzzahlig 0 oder größer sein', 'BadFormat' => 'Das Format muss ganzzahlig 0 oder größer sein', 'BadFrameSkip' => 'Der Auslasszähler für Frames muss ganzzahlig 0 oder größer sein', 'BadHeight' => 'Die Höhe muss auf einen gültigen Wert eingestellt sein', diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php index 0e692216d..c47df0d53 100644 --- a/web/lang/dk_dk.php +++ b/web/lang/dk_dk.php @@ -128,7 +128,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index a1b83c4ba..e9d9d5364 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -128,7 +128,7 @@ $SLANG = array( 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', 'BadFormat' => 'Format must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', 'BadHost' => 'Host must be set to a valid ip address or hostname, do not include http://', diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php index b6e5c613d..84a5aba4e 100644 --- a/web/lang/es_ar.php +++ b/web/lang/es_ar.php @@ -78,7 +78,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php index e847b0c68..3f7ea98ff 100644 --- a/web/lang/et_ee.php +++ b/web/lang/et_ee.php @@ -124,7 +124,7 @@ $SLANG = array( 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', 'BadFormat' => 'Format must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', 'BadHost' => 'Host must be set to a valid ip address or hostname, do not include http://', diff --git a/web/lang/fr_fr.php b/web/lang/fr_fr.php index ebd5fe9f0..fc10646c1 100644 --- a/web/lang/fr_fr.php +++ b/web/lang/fr_fr.php @@ -127,7 +127,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/he_il.php b/web/lang/he_il.php index 238be69d8..252f24ce3 100755 --- a/web/lang/he_il.php +++ b/web/lang/he_il.php @@ -127,7 +127,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php index 750489118..516397414 100644 --- a/web/lang/hu_hu.php +++ b/web/lang/hu_hu.php @@ -136,7 +136,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'A riadó maximális FPS száma pozitív szám legyen', 'BadChannel' => 'A csatorna száma 0 vagy nagyobb egész szám legyen', 'BadDevice' => 'Az eszköz érték valós legyen', - 'BadFPSReportInterval' => 'FPS információs idõköz puffer számlálója 100 vagy nagyobb egész legyen', + 'BadFPSReportInterval' => 'FPS információs idõköz puffer számlálója 0 vagy nagyobb egész legyen', 'BadFormat' => 'A típus 0 vagy nagyobb egész szám legyen', 'BadFrameSkip' => 'Képkocka eldobások száma 0 vagy nagyobb egész szám legyen', 'BadHeight' => 'A képmagasság érvényes érték legyen képpontban', diff --git a/web/lang/it_it.php b/web/lang/it_it.php index 488002ae6..747b32745 100644 --- a/web/lang/it_it.php +++ b/web/lang/it_it.php @@ -132,7 +132,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Il numero massimo di FPS dell\'allarme deve essere un numero intero positivo o un valore in virgola mobile', 'BadChannel' => 'Il canale deve essere settato con un numero intero uguale o maggiore di zero', 'BadDevice' => 'Il dispositivo deve essere impostato con un valore valido', - 'BadFPSReportInterval' => 'L\'intervallo di FPS per i report deve essere un numero intero superiore a 100', + 'BadFPSReportInterval' => 'L\'intervallo di FPS per i report deve essere un numero intero superiore a 0', 'BadFormat' => 'Il formato deve essere impostato con un numero intero come 0 o maggiore', 'BadFrameSkip' => 'Il numero di Frame da scartare deve essere un intero uguale a 0 o superiore', 'BadHeight' => 'L\'altezza deve essere impostata con un valore valido', diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php index e4e999a9b..8c18fa019 100644 --- a/web/lang/ja_jp.php +++ b/web/lang/ja_jp.php @@ -127,7 +127,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php index e856bc5f8..98891724e 100644 --- a/web/lang/nl_nl.php +++ b/web/lang/nl_nl.php @@ -127,7 +127,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php index 667fc8b8b..64ff57ee8 100644 --- a/web/lang/pl_pl.php +++ b/web/lang/pl_pl.php @@ -127,7 +127,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php index bf5d7f578..d56419eb4 100644 --- a/web/lang/pt_br.php +++ b/web/lang/pt_br.php @@ -67,7 +67,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php index 5c89c29f7..4a1781de3 100755 --- a/web/lang/ro_ro.php +++ b/web/lang/ro_ro.php @@ -98,7 +98,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php index f2f3c0d6c..a8ea5016d 100644 --- a/web/lang/ru_ru.php +++ b/web/lang/ru_ru.php @@ -127,7 +127,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Alarm Maximum FPS must be a positive integer or floating point value', 'BadChannel' => 'Channel must be set to an integer of zero or more', 'BadDevice' => 'Device must be set to a valid value', - 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more', + 'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more', 'BadFormat' => 'Format must be set to an integer of zero or more', 'BadFrameSkip' => 'Frame skip count must be an integer of zero or more', 'BadHeight' => 'Height must be set to a valid value', diff --git a/web/lang/se_se.php b/web/lang/se_se.php index 44190c88a..d1e5c5652 100644 --- a/web/lang/se_se.php +++ b/web/lang/se_se.php @@ -128,7 +128,7 @@ $SLANG = array( 'BadAlarmMaxFPS' => 'Larm för bilder/s måste vara ett positivt heltal eller ett flyttal', 'BadChannel' => 'Kanalen måste vara ett heltal, noll eller högre', 'BadDevice' => 'Enheten måste sättas till ett giltigt värde', - 'BadFPSReportInterval' => 'Buffern för ramintervallrapporten måste vara ett heltal på minst 100 eller högre', + 'BadFPSReportInterval' => 'Buffern för ramintervallrapporten måste vara ett heltal på minst 0 eller högre', 'BadFormat' => 'Formatet måste vara ett heltal, noll eller högre', 'BadFrameSkip' => 'Värdet för ramöverhopp måste vara ett heltal på 0 eller högre', 'BadHeight' => 'Höjden måste sättas till ett giltigt värde', diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php index 628f51374..92e5bde96 100644 --- a/web/skins/classic/views/js/monitor.js.php +++ b/web/skins/classic/views/js/monitor.js.php @@ -115,7 +115,7 @@ function validateForm( form ) errors[errors.length] = ""; if ( !form.elements['newMonitor[SectionLength]'].value || !(parseInt(form.elements['newMonitor[SectionLength]'].value) >= 30 ) ) errors[errors.length] = ""; - if ( !form.elements['newMonitor[FPSReportInterval]'].value || !(parseInt(form.elements['newMonitor[FPSReportInterval]'].value) >= 100 ) ) + if ( !form.elements['newMonitor[FPSReportInterval]'].value || !(parseInt(form.elements['newMonitor[FPSReportInterval]'].value) >= 0 ) ) errors[errors.length] = ""; if ( !form.elements['newMonitor[FrameSkip]'].value || !(parseInt(form.elements['newMonitor[FrameSkip]'].value) >= 0 ) ) errors[errors.length] = "";