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

CameraImageMonitor now follows the Producer/Consumer model. Other assorted minor changes.

Browse Source
This commit is contained in:
Wally Hackenslacker
2013-11-28 15:48:17 -04:30
parent d6227bd300
commit 5910c711d8
5 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values-es/strings.xml
View File

@@ -10,7 +10,7 @@
<string name="start_button">Comenzar streaming de video</string> <string name="start_button">Comenzar streaming de video</string>
<string name="title_activity_cam">CamActivity</string> <string name="title_activity_cam">CamActivity</string>
<string name="ipAddressLabel">Dirección IP de NxtAR</string> <string name="ipAddressLabel">Dirección IP de NxtAR</string>
<string name="badIpToast">La dirección IP no es válida</string> <string name="badIpToast">No se encontró un servidor válido</string>
<string name="emptyIpToast">Rellene el campo de dirección IP</string> <string name="emptyIpToast">Rellene el campo de dirección IP</string>
<string name="wifi_on_title">Esta app requiere WiFi</string> <string name="wifi_on_title">Esta app requiere WiFi</string>
<string name="wifi_on_msg">¿Encender el WiFi?</string> <string name="wifi_on_msg">¿Encender el WiFi?</string>
@@ -18,7 +18,7 @@
<string name="wifi_on_button">Encender</string> <string name="wifi_on_button">Encender</string>
<string name="wifi_on_success">El radio del WiFi está encendido</string> <string name="wifi_on_success">El radio del WiFi está encendido</string>
<string name="wifi_on_fail">Esta app no puede funcionar sin wifi, cerrando.</string> <string name="wifi_on_fail">Esta app no puede funcionar sin wifi, cerrando.</string>
<string name= "bt_no_support">Este dispositivo no soporta Bluetooth</string> <string name="bt_no_support">Este dispositivo no soporta Bluetooth</string>
<string name="bt_on_fail">Esta app no puede funcionar sin Bluetooth, cerrando</string> <string name="bt_on_fail">Esta app no puede funcionar sin Bluetooth, cerrando</string>
<string name="lens_icon">Ícono de lente</string> <string name="lens_icon">Ícono de lente</string>
<string name="robot_pair_button">Conectar con el robot</string> <string name="robot_pair_button">Conectar con el robot</string>

2
res/values/strings.xml
View File

@@ -10,7 +10,7 @@
<string name="get_server_button">Connect with NxtAR</string> <string name="get_server_button">Connect with NxtAR</string>
<string name="start_button">Start video streaming</string> <string name="start_button">Start video streaming</string>
<string name="ipAddressLabel">NxtAR IP Address</string> <string name="ipAddressLabel">NxtAR IP Address</string>
<string name="badIpToast">Invalid IP address</string> <string name="badIpToast">No proper server found</string>
<string name="emptyIpToast">Fill out the IP address field</string> <string name="emptyIpToast">Fill out the IP address field</string>
<string name="wifi_on_title">This app requires WiFi</string> <string name="wifi_on_title">This app requires WiFi</string>
<string name="wifi_on_msg">Turn on the WiFi?</string> <string name="wifi_on_msg">Turn on the WiFi?</string>

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

@@ -2,6 +2,7 @@ package ve.ucv.ciens.ccg.nxtcam;
import ve.ucv.ciens.ccg.nxtcam.camera.CameraPreview; import ve.ucv.ciens.ccg.nxtcam.camera.CameraPreview;
import ve.ucv.ciens.ccg.nxtcam.network.ImageTransferThread; import ve.ucv.ciens.ccg.nxtcam.network.ImageTransferThread;
import ve.ucv.ciens.ccg.nxtcam.network.LCPThread;
import ve.ucv.ciens.ccg.nxtcam.utils.Logger; import ve.ucv.ciens.ccg.nxtcam.utils.Logger;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
@@ -16,12 +17,13 @@ import android.widget.Toast;
public class CamActivity extends Activity{ public class CamActivity extends Activity{
private final String TAG = "NXTCAM_CAM"; private final String TAG = "NXTCAM_CAM";
private final String CLASS_NAME = MainActivity.class.getSimpleName(); private final String CLASS_NAME = CamActivity.class.getSimpleName();
private Camera hwCamera; private Camera hwCamera;
private CameraPreview cPreview; private CameraPreview cPreview;
private CameraSetupTask camSetupTask; private CameraSetupTask camSetupTask;
private ImageTransferThread imThread; private ImageTransferThread imThread;
private LCPThread botThread;
private String serverIp; private String serverIp;
/******************* /*******************
@@ -37,6 +39,7 @@ public class CamActivity extends Activity{
Intent intent = getIntent(); Intent intent = getIntent();
serverIp = intent.getStringExtra("address"); serverIp = intent.getStringExtra("address");
imThread = new ImageTransferThread(serverIp);
} }
@Override @Override
@@ -70,21 +73,27 @@ public class CamActivity extends Activity{
camSetupTask = new CameraSetupTask(); camSetupTask = new CameraSetupTask();
camSetupTask.execute(); camSetupTask.execute();
imThread = new ImageTransferThread(serverIp); // imThread.start();
imThread.start();
} }
@Override @Override
public void onPause(){ public void onPause(){
super.onPause(); super.onPause();
// TODO: Disconnect and destroy the imThread object. // TODO: pause the imThread and botThread objects.
cPreview.removePreviewCallback(); cPreview.removePreviewCallback();
cPreview.setCamera(null); cPreview.setCamera(null);
releaseCamera(); releaseCamera();
} }
@Override
public void onDestroy(){
super.onDestroy();
// TODO: Destroy the network threads.
imThread = null;
}
/****************** /******************
* My own methods * * My own methods *
******************/ ******************/

9
src/ve/ucv/ciens/ccg/nxtcam/MainActivity.java
View File

@@ -334,11 +334,6 @@ public class MainActivity extends Activity implements WifiOnDialogListener, Conn
Logger.log_d(TAG, CLASS_NAME + ".doInBackground() :: Packet payload is\n" + received); Logger.log_d(TAG, CLASS_NAME + ".doInBackground() :: Packet payload is\n" + received);
if(received.compareTo("NxtAR server here!") == 0) if(received.compareTo("NxtAR server here!") == 0)
done = true; done = true;
Socket client1, client2;
client1 = new Socket(packet.getAddress(), ProjectConstants.SERVER_TCP_PORT_1);
client1.close();
client2 = new Socket(packet.getAddress(), ProjectConstants.SERVER_TCP_PORT_2);
client2.close();
} }
result = true; result = true;
}catch(IOException io){ }catch(IOException io){
@@ -367,10 +362,10 @@ public class MainActivity extends Activity implements WifiOnDialogListener, Conn
if(packet != null){ if(packet != null){
showToast(R.string.serv_connected, Toast.LENGTH_SHORT); showToast(R.string.serv_connected, Toast.LENGTH_SHORT);
// startCamActivity(result, packet.getAddress().getHostAddress()); startCamActivity(result, packet.getAddress().getHostAddress());
}else{ }else{
showToast(R.string.serv_fail, Toast.LENGTH_SHORT); showToast(R.string.serv_fail, Toast.LENGTH_SHORT);
// startCamActivity(false, null); startCamActivity(false, null);
} }
} }
} }

43
src/ve/ucv/ciens/ccg/nxtcam/camera/CameraImageMonitor.java
View File

@@ -7,10 +7,12 @@ public class CameraImageMonitor{
private final String CLASS_NAME = CameraImageMonitor.class.getSimpleName(); private final String CLASS_NAME = CameraImageMonitor.class.getSimpleName();
private byte[] image; private byte[] image;
private boolean imgChanged; private boolean imgProduced;
private boolean imgConsumed;
private CameraImageMonitor(){ private CameraImageMonitor(){
imgChanged = false; imgProduced = false;
imgConsumed = false;
} }
private static class SingletonHolder{ private static class SingletonHolder{
@@ -22,33 +24,40 @@ public class CameraImageMonitor{
} }
public void setImageData(byte[] image){ public void setImageData(byte[] image){
Logger.log_d(TAG, CLASS_NAME + ".setImageData() :: Copying new image."); if(imgConsumed){
synchronized(image){ Logger.log_d(TAG, CLASS_NAME + ".setImageData() :: Copying new image.");
this.image = new byte[image.length]; synchronized(this.image){
System.arraycopy(image, 0, this.image, 0, image.length); //this.image = new byte[image.length];
imgChanged = true; //System.arraycopy(image, 0, this.image, 0, image.length);
image.notifyAll(); this.image = image;
imgProduced = true;
imgConsumed = false;
this.image.notifyAll();
}
Logger.log_d(TAG, CLASS_NAME + ".setImageData() :: Data copy finished.");
}else{
Logger.log_d(TAG, CLASS_NAME + ".setImageData() :: Old image still valid, ignoring new image.");
} }
Logger.log_d(TAG, CLASS_NAME + ".setImageData() :: Data copy finished.");
} }
public byte[] getImageData(){ public byte[] getImageData(){
byte[] returnImg; byte[] returnImg;
Logger.log_d(TAG, CLASS_NAME + ".getImageData() :: Entry point."); Logger.log_d(TAG, CLASS_NAME + ".getImageData() :: Entry point.");
synchronized(image){ synchronized(image){
while(!imgChanged){ while(!imgProduced){
Logger.log_d(TAG, CLASS_NAME + ".getImageData() :: Waiting for new data."); Logger.log_d(TAG, CLASS_NAME + ".getImageData() :: Waiting for new image.");
try{ image.wait(); }catch(InterruptedException ie){} try{ image.wait(); }catch(InterruptedException ie){ }
} }
Logger.log_d(TAG, CLASS_NAME + ".getImageData() :: Retrieving new data."); Logger.log_d(TAG, CLASS_NAME + ".getImageData() :: Retrieving new image.");
returnImg = image.clone(); returnImg = image;
imgChanged = false; imgProduced = false;
imgConsumed = true;
} }
Logger.log_d(TAG, CLASS_NAME + ".getImageData() :: New data retreived."); Logger.log_d(TAG, CLASS_NAME + ".getImageData() :: New image retrieved.");
return returnImg; return returnImg;
} }
public synchronized boolean hasChanged(){ public synchronized boolean hasChanged(){
return imgChanged; return imgProduced;
} }
} }