diff --git a/FHEM/73_DoorBird.pm b/FHEM/73_DoorBird.pm
index eb0d2a166..d79ffc272 100644
--- a/FHEM/73_DoorBird.pm
+++ b/FHEM/73_DoorBird.pm
@@ -79,8 +79,6 @@ sub DoorBird_Initialize($)
"MaxHistory:slider,0,1,50 " .
"KeepAliveTimeout " .
"UdpPort:6524,35344 " .
- "SipDevice:" . join(",", devspec2array("TYPE=SIP")) . " " .
- "SipNumber " .
"ImageFileDir " .
"AudioFileDir " .
"VideoFileDir " .
@@ -170,8 +168,6 @@ sub DoorBird_Define($$)
$hash->{RevisonAPI} = "0.26";
$hash->{helper}{SOX} = "/usr/bin/sox"; #On Windows systems use "C:\Programme\sox\sox.exe"
$hash->{helper}{URL} = $url;
- $hash->{helper}{SipDevice} = AttrVal($name,"SipDevice","");
- $hash->{helper}{SipNumber} = AttrVal($name, "SipNumber", "**620");
$hash->{helper}{PollingTimeout} = AttrVal($name,"PollingTimeout",5);
$hash->{helper}{KeepAliveTimeout} = AttrVal($name, "KeepAliveTimeout", 30);
$hash->{helper}{MaxHistory} = AttrVal($name, "MaxHistory", 50);
@@ -211,7 +207,6 @@ sub DoorBird_Define($$)
Log3 $name, 5, $name. " : DoorBird - Define D : " . $def;
Log3 $name, 5, $name. " : DoorBird - Define A : " . @a;
Log3 $name, 5, $name. " : DoorBird - Define Name : " . $name;
- Log3 $name, 5, $name. " : DoorBird - Define SipDevice : " . $hash->{helper}{SipDevice};
Log3 $name, 5, $name. " : DoorBird - Define OpsModeList : " . Dumper(@{$hash->{helper}{OpsModeList}});
Log3 $name, 5, $name. " : DoorBird - Define OpsModeListBackup[0] : " . ${$hash->{helper}{OpsModeListBackup}}[0];
@@ -304,36 +299,6 @@ sub DoorBird_Attr(@)
$hash->{helper}{UdpPort} = $a[3];
}
}
- ### Check whether SipDevice attribute has been provided
- elsif ($a[2] eq "SipDevice") {
- ### Check whether SipDevice is defined as fhem device
- if (defined($defs{$a[3]})) {
- ### Set helper in hash
- $hash->{helper}{SipDevice} = $a[3];
-
- ### Log Entry for debugging purposes
- Log3 $name, 5, $name. " : DoorBird_Attr - SipDevice set to : " . $hash->{helper}{SipDevice};
- }
- else {
- ### Set helper in hash
- $hash->{helper}{SipDevice} = "";
-
- ### Log Entry for debugging purposes
- Log3 $name, 5, $name. " : DoorBird_Attr - SipDevice reset to : " . $hash->{helper}{SipDevice};
- }
- }
- ### Check whether SipNumber attribute has been provided
- elsif ($a[2] eq "SipNumber") {
- ### Check whether SipNumber is defined
- if (defined($a[3])) {
- ### Set helper in hash
- $hash->{helper}{SipNumber} = $a[3];
- }
- else {
- ### Set helper in hash
- $hash->{helper}{SipNumber} = "**620";
- }
- }
### Check whether PollingTimeout attribute has been provided
elsif ($a[2] eq "PollingTimeout") {
### Check whether PollingTimeout is numeric
@@ -2939,107 +2904,110 @@ sub DoorBird_Transmit_Audio($$) {
my $Password = DoorBird_credential_decrypt($hash->{helper}{".PASSWORD"});
my $Url = $hash->{helper}{URL};
my $Sox = $hash->{helper}{SOX};
- my $SipDevice = $hash->{helper}{SipDevice};
- my $SipNumber = $hash->{helper}{SipNumber};
my $AudioDataPathOrig = $option;
- my @ListSipDevices = devspec2array("TYPE=SIP");
- my $err;
### Log Entry for debugging purposes
Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - ---------------------------------------------------------------";
- ### If device of TYPE = SIP exists
- if (@ListSipDevices > 0) {
- ### If file exists
- if (-e $AudioDataPathOrig) {
- ### Create new filepath from old filepath
- my $AudioDataNew;
- my $AudioDataSizeNew;
- my $AudioDataPathNew = $AudioDataPathOrig;
- $AudioDataPathNew =~ s/\..*//;
- my $AudioDataPathTemp = $AudioDataPathNew . "_tmp.wav";
- $AudioDataPathNew .= ".ulaw";
+ ### If file exists
+ if (-e $AudioDataPathOrig) {
+ ### Create new filepath from old filepath
+ my $AudioDataNew;
+ my $AudioDataSizeNew;
+ my $AudioDataPathNew = $AudioDataPathOrig;
+ $AudioDataPathNew =~ s/\..*//;
+ $AudioDataPathNew .= ".wav";
- ### Delete future new file and temporary file if exist
- unlink($AudioDataPathTemp);
- unlink($AudioDataPathNew);
+ ### If the respective .wav file already exists
+ if (-e $AudioDataPathNew) {
+
+ ### Log Entry for debugging purposes
+ Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - wav file already exists : " . $AudioDataPathNew;
+
+ }
+ ### If the respective .wav file does not exists
+ else {
### Create Sox - command
- my $SoxCmd = $Sox . " -V " . $AudioDataPathOrig . " -r 8000 -b 8 -c 1 -e u-law " . $AudioDataPathTemp;
+ my $SoxCmd = $Sox . " -V " . $AudioDataPathOrig . " " . $AudioDataPathNew;
### Log Entry for debugging purposes
Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - Original Path exists : " . $AudioDataPathOrig;
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - Temp Path created : " . $AudioDataPathTemp;
Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - New Path created : " . $AudioDataPathNew;
Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - Sox System-Command : " . $SoxCmd;
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - SipDeviceAttribute : " . $SipDevice;
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - SipNumber : " . $SipNumber;
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - ListSipDevices : " . Dumper(@ListSipDevices);
-
+
### Convert file
system ($SoxCmd);
-
- ### Rename temporary file in .ulaw
- $err = rename($AudioDataPathTemp, $AudioDataPathNew);
-
- ### Get new filesize
- $AudioDataSizeNew = -s $AudioDataPathNew;
-
- ### Log Entry for debugging purposes
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - New Filesize : " . $AudioDataSizeNew;
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - rename response message : " . $err;
-
- ### If the a name for a SIP - TYPE device has been provided as per attribute
- if (defined($SipDevice)) {
- ### Log Entry for debugging purposes
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - Attribute for SIP device: " . $SipDevice;
-
- ### If SIP device provided in attribute exists
- if (defined($defs{$SipDevice})) {
- ### Log Entry for debugging purposes
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - SIP device in Attribute exists";
- }
- ### If SIP device provided in attribute does NOT exists
- else {
- ### Take the first available SIP device
- $SipDevice= $ListSipDevices[0];
-
- ### Log Entry for debugging purposes
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - SIP device in Attribute does NOT exist";
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - SipDevice chosen : " . $SipDevice;
- }
- }
- ### If the a name for a SIP - TYPE device has NOT been provided as per attribute
- else {
- ### Take the first available SIP device
- $SipDevice= $ListSipDevices[0];
-
- ### Log Entry for debugging purposes
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - SIP device has not been provided in Attribute";
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - SipDevice chosen : " . $SipDevice;
- }
-
-
- ### Use SIP device and transfer filepath
- my $FhemCommand = "set " . $SipDevice . " call " . $SipNumber . " 30 " . $AudioDataPathNew;
- fhem($FhemCommand);
-
- return "The audio file: " . $AudioDataPathOrig . " has been passed to the fhem device " . $SipDevice;
}
- ### If Filepath does not exist
+
+ ### Get filesize of wav file
+ $AudioDataSizeNew = -s $AudioDataPathNew;
+
+ ### Get FileInfo and extract the length of wav file in seconds
+ my $SoxCmd = $Sox . " " . $AudioDataPathNew . " -n stat stats";
+
+ my @FileInfo = qx($SoxCmd 2>&1);
+ my $AudioLength = $FileInfo[1];
+ $AudioLength =~ s/Length \(seconds\)\://;
+ $AudioLength =~ s/\s+//g;
+ $AudioLength = int($AudioLength);
+
+ ### Log Entry for debugging purposes
+ Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - AudioLength in seconds : " . $AudioLength;
+ Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - New Filesize : " . $AudioDataSizeNew;
+
+ ### Create complete command URL for DoorBird depending on whether SessionIdSecurity has been enabled (>0) or disabled (=0)
+ my $UrlPrefix = "http://" . $Url . "/bha-api/";
+ my $UrlPostfix;
+
+ ### If the Session ID has been activated
+ if ($hash->{helper}{SessionIdSec} > 0) {
+ $UrlPostfix = " sessionid=" . $hash->{helper}{SessionId} . " content-type=\"audio/basic\" use-content-length=true";
+ }
+ ### If the Session ID has NOT been activated use username and password instead
else {
- ### Log Entry
- Log3 $name, 3, $name. " : DoorBird_Transmit_Audio - Path doesn't exist : " . $AudioDataPathOrig;
- Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - ---------------------------------------------------------------";
- return "The audio file: " . $AudioDataPathOrig . " does not exist!"
+ my $username = DoorBird_credential_decrypt($hash->{helper}{".USER"});
+ my $password = DoorBird_credential_decrypt($hash->{helper}{".PASSWORD"});
+ $UrlPostfix = " content-type=\"audio/basic\" use-content-length=true user=". $username . " passwd=" . $password;
}
+ my $CommandURL = $UrlPrefix . "audio-transmit.cgi" . $UrlPostfix;
+
+ ### Log Entry for debugging purposes
+ Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - CommandURL : " . $CommandURL ;
+
+ ### Create the gst-lauch command
+ my $GstCommand = "gst-launch-1.0 filesrc location=";
+ $GstCommand .= $AudioDataPathNew;
+ $GstCommand .= " ! wavparse ! audioconvert ! audioresample ! \"audio/x-raw,format=S16LE,rate=8000,channels=1\" ! mulawenc ! \"audio/x-mulaw,rate=8000,channels=1\" ! curlhttpsink location=";
+ $GstCommand .= $CommandURL;
+
+ ### Log Entry for debugging purposes
+ Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - GstCommand : " . $GstCommand ;
+
+ ### Create command for shell
+ my $ShellCommand = "timeout " . ($AudioLength + 3) . " " . $GstCommand . " &";
+
+ ### Log Entry for debugging purposes
+ Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - ShellCommand : " . $ShellCommand;
+
+ ### Pass shell command to shell and continue with the code below
+ eval {
+ system($ShellCommand) or die "Could not execute" . $ShellCommand . " ". $@;
+ };
+ ### If error message appered
+ if ( $@ ) {
+ # $ErrorMessage = $@;
+ }
+
+ Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - ---------------------------------------------------------------";
+ return "The audio file: " . $AudioDataPathOrig . " has been streamed to the DoorBird";
}
- ### If no device TYPE = SIP exists
+ ### If Filepath does not exist
else {
### Log Entry
- Log3 $name, 3, $name. " : DoorBird_Transmit_Audio - No device with TYPE=SIP exists. Install SIP device first";
+ Log3 $name, 3, $name. " : DoorBird_Transmit_Audio - Path doesn't exist : " . $AudioDataPathOrig;
Log3 $name, 5, $name. " : DoorBird_Transmit_Audio - ---------------------------------------------------------------";
- return "No device with TYPE=SIP exists. Install SIP device first"
+ return "The audio file: " . $AudioDataPathOrig . " does not exist!"
}
}
####END####### Define Subfunction for LIVE AUDIO TRANSMIT ######################################################END#####
@@ -4184,13 +4152,6 @@ sub DoorBird_BlockGet($$$$) {
-
-
- SipDevice : | Name of the fhem SIP device which is registered in the DoorBird unit as those ones who are allowed to call the DoorBird. Refer to SIP.
- The default value is the first SIP device in fhem.
-
- |
-
SessionIdSec : | Time in seconds for how long the session Id shall be valid, which is required for secure Video and Audio transmission. The DoorBird kills the session Id after 10min = 600s automatically. In case of use with CCTV recording units, this function must be disabled by setting to 0.
@@ -4198,12 +4159,6 @@ sub DoorBird_BlockGet($$$$) {
|
-
-
- SipNumber : | The telephone number under which the DoorBird unit is registered and can be called.
- The default value is **620
- |
-
AudioFileDir : | The relative (e.g. "audio") or absolute (e.g. "/mnt/NAS/audio") with or without trailing "/" directory path to which the audio files supposed to be stored.
@@ -4393,18 +4348,6 @@ sub DoorBird_BlockGet($$$$) {
Der Default Wert ist 540s = 9min.
|
-
-
- SipDevice : | Name des fhem SIP Device mit wessen Nummer in der DoorBird - Anlage hinterlegt wurde die die DoorBird - Anlage anrufen dürfen. Refer to SIP.
- Der Default Wert ist das erste SIP device in fhem.
- |
-
-
-
- SipNumber : | Die Telefonnummer unter der die DoorBird / Anlage registriert und erreicht werden kann.
- Der Default Wert ist **620
- |
-
AudioFileDir : | Der relative (z.B. "audio") oder absolute (z.B. "/mnt/NAS/audio") Verzeichnispfad mit oder ohne nachfolgendem Pfadzeichen "/" in welchen die Audio-Dateien abgelegt sind.
|