From 712f4b034a7513bb7fc616c87f21e13f60be7a19 Mon Sep 17 00:00:00 2001 From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com> Date: Fri, 7 Apr 2023 21:08:42 -0400 Subject: [PATCH 1/6] Revert "Merge pull request #829 from lloydbayley/main" This reverts commit 3abc483ef57df521b2945a9de4b2a18f6a9143d0, reversing changes made to 21beea2f2d9c8d7bbf71b25556536bdd55a10599. --- scripts/advanced.php | 93 +++++++++++++++++--------------------------- scripts/config.php | 6 +-- 2 files changed, 38 insertions(+), 61 deletions(-) diff --git a/scripts/advanced.php b/scripts/advanced.php index deeca88..a0ddf28 100644 --- a/scripts/advanced.php +++ b/scripts/advanced.php @@ -268,10 +268,9 @@ if (file_exists('./scripts/thisrun.txt')) { $newconfig = parse_ini_file('./scripts/firstrun.ini'); } ?> -

Advanced Settings


+

Advanced Settings

-
-

Privacy Threshold

+

Value: %

@@ -286,6 +285,7 @@ if (file_exists('./scripts/thisrun.txt')) { output.innerHTML = this.value; document.getElementById("predictionCount").innerHTML = parseInt((this.value * )/100); } + //Keep track of how many new input fields were added var number_of_new_rtsp_urls_added = 0; //Function to insert new input fields @@ -339,43 +339,18 @@ if (file_exists('./scripts/thisrun.txt')) { }

If a Human is predicted anywhere among the top predictions, the sample will be considered of human origin and no data will be collected. Start with 1% and move up as needed.

-

- -
-

Full Disk Behaviour

+

When the disk becomes full, you can choose to 'purge' old files to make room for new ones or 'keep' your data and stop all services instead.
Note: you can exclude specific files from 'purge' on the Recordings page.

-

-
- -

Audio Settings


Set Audio Card to 'default' to use PulseAudio (always recommended), or an ALSA recognized sound card device from the output of `arecord -L`. Choose the `dsnoop` device if it is available


Set Channels to the number of channels supported by your sound card. 32 max.

- -
-

Set Recording Length in seconds between 6 and 60. Multiples of 3 are recommended, as BirdNET analyzes in 3-second chunks.

- -
-

Set Extraction Length to something less than your Recording Length. Min=3 Max=Recording Length

- - -

-
@@ -404,25 +379,34 @@ foreach($formats as $format){ ?>

- Add
+ add

If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source.
Multiple streams are allowed but may have a impact on rPi performance.
Analyze ffmpeg CPU/Memory usage with top or htop if necessary.
To remove all and use the soundcard again, just delete the RTSP entries and click Save at the bottom.

-

-
-

BirdNET-Pi Password

+ +
+

Set Recording Length in seconds between 6 and 60. Multiples of 3 are recommended, as BirdNET analyzes in 3-second chunks.

+ +
+

Set Extraction Length to something less than your Recording Length. Min=3 Max=Recording Length

+ + +

BirdNET-Pi Password

This password will protect your "Tools" page and "Live Audio" stream.

show
-

-
-

Custom URL

+

Custom URL

When you update the URL below, the web server will reload, so be sure to wait at least 30 seconds and then go to your new URL.


The BirdNET-Pi URL is how the main page will be reached. If you want your installation to respond to an IP address, place that here, but be sure to indicate "http://".
Example for IP: http://192.168.0.109
Example if you own your own domain: https://virginia.birdnetpi.com

-

-
-

Options

>

This allows you to quiet the display of how many commits your installation is behind by relative to the Github repo. This number appears next to "Tools" when you're 50 or more commits behind.

@@ -430,10 +414,9 @@ foreach($formats as $format){ >

This allows you to remove the axes and labels of the spectrograms that are generated by Sox for each detection for a cleaner appearance.

-

-
-

Custom Image

+
+
@@ -441,10 +424,8 @@ foreach($formats as $format){

These allow you to show a custom image on the Overview page of your BirdNET-Pi. This can be used to show a dynamically updating picture of your garden, for example.

-

-
-

BirdNET-Lite Settings

+

BirdNET-Lite Settings

@@ -461,17 +442,15 @@ foreach($formats as $format){
    Min=0.5, Max=1.5

-

-
-

Accessibility Settings

+

Accessibility Settings

Birdsongs Frequency shifting configuration:
- This can be useful for hearing impaired people. Note: audio files will only be pitch shifted when the "FREQ SHIFT" button is manually clicked for a detection on the "Recordings" page.
+ this can be useful for hearing impaired people. Note: audio files will only be pitch shifted when the "FREQ SHIFT" button is manually clicked for a detection on the "Recordings" page.

- + - Choose the shifting tool here.
+ Choose here the shifting tool.

- Using ffmpeg: + using ffmpeg: e.g. origin=6000, target=4000, performs a shift of 2000 Hz down.
- +
- +

- Using sox: + using sox: e.g. shiftPitch=-1200 performs a shift of 1 octave down. This value is in 100ths of a semitone.
- +

-

+



diff --git a/scripts/config.php b/scripts/config.php index fb5c79d..1d782ec 100644 --- a/scripts/config.php +++ b/scripts/config.php @@ -472,10 +472,9 @@ function runProcess() {
BirdNET_6K_GLOBAL_MODEL (2020)

This is the BirdNET-Lite model, with bird sound recognition for more than 6,000 species worldwide. This is the default option and will generally work very for people in most of the world.
-
BirdNET_GLOBAL_3K_V2.2_Model_FP16 (2022)

This is the BirdNET-Analyzer model, a newer work-in-progress project with aims to improve on the BirdNET-Lite model. Currently it only supports about 3,500 species worldwide, meaning for some regions (North America, Europe, Australia) it will usually outperform the BirdNET-Lite model, but for other regions it will be worse.

-
[ In-depth technical write-up on the models here ]
+
(in-depth technical write-up on the models here)

@@ -483,7 +482,7 @@ function runProcess() {

Location

(Optional)
- +

@@ -651,7 +650,6 @@ https://discordapp.com/api/webhooks/{WebhookID}/{WebhookToken} ?> > >
-

Value: %

@@ -285,7 +286,6 @@ if (file_exists('./scripts/thisrun.txt')) { output.innerHTML = this.value; document.getElementById("predictionCount").innerHTML = parseInt((this.value * )/100); } - //Keep track of how many new input fields were added var number_of_new_rtsp_urls_added = 0; //Function to insert new input fields @@ -339,18 +339,43 @@ if (file_exists('./scripts/thisrun.txt')) { }

If a Human is predicted anywhere among the top predictions, the sample will be considered of human origin and no data will be collected. Start with 1% and move up as needed.

- +
+ +
+

Full Disk Behaviour

When the disk becomes full, you can choose to 'purge' old files to make room for new ones or 'keep' your data and stop all services instead.
Note: you can exclude specific files from 'purge' on the Recordings page.

+

+
+ +

Audio Settings


Set Audio Card to 'default' to use PulseAudio (always recommended), or an ALSA recognized sound card device from the output of `arecord -L`. Choose the `dsnoop` device if it is available


Set Channels to the number of channels supported by your sound card. 32 max.

+ +
+

Set Recording Length in seconds between 6 and 60. Multiples of 3 are recommended, as BirdNET analyzes in 3-second chunks.

+ +
+

Set Extraction Length to something less than your Recording Length. Min=3 Max=Recording Length

+ + +

+
@@ -379,34 +404,25 @@ if (file_exists('./scripts/thisrun.txt')) { ?>

- add
+ Add

If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source.
Multiple streams are allowed but may have a impact on rPi performance.
Analyze ffmpeg CPU/Memory usage with top or htop if necessary.
To remove all and use the soundcard again, just delete the RTSP entries and click Save at the bottom.

- -
-

Set Recording Length in seconds between 6 and 60. Multiples of 3 are recommended, as BirdNET analyzes in 3-second chunks.

- -
-

Set Extraction Length to something less than your Recording Length. Min=3 Max=Recording Length

- - -

BirdNET-Pi Password

+

+
+

BirdNET-Pi Password

This password will protect your "Tools" page and "Live Audio" stream.

show
-

Custom URL

+

+
+

Custom URL

When you update the URL below, the web server will reload, so be sure to wait at least 30 seconds and then go to your new URL.


The BirdNET-Pi URL is how the main page will be reached. If you want your installation to respond to an IP address, place that here, but be sure to indicate "http://".
Example for IP: http://192.168.0.109
Example if you own your own domain: https://virginia.birdnetpi.com

+

+
+

Options

>

This allows you to quiet the display of how many commits your installation is behind by relative to the Github repo. This number appears next to "Tools" when you're 50 or more commits behind.

@@ -414,9 +430,10 @@ foreach($formats as $format){ >

This allows you to remove the axes and labels of the spectrograms that are generated by Sox for each detection for a cleaner appearance.

+

-
- +
+

Custom Image


@@ -424,8 +441,10 @@ foreach($formats as $format){

These allow you to show a custom image on the Overview page of your BirdNET-Pi. This can be used to show a dynamically updating picture of your garden, for example.

+

-

BirdNET-Lite Settings

+
+

BirdNET-Lite Settings

@@ -442,15 +461,17 @@ foreach($formats as $format){
    Min=0.5, Max=1.5

+

-

Accessibility Settings

+
+

Accessibility Settings

Birdsongs Frequency shifting configuration:
- this can be useful for hearing impaired people. Note: audio files will only be pitch shifted when the "FREQ SHIFT" button is manually clicked for a detection on the "Recordings" page.
+ This can be useful for hearing impaired people. Note: audio files will only be pitch shifted when the "FREQ SHIFT" button is manually clicked for a detection on the "Recordings" page.

- + - Choose here the shifting tool.
+ Choose the shifting tool here.

- using ffmpeg: + Using ffmpeg: e.g. origin=6000, target=4000, performs a shift of 2000 Hz down.
- +
- +

- using sox: + Using sox: e.g. shiftPitch=-1200 performs a shift of 1 octave down. This value is in 100ths of a semitone.
- +

- +



diff --git a/scripts/config.php b/scripts/config.php index 1d782ec..fb5c79d 100644 --- a/scripts/config.php +++ b/scripts/config.php @@ -472,9 +472,10 @@ function runProcess() {
BirdNET_6K_GLOBAL_MODEL (2020)

This is the BirdNET-Lite model, with bird sound recognition for more than 6,000 species worldwide. This is the default option and will generally work very for people in most of the world.
+
BirdNET_GLOBAL_3K_V2.2_Model_FP16 (2022)

This is the BirdNET-Analyzer model, a newer work-in-progress project with aims to improve on the BirdNET-Lite model. Currently it only supports about 3,500 species worldwide, meaning for some regions (North America, Europe, Australia) it will usually outperform the BirdNET-Lite model, but for other regions it will be worse.

-
(in-depth technical write-up on the models here)
+
[ In-depth technical write-up on the models here ]

@@ -482,7 +483,7 @@ function runProcess() {

Location

(Optional)
- +

@@ -650,6 +651,7 @@ https://discordapp.com/api/webhooks/{WebhookID}/{WebhookToken} ?> > >
+