Skip to content

Commit c477559

Browse files
tkhill-AWStkhill-AWS
committed
Merge remote-tracking branch 'upstream/revert-7169-7166-javac++transcribe-streaming-update-metadata'
2 parents e9a9854 + 4ad9aa6 commit c477559

5 files changed

Lines changed: 31 additions & 117 deletions

File tree

‎.doc_gen/metadata/transcribe-streaming_metadata.yaml‎

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ transcribe-streaming_StartMedicalStreamTranscription:
4242
- transcribe.java-medical-streaming-demo
4343
services:
4444
transcribe-streaming: {StartMedicalStreamTranscription}
45-
transcribe-streaming_Scenario_StreamEvents_File:
46-
title: Generate a transcription of a file using an &AWS; SDK
45+
transcribe-streaming_Scenario_StreamEvents:
46+
title: Generate a transcription of an audio stream using an &AWS; SDK
4747
title_abbrev: Transcribe an audio file
4848
synopsis: generate a transcription of a source audio file using &TSC; streaming.
4949
category: Scenarios
@@ -58,39 +58,5 @@ transcribe-streaming_Scenario_StreamEvents_File:
5858
snippet_tags:
5959
- swift.transcribe-streaming.all
6060
- swift.transcribe-streaming.transcribeerror
61-
Java:
62-
versions:
63-
- sdk_version: 2
64-
github: javav2/example_code/transcribe-streaming
65-
sdkguide:
66-
excerpts:
67-
- description:
68-
snippet_tags:
69-
- transcribe.java-streaming-demo-file.main
70-
C++:
71-
versions:
72-
- sdk_version: 1
73-
github: cpp/example_code/transcribe-streaming
74-
excerpts:
75-
- description:
76-
snippet_tags:
77-
- transcribe.cpp.stream_transcription_async.code
78-
services:
79-
transcribe-streaming: {StartStreamTranscription}
80-
transcribe-streaming_Scenario_StreamEvents_Microphone:
81-
title: Generate a transcription from a microphone using an &AWS; SDK
82-
title_abbrev: Transcribe audio from a microphone
83-
synopsis: generate a transcription from a microphone using &TSC; streaming.
84-
category: Scenarios
85-
languages:
86-
Java:
87-
versions:
88-
- sdk_version: 2
89-
github: javav2/example_code/transcribe-streaming
90-
sdkguide:
91-
excerpts:
92-
- description:
93-
snippet_tags:
94-
- transcribe.java-streaming-demo
9561
services:
9662
transcribe-streaming: {StartStreamTranscription}

‎cpp/example_code/transcribe-streaming/README.md‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ Code excerpts that show you how to call individual service functions.
4343

4444
- [StartStreamTranscription](get_transcript.cpp#L28)
4545

46-
### Scenarios
47-
48-
Code examples that show you how to accomplish a specific task by calling multiple
49-
functions within the same service.
50-
51-
- [Transcribe an audio file](get_transcript.cpp)
52-
5346

5447
<!--custom.examples.start-->
5548
<!--custom.examples.end-->
@@ -76,18 +69,6 @@ folder.
7669

7770

7871

79-
#### Transcribe an audio file
80-
81-
This example shows you how to generate a transcription of a source audio file using Amazon Transcribe streaming.
82-
83-
84-
<!--custom.scenario_prereqs.transcribe-streaming_Scenario_StreamEvents_File.start-->
85-
<!--custom.scenario_prereqs.transcribe-streaming_Scenario_StreamEvents_File.end-->
86-
87-
88-
<!--custom.scenarios.transcribe-streaming_Scenario_StreamEvents_File.start-->
89-
<!--custom.scenarios.transcribe-streaming_Scenario_StreamEvents_File.end-->
90-
9172
### Tests
9273

9374
⚠ Running tests might result in charges to your AWS account.
@@ -118,4 +99,4 @@ This example shows you how to generate a transcription of a source audio file us
11899

119100
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
120101

121-
SPDX-License-Identifier: Apache-2.0
102+
SPDX-License-Identifier: Apache-2.0

‎javav2/example_code/transcribe-streaming/README.md‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `javav
3434
Code excerpts that show you how to call individual service functions.
3535

3636
- [StartMedicalStreamTranscription](src/main/java/com/amazonaws/transcribestreaming/TranscribeMedicalStreamingDemoApp.java#L25)
37-
- [StartStreamTranscription](src/main/java/com/amazonaws/transcribestreaming/TranscribeStreamingDemoApp.java#L36)
38-
39-
### Scenarios
40-
41-
Code examples that show you how to accomplish a specific task by calling multiple
42-
functions within the same service.
43-
44-
- [Transcribe an audio file](src/main/java/com/amazonaws/transcribestreaming/TranscribeStreamingDemoFile.java)
45-
- [Transcribe audio from a microphone](src/main/java/com/amazonaws/transcribestreaming/TranscribeStreamingDemoApp.java)
37+
- [StartStreamTranscription](src/main/java/com/amazonaws/transcribestreaming/TranscribeStreamingDemoApp.java#L26)
4638

4739

4840
<!--custom.examples.start-->
@@ -58,30 +50,6 @@ functions within the same service.
5850

5951

6052

61-
#### Transcribe an audio file
62-
63-
This example shows you how to generate a transcription of a source audio file using Amazon Transcribe streaming.
64-
65-
66-
<!--custom.scenario_prereqs.transcribe-streaming_Scenario_StreamEvents_File.start-->
67-
<!--custom.scenario_prereqs.transcribe-streaming_Scenario_StreamEvents_File.end-->
68-
69-
70-
<!--custom.scenarios.transcribe-streaming_Scenario_StreamEvents_File.start-->
71-
<!--custom.scenarios.transcribe-streaming_Scenario_StreamEvents_File.end-->
72-
73-
#### Transcribe audio from a microphone
74-
75-
This example shows you how to generate a transcription from a microphone using Amazon Transcribe streaming.
76-
77-
78-
<!--custom.scenario_prereqs.transcribe-streaming_Scenario_StreamEvents_Microphone.start-->
79-
<!--custom.scenario_prereqs.transcribe-streaming_Scenario_StreamEvents_Microphone.end-->
80-
81-
82-
<!--custom.scenarios.transcribe-streaming_Scenario_StreamEvents_Microphone.start-->
83-
<!--custom.scenarios.transcribe-streaming_Scenario_StreamEvents_Microphone.end-->
84-
8553
### Tests
8654

8755
⚠ Running tests might result in charges to your AWS account.
@@ -108,4 +76,4 @@ in the `javav2` folder.
10876

10977
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
11078

111-
SPDX-License-Identifier: Apache-2.0
79+
SPDX-License-Identifier: Apache-2.0

‎javav2/example_code/transcribe-streaming/src/main/java/com/amazonaws/transcribestreaming/TranscribeStreamingDemoApp.java‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,8 @@
1212
import software.amazon.awssdk.regions.Region;
1313
import software.amazon.awssdk.services.transcribestreaming.TranscribeStreamingAsyncClient;
1414
import software.amazon.awssdk.services.transcribestreaming.model.*;
15-
16-
import javax.sound.sampled.AudioFormat;
17-
import javax.sound.sampled.AudioInputStream;
18-
import javax.sound.sampled.AudioSystem;
19-
import javax.sound.sampled.DataLine;
20-
import javax.sound.sampled.LineUnavailableException;
21-
import javax.sound.sampled.TargetDataLine;
22-
import java.io.IOException;
23-
import java.io.InputStream;
24-
import java.io.PrintWriter;
25-
import java.io.StringWriter;
26-
import java.io.UncheckedIOException;
15+
import javax.sound.sampled.*;
16+
import java.io.*;
2717
import java.net.URISyntaxException;
2818
import java.nio.ByteBuffer;
2919
import java.util.List;
@@ -38,7 +28,7 @@ public class TranscribeStreamingDemoApp {
3828
private static final Region REGION = Region.US_EAST_1;
3929
private static TranscribeStreamingAsyncClient client;
4030

41-
public static void main(String[] args)
31+
public static void main(String args[])
4232
throws URISyntaxException, ExecutionException, InterruptedException, LineUnavailableException {
4333

4434
client = TranscribeStreamingAsyncClient.builder()
@@ -95,7 +85,7 @@ private static StartStreamTranscriptionResponseHandler getResponseHandler() {
9585
System.out.println(e.getMessage());
9686
StringWriter sw = new StringWriter();
9787
e.printStackTrace(new PrintWriter(sw));
98-
System.out.println("Error Occurred: " + sw);
88+
System.out.println("Error Occurred: " + sw.toString());
9989
})
10090
.onComplete(() -> {
10191
System.out.println("=== All records stream successfully ===");
@@ -111,10 +101,19 @@ private static StartStreamTranscriptionResponseHandler getResponseHandler() {
111101
.build();
112102
}
113103

114-
104+
private InputStream getStreamFromFile(String audioFileName) {
105+
try {
106+
File inputFile = new File(getClass().getClassLoader().getResource(audioFileName).getFile());
107+
InputStream audioStream = new FileInputStream(inputFile);
108+
return audioStream;
109+
} catch (FileNotFoundException e) {
110+
throw new RuntimeException(e);
111+
}
112+
}
113+
115114
private static class AudioStreamPublisher implements Publisher<AudioStream> {
116-
private static Subscription currentSubscription;
117115
private final InputStream inputStream;
116+
private static Subscription currentSubscription;
118117

119118
private AudioStreamPublisher(InputStream inputStream) {
120119
this.inputStream = inputStream;
@@ -123,22 +122,22 @@ private AudioStreamPublisher(InputStream inputStream) {
123122
@Override
124123
public void subscribe(Subscriber<? super AudioStream> s) {
125124

126-
if (currentSubscription == null) {
127-
currentSubscription = new SubscriptionImpl(s, inputStream);
125+
if (this.currentSubscription == null) {
126+
this.currentSubscription = new SubscriptionImpl(s, inputStream);
128127
} else {
129-
currentSubscription.cancel();
130-
currentSubscription = new SubscriptionImpl(s, inputStream);
128+
this.currentSubscription.cancel();
129+
this.currentSubscription = new SubscriptionImpl(s, inputStream);
131130
}
132131
s.onSubscribe(currentSubscription);
133132
}
134133
}
135134

136135
public static class SubscriptionImpl implements Subscription {
137-
private static final int CHUNK_SIZE_IN_BYTES = 1024;
136+
private static final int CHUNK_SIZE_IN_BYTES = 1024 * 1;
138137
private final Subscriber<? super AudioStream> subscriber;
139138
private final InputStream inputStream;
140-
private final ExecutorService executor = Executors.newFixedThreadPool(1);
141-
private final AtomicLong demand = new AtomicLong(0);
139+
private ExecutorService executor = Executors.newFixedThreadPool(1);
140+
private AtomicLong demand = new AtomicLong(0);
142141

143142
SubscriptionImpl(Subscriber<? super AudioStream> s, InputStream inputStream) {
144143
this.subscriber = s;

‎swift/example_code/transcribe-streaming/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ and run commands.
7272
This example shows you how to generate a transcription of a source audio file using Amazon Transcribe streaming.
7373

7474

75-
<!--custom.scenario_prereqs.transcribe-streaming_Scenario_StreamEvents_File.start-->
76-
<!--custom.scenario_prereqs.transcribe-streaming_Scenario_StreamEvents_File.end-->
75+
<!--custom.scenario_prereqs.transcribe-streaming_Scenario_StreamEvents.start-->
76+
<!--custom.scenario_prereqs.transcribe-streaming_Scenario_StreamEvents.end-->
7777

7878

79-
<!--custom.scenarios.transcribe-streaming_Scenario_StreamEvents_File.start-->
80-
<!--custom.scenarios.transcribe-streaming_Scenario_StreamEvents_File.end-->
79+
<!--custom.scenarios.transcribe-streaming_Scenario_StreamEvents.start-->
80+
<!--custom.scenarios.transcribe-streaming_Scenario_StreamEvents.end-->
8181

8282
### Tests
8383

0 commit comments

Comments
 (0)
⚡