MSpeech v1.5.7

Signed-off-by: Mikhail Grigorev <[email protected]>

Author: CHERTS

ASR.pas

@@ -1,9 +1,11 @@
 { ############################################################################ }
 { #                                                                          # }
-{ #  MSpeech v1.5.5 - Ðàñïîçíàâàíèå ðå÷è èñïîëüçóÿ Google Speech API         # }
+{ #  MSpeech v1.5.7 - Ðàñïîçíàâàíèå ðå÷è èñïîëüçóÿ Google Speech API         # }
 { #                                                                          # }
 { #  License: GPLv3                                                          # }
 { #                                                                          # }
+{ #  Automated Speech Recognition (ASR) Module                               # }
+{ #                                                                          # }
 { #  Author: Mikhail Grigorev (icq: 161867489, email: [email protected]) # }
 { #                                                                          # }
 { ############################################################################ }
@@ -19,7 +21,7 @@   //JSONError = class(Exception);
   // Ñòðóêòóðà ñ èíôîðìàöèåé î ðàñïîçíàííîé ôðàçå (ïåðåäàåòñÿ â callback ïðîöåäóðó)
   PRecognizeInfo = ^TRecognizeInfo;
   TRecognizeInfo = record
-    FStatus     : Integer;   // Ñòàòóñ ðàñïîçíàâàíèÿ: 5- çàïèñü íå ðàñïîçíàíà, 0 - çàïèñü ðàñïîçíàíà
+    FStatus     : Integer;   // Ñòàòóñ ðàñïîçíàâàíèÿ: 5- çàïèñü íå ðàñïîçíàíà, 0 - çàïèñü ðàñïîçíàíà, 1 - Îøèáêà ïàðñèíãà îòâåòà, 2 - îøèáêà ïîëó÷åíèÿ îòâåòà
     FConfidence : Real;      // Äîñòîâåðíîñòü ðàñïîçíàâàíèÿ â %
     FTranscript : String;    // Ðàñïîçíàííàÿ ôðàçà
   end;
@@ -183,20 +185,26 @@ procedure TGoogleRecognizer.Execute;
   else
   begin
     FRecognizeInfo := SendRecognizeRequest(FInputFileName);
-    if FRecognizeInfo.FStatus = 1 then // Îøèáêà ïðè ïàðñèíãå îòâåòà
+    if FRecognizeInfo.FStatus = 0 then // Çàïèñü ðàñïîçíàíà
     begin
-      FRecognizeErr := reErrorGoogleResponse;
-      FRecognizeErrStr := FResultList.Text;
-      Synchronize(ErrorEvent);
+      FRecognizeStatus := rsRecognizeDone;
+      Synchronize(StatusEvent);
     end
-    else if FRecognizeInfo.FStatus = 5 then // Çàïèñü íå ðàñïîçíàíà
+    else if FRecognizeInfo.FStatus = 1 then // Îøèáêà ïðè ïàðñèíãå îòâåòà
     begin
+      if EnableLogs then WriteInLog(WorkPath, FormatDateTime('dd.mm.yy hh:mm:ss', Now) + ': Îøèáêà ïðè ïîëó÷åíèè îòâåòà îò ñåðâåðà Google. (' + FRecognizeInfo.FTranscript + ')');
       FRecognizeStatus := rsRecordingNotRecognized;
       Synchronize(StatusEvent);
     end
-    else if FRecognizeInfo.FStatus = 0 then // Çàïèñü ðàñïîçíàíà
+    else if FRecognizeInfo.FStatus = 2 then // Îøèáêà ïðè ïîëó÷åíèè îòâåòà îò ñåðâåðà
     begin
-      FRecognizeStatus := rsRecognizeDone;
+      if EnableLogs then WriteInLog(WorkPath, FormatDateTime('dd.mm.yy hh:mm:ss', Now) + ': Îøèáêà ïðè ïîëó÷åíèè îòâåòà îò ñåðâåðà Google, âîçìîæíî çàïèñü äëÿ ðàñïîçíàâàíèÿ áûëà ñëèøêîì äëèííîé, ïîïðîáóéòå å¸ ñîêðàòèòü äî 3-5 ñåêóíä. (' + FRecognizeInfo.FTranscript + ')');
+      FRecognizeStatus := rsRecordingNotRecognized;
+      Synchronize(StatusEvent);
+    end
+    else if FRecognizeInfo.FStatus = 5 then // Çàïèñü íå ðàñïîçíàíà
+    begin
+      FRecognizeStatus := rsRecordingNotRecognized;
       Synchronize(StatusEvent);
     end;
   end
@@ -231,8 +239,8 @@ function TGoogleRecognizer.SendRecognizeRequest(AudioFile: String): TRecognizeIn
         FURL := Format(GoogleRecognizeURLv2MSpeech, [FRecognizeLang, FGoogleAPIKey, ProgramsName+'-'+ProgramsVer]);
       if not HTTPPostFile(FURL, 'userfile', FInputFileName, FInputStream, FResultList) then
       begin
-        Result.FStatus := 1;
-        Result.FTranscript := 'Error in procedure HTTPPostFile';
+        Result.FStatus := 2;
+        Result.FTranscript := 'Failed to get a response from the server in procedure HTTPPostFile';
         Exit;
       end;
     finally
@@ -275,6 +283,7 @@ function TGoogleRecognizer.HTTPPostFile(const URL, FieldName, FileName: String;
 var
   Bound, Str: String;
 begin
+  Result := False;
   Bound := IntToHex(Random(MaxInt), 8) + '_Synapse_boundary';
   try
     if FUseProxy then