improvements to experimental Duplex-Speech

Author: karloscampus

.gitignore

@@ -3,3 +3,5 @@
 .project
 .settings
 /target
+/.idea
+java-speech-api.iml

java-speech-api.iml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: net.sourceforge.javaflacencoder:java-flac-encoder:0.3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20150729" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.javaflacencoder:java-flac-encoder:0.3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20150729" level="project" />
+  </component>
+</module>

src/main/java/com/darkprograms/speech/recognizer/GSpeechDuplex.java

@@ -151,7 +151,7 @@ public void recognize(byte[] data, int sampleRate){
 	 * @throws IOException
 	 * @throws LineUnavailableException
 	 */
-	public void recognize(TargetDataLine tl, AudioFormat af) throws IOException, LineUnavailableException{
+	public void recognize(TargetDataLine tl, AudioFormat af) throws IOException, LineUnavailableException, InterruptedException {
 		//Generates a unique ID for the response. 
 		final long PAIR = MIN + (long)(Math.random() * ((MAX - MIN) + 1L));
 
@@ -164,20 +164,31 @@ public void recognize(TargetDataLine tl, AudioFormat af) throws IOException, Lin
 				"&key=" + API_KEY + "&continuous=true&interim=true"; //Tells Google to constantly monitor the stream;
 
 		//Opens downChannel
-		this.downChannel(API_DOWN_URL);
+		Thread downChannel = this.downChannel(API_DOWN_URL);
 
 		//Opens upChannel
-		this.upChannel(API_UP_URL, tl, af);
+		Thread upChannel = this.upChannel(API_UP_URL, tl, af);
+		try {
+			downChannel.join();
+			upChannel.interrupt();
+			upChannel.join();
+		} catch (InterruptedException e) {
+			downChannel.interrupt();
+			downChannel.join();
+			upChannel.interrupt();
+			upChannel.join();
+		}
+
 	}
 
 	/**
 	 * This code opens a new Thread that connects to the downstream URL. Due to threading,
 	 * the best way to handle this is through the use of listeners.
 	 * @param The URL you want to connect to.
 	 */
-	private void downChannel(String urlStr) {
+	private Thread downChannel(String urlStr) {
 		final String url = urlStr;
-		new Thread ("Downstream Thread") {
+		Thread downChannelThread = new Thread ("Downstream Thread") {
 			public void run() {
 				// handler for DOWN channel http response stream - httpsUrlConn
 				// response handler should manage the connection.... ??
@@ -206,7 +217,9 @@ public void run() {
 				inStream.close();
 				System.out.println("Finished write on down stream...");
 			}
-		}.start();
+		};
+		downChannelThread.start();
+		return downChannelThread;
 	}
 
 
@@ -235,19 +248,21 @@ public void run() {
 	 * @param af The AudioFormat to stream with.
 	 * @throws LineUnavailableException If cannot open or stream the TargetDataLine.
 	 */
-	private void upChannel(String urlStr, TargetDataLine tl, AudioFormat af) throws IOException, LineUnavailableException{
+	private Thread upChannel(String urlStr, TargetDataLine tl, AudioFormat af) throws IOException, LineUnavailableException{
 		final String murl = urlStr;
 		final TargetDataLine mtl = tl;
 		final AudioFormat maf = af;
 		if(!mtl.isOpen()){
 			mtl.open(maf);
 			mtl.start();
 		}
-		new Thread ("Upstream Thread") {
+		Thread upChannelThread = new Thread ("Upstream Thread") {
 			public void run() {
 				openHttpsPostConnection(murl, mtl, (int)maf.getSampleRate());
 			}
-		}.start();
+		};
+		upChannelThread.start();
+		return upChannelThread;
 
 	}
 
@@ -436,7 +451,11 @@ private void parseResponse(String rawResponse, GoogleResponse gr){
 			gr.setConfidence(String.valueOf(1));
 		}
 		String response = StringUtil.substringBetween(rawResponse, "[{\"transcript\":\"", "\"}],");
+		if (response == null) {
+			response = StringUtil.substringBetween(rawResponse, "[{\"transcript\":\"", "\",\"");
+		}
 		gr.setResponse(response);
+		gr.setFinalResponse(rawResponse.contains("\"final\":true"));
 		String[] currentHypos = rawResponse.split("\\[\\{\"transcript\":\"");
 		for(int i = 2; i<currentHypos.length; i++){
 			String cleaned = currentHypos[i].substring(0, currentHypos[i].indexOf("\""));

src/main/java/com/darkprograms/speech/recognizer/GoogleResponse.java

@@ -24,6 +24,8 @@ public class GoogleResponse {
      */
     private List<String> otherPossibleResponses = new ArrayList<String>(20);
 
+
+    private boolean finalResponse = true;
     /**
      * Constructor
      */
@@ -86,4 +88,11 @@ public List<String> getAllPossibleResponses() {
     	return tmp;
     }
 
+    public boolean isFinalResponse() {
+        return finalResponse;
+    }
+
+    public void setFinalResponse(boolean finalResponse) {
+        this.finalResponse = finalResponse;
+    }
 }