Skip to content

Commit 6501589

Browse files
gguussgguuss
committed
Updates to use v1 release.
1 parent 0ca631d commit 6501589

File tree

4 files changed

+37
-30
lines changed

4 files changed

+37
-30
lines changed

‎speech/cloud-client/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ You can then run a given `ClassName` via:
3434
### Transcribe a remote audio file (using the recognize sample)
3535
```
3636
mvn exec:java -Dexec.mainClass=com.example.speech.Recognize \
37-
-Dexec.args="syncrecognize 'gs://java-docs-samples-tests/speech/brooklyn.flac'"
37+
-Dexec.args="syncrecognize 'gs://cloud-samples-tests/speech/brooklyn.flac'"
3838
```

‎speech/cloud-client/pom.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@
3434
</properties>
3535

3636
<dependencies>
37+
3738
<!-- [START dependencies] -->
38-
<dependency>
39+
<dependency>
3940
<groupId>com.google.cloud</groupId>
40-
<artifactId>google-cloud-speech</artifactId>
41-
<version>0.8.1-alpha</version>
42-
</dependency>
41+
<artifactId>google-cloud</artifactId>
42+
<version>0.11.2-alpha</version>
43+
</dependency>
4344
<!-- [END dependencies] -->
4445

4546
<!-- Test dependencies -->

‎speech/cloud-client/src/main/java/com/example/speech/QuickstartSample.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
// [START speech_quickstart]
2020
// Imports the Google Cloud client library
21-
import com.google.cloud.speech.spi.v1beta1.SpeechClient;
22-
import com.google.cloud.speech.v1beta1.RecognitionAudio;
23-
import com.google.cloud.speech.v1beta1.RecognitionConfig;
24-
import com.google.cloud.speech.v1beta1.RecognitionConfig.AudioEncoding;
25-
import com.google.cloud.speech.v1beta1.SpeechRecognitionAlternative;
26-
import com.google.cloud.speech.v1beta1.SpeechRecognitionResult;
27-
import com.google.cloud.speech.v1beta1.SyncRecognizeResponse;
21+
import com.google.cloud.speech.spi.v1.SpeechClient;
22+
import com.google.cloud.speech.v1.RecognitionAudio;
23+
import com.google.cloud.speech.v1.RecognitionConfig;
24+
import com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding;
25+
import com.google.cloud.speech.v1.SpeechRecognitionAlternative;
26+
import com.google.cloud.speech.v1.SpeechRecognitionResult;
27+
import com.google.cloud.speech.v1.RecognizeResponse;
2828
import com.google.protobuf.ByteString;
2929

3030
import java.nio.file.Files;
@@ -48,14 +48,15 @@ public static void main(String... args) throws Exception {
4848
// Builds the sync recognize request
4949
RecognitionConfig config = RecognitionConfig.newBuilder()
5050
.setEncoding(AudioEncoding.LINEAR16)
51-
.setSampleRate(16000)
51+
.setSampleRateHertz(16000)
52+
.setLanguageCode("en-US")
5253
.build();
5354
RecognitionAudio audio = RecognitionAudio.newBuilder()
5455
.setContent(audioBytes)
5556
.build();
5657

5758
// Performs speech recognition on the audio file
58-
SyncRecognizeResponse response = speech.syncRecognize(config, audio);
59+
RecognizeResponse response = speech.recognize(config, audio);
5960
List<SpeechRecognitionResult> results = response.getResultsList();
6061

6162
for (SpeechRecognitionResult result: results) {

‎speech/cloud-client/src/main/java/com/example/speech/Recognize.java

+21-16
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
package com.example.speech;
1818

1919
import com.google.api.gax.grpc.OperationFuture;
20-
import com.google.cloud.speech.spi.v1beta1.SpeechClient;
21-
import com.google.cloud.speech.v1beta1.AsyncRecognizeResponse;
22-
import com.google.cloud.speech.v1beta1.RecognitionAudio;
23-
import com.google.cloud.speech.v1beta1.RecognitionConfig;
24-
import com.google.cloud.speech.v1beta1.RecognitionConfig.AudioEncoding;
25-
import com.google.cloud.speech.v1beta1.SpeechRecognitionAlternative;
26-
import com.google.cloud.speech.v1beta1.SpeechRecognitionResult;
27-
import com.google.cloud.speech.v1beta1.SyncRecognizeResponse;
20+
import com.google.cloud.speech.spi.v1.SpeechClient;
21+
import com.google.cloud.speech.v1.LongRunningRecognizeResponse;
22+
import com.google.cloud.speech.v1.RecognitionAudio;
23+
import com.google.cloud.speech.v1.RecognitionConfig;
24+
import com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding;
25+
import com.google.cloud.speech.v1.SpeechRecognitionAlternative;
26+
import com.google.cloud.speech.v1.SpeechRecognitionResult;
27+
import com.google.cloud.speech.v1.RecognizeResponse;
2828
import com.google.protobuf.ByteString;
2929

3030
import java.io.IOException;
@@ -80,14 +80,15 @@ public static void syncRecognizeFile(String fileName) throws Exception, IOExcept
8080
// Configure request with local raw PCM audio
8181
RecognitionConfig config = RecognitionConfig.newBuilder()
8282
.setEncoding(AudioEncoding.LINEAR16)
83-
.setSampleRate(16000)
83+
.setLanguageCode("en-US")
84+
.setSampleRateHertz(16000)
8485
.build();
8586
RecognitionAudio audio = RecognitionAudio.newBuilder()
8687
.setContent(audioBytes)
8788
.build();
8889

8990
// Use blocking call to get audio transcript
90-
SyncRecognizeResponse response = speech.syncRecognize(config, audio);
91+
RecognizeResponse response = speech.recognize(config, audio);
9192
List<SpeechRecognitionResult> results = response.getResultsList();
9293

9394
for (SpeechRecognitionResult result: results) {
@@ -111,14 +112,15 @@ public static void syncRecognizeGcs(String gcsUri) throws Exception, IOException
111112
// Builds the request for remote FLAC file
112113
RecognitionConfig config = RecognitionConfig.newBuilder()
113114
.setEncoding(AudioEncoding.FLAC)
114-
.setSampleRate(16000)
115+
.setLanguageCode("en-US")
116+
.setSampleRateHertz(16000)
115117
.build();
116118
RecognitionAudio audio = RecognitionAudio.newBuilder()
117119
.setUri(gcsUri)
118120
.build();
119121

120122
// Use blocking call for getting audio transcript
121-
SyncRecognizeResponse response = speech.syncRecognize(config, audio);
123+
RecognizeResponse response = speech.recognize(config, audio);
122124
List<SpeechRecognitionResult> results = response.getResultsList();
123125

124126
for (SpeechRecognitionResult result: results) {
@@ -130,6 +132,7 @@ public static void syncRecognizeGcs(String gcsUri) throws Exception, IOException
130132
speech.close();
131133
}
132134

135+
/*
133136
/**
134137
* Performs non-blocking speech recognition on raw PCM audio and prints
135138
* the transcription.
@@ -147,14 +150,15 @@ public static void asyncRecognizeFile(String fileName) throws Exception, IOExcep
147150
// Configure request with local raw PCM audio
148151
RecognitionConfig config = RecognitionConfig.newBuilder()
149152
.setEncoding(AudioEncoding.LINEAR16)
150-
.setSampleRate(16000)
153+
.setLanguageCode("en-US")
154+
.setSampleRateHertz(16000)
151155
.build();
152156
RecognitionAudio audio = RecognitionAudio.newBuilder()
153157
.setContent(audioBytes)
154158
.build();
155159

156160
// Use non-blocking call for getting file transcription
157-
OperationFuture<AsyncRecognizeResponse> response = speech.asyncRecognizeAsync(config, audio);
161+
OperationFuture<LongRunningRecognizeResponse> response = speech.longRunningRecognizeAsync(config, audio);
158162
while (!response.isDone()) {
159163
System.out.println("Waiting for response...");
160164
Thread.sleep(200);
@@ -184,14 +188,15 @@ public static void asyncRecognizeGcs(String gcsUri) throws Exception, IOExceptio
184188
// Configure remote file request for FLAC file
185189
RecognitionConfig config = RecognitionConfig.newBuilder()
186190
.setEncoding(AudioEncoding.FLAC)
187-
.setSampleRate(16000)
191+
.setLanguageCode("en-US")
192+
.setSampleRateHertz(16000)
188193
.build();
189194
RecognitionAudio audio = RecognitionAudio.newBuilder()
190195
.setUri(gcsUri)
191196
.build();
192197

193198
// Use non-blocking call for getting file transcription
194-
OperationFuture<AsyncRecognizeResponse> response = speech.asyncRecognizeAsync(config, audio);
199+
OperationFuture<LongRunningRecognizeResponse> response = speech.longRunningRecognizeAsync(config, audio);
195200
while (!response.isDone()) {
196201
System.out.println("Waiting for response...");
197202
Thread.sleep(200);

0 commit comments

Comments
 (0)