WallyHackenslacker/NxtAR-cam
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Assorted logic added to ImageTransferThread. Rewrites

Browse Source
This commit is contained in:
Wally Hackenslacker
2013-12-18 08:24:35 -04:30
parent aff602d0fc
commit 9bcd7107b0
8 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ve/ucv/ciens/ccg/nxtcam/network/ImageTransferThread.java
View File

@@ -63,10 +63,11 @@ public class ImageTransferThread extends Thread{
Object auxiliary;
ImageTransferProtocolMessage simpleMessage;
ImageDataMessage imageMessage;
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
connectToServer();
if(socket.isConnected()){
if(!socket.isConnected()){
Logger.log_e(TAG, CLASS_NAME + ".run() :: Not connected to a server. Finishing thread.");
}else{
while(!done){
@@ -101,7 +102,7 @@ public class ImageTransferThread extends Thread{
sendUnrecognizedMessage();
}else{
// Else if the passed the validity check then proceed to the next protocol state.
// Else if the message passed the validity check then proceed to the next protocol state.
simpleMessage = (ImageTransferProtocolMessage)auxiliary;
if(simpleMessage.message == ImageTransferProtocol.ACK_SEND_NEXT)
threadState = thread_state_t.CAN_SEND;
@@ -113,8 +114,6 @@ public class ImageTransferThread extends Thread{
break;
case CAN_SEND:
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
// Get the image and it's parameters from the monitor.
Rect imageSize = camMonitor.getImageParameters();
image = camMonitor.getImageData();
@@ -135,11 +134,21 @@ public class ImageTransferThread extends Thread{
}catch(IOException io){
Logger.log_e(TAG, CLASS_NAME + ".run() :: Error sending image to the server: " + io.getMessage());
}
// Clean up stuff.
yuvImage = null;
image = null;
outputStream.reset();
imageMessage = null;
imageSize = null;
threadState = thread_state_t.WAIT_FOR_ACK;
break;
case END_STREAM:
// Simply disconnect from the server.
disconnect();
done = true;
break;
}

2
src/ve/ucv/ciens/ccg/nxtcam/network/protocols/ImageDataMessage.java
View File

@@ -2,7 +2,7 @@ package ve.ucv.ciens.ccg.nxtcam.network.protocols;
import java.io.Serializable;
public final class ImageDataMessage extends ProtocolMessage implements Serializable{
public final class ImageDataMessage implements Serializable{
private static final long serialVersionUID = 9989L;
public static final int magicNumber = 0x10;

2
src/ve/ucv/ciens/ccg/nxtcam/network/protocols/ImageTransferProtocolMessage.java
View File

@@ -2,7 +2,7 @@ package ve.ucv.ciens.ccg.nxtcam.network.protocols;
import java.io.Serializable;
public final class ImageTransferProtocolMessage extends ProtocolMessage implements Serializable{
public final class ImageTransferProtocolMessage implements Serializable{
private static final long serialVersionUID = 8898L;
public static final int magicNumber = 0x20;

8
src/ve/ucv/ciens/ccg/nxtcam/network/protocols/ProtocolMessage.java
View File

@@ -1,8 +0,0 @@
package ve.ucv.ciens.ccg.nxtcam.network.protocols;
import java.io.Serializable;
@SuppressWarnings("serial")
public abstract class ProtocolMessage implements Serializable {
public static int magicNumber = 0x00;
}