Skip to content

Commit 6de6b90

Browse files
authored
Merge pull request #107 from hadran9/r0.9
Bump version from 0.8.0 to 0.9.3 in branch r0.9
2 parents 2b6ca88 + 49b9832 commit 6de6b90

File tree

32 files changed

+66
-66
lines changed

32 files changed

+66
-66
lines changed

android_mic_streaming/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Android demo application that streams audio from the microphone to deepspeech an
88

99
Download the pre-trained English model and extract it:
1010
```
11-
curl -LO https://github.com/mozilla/DeepSpeech/releases/download/v0.8.0/deepspeech-0.8.0-models.tflite
12-
curl -LO https://github.com/mozilla/DeepSpeech/releases/download/v0.8.0/deepspeech-0.8.0-models.scorer
11+
curl -LO https://github.com/mozilla/DeepSpeech/releases/download/v0.9.3/deepspeech-0.9.3-models.tflite
12+
curl -LO https://github.com/mozilla/DeepSpeech/releases/download/v0.9.3/deepspeech-0.9.3-models.scorer
1313
```
1414

15-
Move the model files `deepspeech-0.8.0-models.pbmm`, `deepspeech-0.8.0-models.scorer`, to the demo application's data directory on your android device.
15+
Move the model files `deepspeech-0.9.3-models.pbmm`, `deepspeech-0.9.3-models.scorer`, to the demo application's data directory on your android device.
1616
Mind that the data directory will only be present after installing and launching the app once.
1717

1818
```
19-
adb push deepspeech-0.8.0-models.tflite deepspeech-0.8.0-models.scorer /storage/emulated/0/Android/data/org.deepspeechdemo/files/
19+
adb push deepspeech-0.9.3-models.tflite deepspeech-0.9.3-models.scorer /storage/emulated/0/Android/data/org.deepspeechdemo/files/
2020
```
2121

2222
You can also copy the files from your file browser to the device.

android_mic_streaming/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies {
3434
implementation 'androidx.core:core-ktx:1.0.2'
3535
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3636

37-
implementation 'org.mozilla.deepspeech:libdeepspeech:0.8.0'
37+
implementation 'org.mozilla.deepspeech:libdeepspeech:0.9.3'
3838

3939
testImplementation 'junit:junit:4.12'
4040
androidTestImplementation 'androidx.test.ext:junit:1.1.0'

android_mic_streaming/app/src/main/java/org/deepspeechdemo/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class MainActivity : AppCompatActivity() {
2121
private var transcriptionThread: Thread? = null
2222
private var isRecording: AtomicBoolean = AtomicBoolean(false)
2323

24-
private val TFLITE_MODEL_FILENAME = "deepspeech-0.8.0-models.tflite"
25-
private val SCORER_FILENAME = "deepspeech-0.8.0-models.scorer"
24+
private val TFLITE_MODEL_FILENAME = "deepspeech-0.9.3-models.tflite"
25+
private val SCORER_FILENAME = "deepspeech-0.9.3-models.scorer"
2626

2727
private fun checkAudioPermission() {
2828
// Permission is automatically granted on SDK < 23 upon installation.

batch_processing/Readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@ Running via the GPU takes half the time of using the CPU and has good results.
128128

129129
# Driver command line
130130

131-
`./driver.py --model c:/Users/jmike/Documents/GitHub/DeepSpeech/deepspeech-0.8.0-models.pbmm --scorer c:/Users/jmike/Documents/GitHub/DeepSpeech/deepspeech-0.8.0-models.scorer --dirname c:/Users/jmike/Downloads/podcast/`
131+
`./driver.py --model c:/Users/jmike/Documents/GitHub/DeepSpeech/deepspeech-0.9.3-models.pbmm --scorer c:/Users/jmike/Documents/GitHub/DeepSpeech/deepspeech-0.9.3-models.scorer --dirname c:/Users/jmike/Downloads/podcast/`
132132

133133
# Example
134134

135135
It will then run the individual commands like :
136136

137-
`deepspeech --model C:\Users\jmike\Documents\GitHub\DeepSpeech\deepspeech-0.8.0-models.pbmm --scorer C:\Users\jmike\Documents\GitHub\DeepSpeech\deepspeech-0.8.0-models.scorer --audio 'C:\Users\jmike\Downloads\podcast\45374977-48000-2-24d9a365625bb.mp3.wav' --json`
137+
`deepspeech --model C:\Users\jmike\Documents\GitHub\DeepSpeech\deepspeech-0.9.3-models.pbmm --scorer C:\Users\jmike\Documents\GitHub\DeepSpeech\deepspeech-0.9.3-models.scorer --audio 'C:\Users\jmike\Downloads\podcast\45374977-48000-2-24d9a365625bb.mp3.wav' --json`
138138

139139

140140
Websites referenced:

batch_processing/driver.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
@click.option("--ext", default=".mp3")
2020
@click.option(
2121
"--model",
22-
default="deepspeech-0.8.0-models.pbmm",
22+
default="deepspeech-0.9.3-models.pbmm",
2323
type=click.Path(exists=True, resolve_path=True),
2424
)
2525
@click.option(
2626
"--scorer",
27-
default="deepspeech-0.8.0-models.scorer",
27+
default="deepspeech-0.9.3-models.scorer",
2828
type=click.Path(exists=True, resolve_path=True),
2929
)
3030

batch_processing/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cachetools==4.1.0
1010
certifi==2020.4.5.2
1111
chardet==3.0.4
1212
click==7.1.2
13-
deepspeech==0.8.0
13+
deepspeech==0.9.3
1414
delegator.py @ git+https://github.com/amitt001/delegator.py.git@194aa92543fbdbfbae0bcc24ca217819a7805da2
1515
flask==1.1.2
1616
gast==0.2.2

electron/Readme.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ npm run rebuild
1414
Download and extract audio files to `/public` directory
1515

1616
```
17-
wget https://github.com/mozilla/DeepSpeech/releases/download/v0.8.0/audio-0.8.0.tar.gz
18-
tar xfvz audio-0.8.0.tar.gz -C ./public/
17+
wget https://github.com/mozilla/DeepSpeech/releases/download/v0.9.3/audio-0.9.3.tar.gz
18+
tar xfvz audio-0.9.3.tar.gz -C ./public/
1919
```
2020

21-
(Optional) Download or softlink DeepSpeech 0.8.0 model files to the root of the project:
21+
(Optional) Download or softlink DeepSpeech 0.9.3 model files to the root of the project:
2222

2323
```
2424
mkdir models
2525
cd models
26-
wget https://github.com/mozilla/DeepSpeech/releases/download/v0.8.0/deepspeech-0.8.0-models.pbmm
27-
wget https://github.com/mozilla/DeepSpeech/releases/download/v0.8.0/deepspeech-0.8.0-models.scorer
26+
wget https://github.com/mozilla/DeepSpeech/releases/download/v0.9.3/deepspeech-0.9.3-models.pbmm
27+
wget https://github.com/mozilla/DeepSpeech/releases/download/v0.9.3/deepspeech-0.9.3-models.scorer
2828
cd ..
2929
```
3030

electron/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

electron/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"keywords": [],
6767
"license": "MIT",
6868
"dependencies": {
69-
"deepspeech": "^0.8.0",
69+
"deepspeech": "^0.9.3",
7070
"electron-is-dev": "^1.1.0",
7171
"lodash": "^4.17.15",
7272
"node-abi": "^2.18.0",

electron/public/electron.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const {getModel} = require('./recognize-wav');
77

88
let appDataPath;
99

10-
if (fs.existsSync(path.resolve(__dirname, '../models/deepspeech-0.8.0-models.pbmm'))) {
10+
if (fs.existsSync(path.resolve(__dirname, '../models/deepspeech-0.9.3-models.pbmm'))) {
1111
// if the deepspeech model was found at the root, use that directory
1212
appDataPath = path.resolve(__dirname, '../models');
1313
}

0 commit comments

Comments
 (0)