From 99c2e698d2a3c56649e42d8d2133706cd8c9501e Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 20 May 2020 10:19:04 +0000 Subject: Issue #1538 - remove speech recognition engine This removes speech recognition, pocketsphinx, training models and the speech automated test interface. This also re-establishes proper use of MOZ_WEBSPEECH to work for the speech API (synthesis part only) that was a broken mess before, with some synth parts being always built, some parts being built only with it enabled and recognition parts being dependent on it. I'm pretty sure it'd be totally busted if you'd ever have tried building without MOZ_WEBPEECH before. Tested that synthesis still works as-intended. This resolves #1538 --- dom/webidl/SpeechGrammar.webidl | 22 ------------- dom/webidl/SpeechGrammarList.webidl | 23 ------------- dom/webidl/SpeechRecognition.webidl | 45 -------------------------- dom/webidl/SpeechRecognitionAlternative.webidl | 18 ----------- dom/webidl/SpeechRecognitionError.webidl | 31 ------------------ dom/webidl/SpeechRecognitionEvent.webidl | 25 -------------- dom/webidl/SpeechRecognitionResult.webidl | 19 ----------- dom/webidl/SpeechRecognitionResultList.webidl | 18 ----------- dom/webidl/moz.build | 9 ------ 9 files changed, 210 deletions(-) delete mode 100644 dom/webidl/SpeechGrammar.webidl delete mode 100644 dom/webidl/SpeechGrammarList.webidl delete mode 100644 dom/webidl/SpeechRecognition.webidl delete mode 100644 dom/webidl/SpeechRecognitionAlternative.webidl delete mode 100644 dom/webidl/SpeechRecognitionError.webidl delete mode 100644 dom/webidl/SpeechRecognitionEvent.webidl delete mode 100644 dom/webidl/SpeechRecognitionResult.webidl delete mode 100644 dom/webidl/SpeechRecognitionResultList.webidl (limited to 'dom/webidl') diff --git a/dom/webidl/SpeechGrammar.webidl b/dom/webidl/SpeechGrammar.webidl deleted file mode 100644 index 8cc97d2ff..000000000 --- a/dom/webidl/SpeechGrammar.webidl +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. - * - * The origin of this IDL file is - * http://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html - * - * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C - * liability, trademark and document use rules apply. - */ - -[Constructor, - Pref="media.webspeech.recognition.enable", - Func="SpeechRecognition::IsAuthorized"] -interface SpeechGrammar { - [Throws] - attribute DOMString src; - [Throws] - attribute float weight; -}; - diff --git a/dom/webidl/SpeechGrammarList.webidl b/dom/webidl/SpeechGrammarList.webidl deleted file mode 100644 index f1b5775ae..000000000 --- a/dom/webidl/SpeechGrammarList.webidl +++ /dev/null @@ -1,23 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. - * - * The origin of this IDL file is - * http://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html - * - * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C - * liability, trademark and document use rules apply. - */ - -[Constructor, Pref="media.webspeech.recognition.enable", - Func="SpeechRecognition::IsAuthorized"] -interface SpeechGrammarList { - readonly attribute unsigned long length; - [Throws] - getter SpeechGrammar item(unsigned long index); - [Throws] - void addFromURI(DOMString src, optional float weight); - [Throws] - void addFromString(DOMString string, optional float weight); -}; diff --git a/dom/webidl/SpeechRecognition.webidl b/dom/webidl/SpeechRecognition.webidl deleted file mode 100644 index c7dc9422d..000000000 --- a/dom/webidl/SpeechRecognition.webidl +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. - * - * The origin of this IDL file is - * http://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html - * - * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C - * liability, trademark and document use rules apply. - */ - -[Constructor, - Pref="media.webspeech.recognition.enable", - Func="SpeechRecognition::IsAuthorized"] -interface SpeechRecognition : EventTarget { - // recognition parameters - attribute SpeechGrammarList grammars; - attribute DOMString lang; - [Throws] - attribute boolean continuous; - attribute boolean interimResults; - attribute unsigned long maxAlternatives; - [Throws] - attribute DOMString serviceURI; - - // methods to drive the speech interaction - [Throws, UnsafeInPrerendering] - void start(optional MediaStream stream); - void stop(); - void abort(); - - // event methods - attribute EventHandler onaudiostart; - attribute EventHandler onsoundstart; - attribute EventHandler onspeechstart; - attribute EventHandler onspeechend; - attribute EventHandler onsoundend; - attribute EventHandler onaudioend; - attribute EventHandler onresult; - attribute EventHandler onnomatch; - attribute EventHandler onerror; - attribute EventHandler onstart; - attribute EventHandler onend; -}; diff --git a/dom/webidl/SpeechRecognitionAlternative.webidl b/dom/webidl/SpeechRecognitionAlternative.webidl deleted file mode 100644 index f2692404d..000000000 --- a/dom/webidl/SpeechRecognitionAlternative.webidl +++ /dev/null @@ -1,18 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. - * - * The origin of this IDL file is - * http://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html - * - * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C - * liability, trademark and document use rules apply. - */ - -[Pref="media.webspeech.recognition.enable", - Func="SpeechRecognition::IsAuthorized"] -interface SpeechRecognitionAlternative { - readonly attribute DOMString transcript; - readonly attribute float confidence; -}; diff --git a/dom/webidl/SpeechRecognitionError.webidl b/dom/webidl/SpeechRecognitionError.webidl deleted file mode 100644 index ddc74e88d..000000000 --- a/dom/webidl/SpeechRecognitionError.webidl +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -enum SpeechRecognitionErrorCode { - "no-speech", - "aborted", - "audio-capture", - "network", - "not-allowed", - "service-not-allowed", - "bad-grammar", - "language-not-supported" -}; - -[Pref="media.webspeech.recognition.enable", - Func="SpeechRecognition::IsAuthorized", - Constructor(DOMString type, optional SpeechRecognitionErrorInit eventInitDict)] -interface SpeechRecognitionError : Event -{ - readonly attribute SpeechRecognitionErrorCode error; - readonly attribute DOMString? message; -}; - -dictionary SpeechRecognitionErrorInit : EventInit -{ - SpeechRecognitionErrorCode error = "no-speech"; - DOMString message = ""; -}; diff --git a/dom/webidl/SpeechRecognitionEvent.webidl b/dom/webidl/SpeechRecognitionEvent.webidl deleted file mode 100644 index 7a95323d7..000000000 --- a/dom/webidl/SpeechRecognitionEvent.webidl +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. - */ -interface nsISupports; - -[Pref="media.webspeech.recognition.enable", - Func="SpeechRecognition::IsAuthorized", - Constructor(DOMString type, optional SpeechRecognitionEventInit eventInitDict)] -interface SpeechRecognitionEvent : Event -{ - readonly attribute unsigned long resultIndex; - readonly attribute SpeechRecognitionResultList? results; - readonly attribute any interpretation; - readonly attribute Document? emma; -}; - -dictionary SpeechRecognitionEventInit : EventInit -{ - unsigned long resultIndex = 0; - SpeechRecognitionResultList? results = null; - any interpretation = null; - Document? emma = null; -}; diff --git a/dom/webidl/SpeechRecognitionResult.webidl b/dom/webidl/SpeechRecognitionResult.webidl deleted file mode 100644 index c66bb9ca2..000000000 --- a/dom/webidl/SpeechRecognitionResult.webidl +++ /dev/null @@ -1,19 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. - * - * The origin of this IDL file is - * http://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html - * - * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C - * liability, trademark and document use rules apply. - */ - -[Pref="media.webspeech.recognition.enable", - Func="SpeechRecognition::IsAuthorized"] -interface SpeechRecognitionResult { - readonly attribute unsigned long length; - getter SpeechRecognitionAlternative item(unsigned long index); - readonly attribute boolean isFinal; -}; diff --git a/dom/webidl/SpeechRecognitionResultList.webidl b/dom/webidl/SpeechRecognitionResultList.webidl deleted file mode 100644 index ec182c1de..000000000 --- a/dom/webidl/SpeechRecognitionResultList.webidl +++ /dev/null @@ -1,18 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. - * - * The origin of this IDL file is - * http://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html - * - * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C - * liability, trademark and document use rules apply. - */ - -[Pref="media.webspeech.recognition.enable", - Func="SpeechRecognition::IsAuthorized"] -interface SpeechRecognitionResultList { - readonly attribute unsigned long length; - getter SpeechRecognitionResult item(unsigned long index); -}; diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index 156da302d..5e913585e 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -615,14 +615,6 @@ if CONFIG['MOZ_WEBRTC']: if CONFIG['MOZ_WEBSPEECH']: WEBIDL_FILES += [ - 'SpeechGrammar.webidl', - 'SpeechGrammarList.webidl', - 'SpeechRecognition.webidl', - 'SpeechRecognitionAlternative.webidl', - 'SpeechRecognitionError.webidl', - 'SpeechRecognitionEvent.webidl', - 'SpeechRecognitionResult.webidl', - 'SpeechRecognitionResultList.webidl', 'SpeechSynthesis.webidl', 'SpeechSynthesisErrorEvent.webidl', 'SpeechSynthesisEvent.webidl', @@ -721,7 +713,6 @@ if CONFIG['MOZ_WEBRTC']: if CONFIG['MOZ_WEBSPEECH']: GENERATED_EVENTS_WEBIDL_FILES += [ - 'SpeechRecognitionEvent.webidl', 'SpeechSynthesisErrorEvent.webidl', 'SpeechSynthesisEvent.webidl', ] -- cgit v1.2.3