experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename Tensorflow Android example java classes to TensorFlow to fix native

Browse Source 
method binding error.
Change: 127585524
This commit is contained in:
Andrew Harp 2016-07-15 14:28:09 -08:00 committed by TensorFlower Gardener
parent 19181afb32
commit 194efde518
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tensorflow/examples/android/src/org/tensorflow/demo/CameraConnectionFragment.java
View File

@ -449,7 +449,7 @@ public class CameraConnectionFragment extends Fragment {
} }
} }
private final TensorflowImageListener tfPreviewListener = new TensorflowImageListener(); private final TensorFlowImageListener tfPreviewListener = new TensorFlowImageListener();
private final CameraCaptureSession.CaptureCallback captureCallback = private final CameraCaptureSession.CaptureCallback captureCallback =
new CameraCaptureSession.CaptureCallback() { new CameraCaptureSession.CaptureCallback() {
@ -539,7 +539,7 @@ public class CameraConnectionFragment extends Fragment {
LOGGER.i("Getting assets."); LOGGER.i("Getting assets.");
tfPreviewListener.initialize( tfPreviewListener.initialize(
getActivity().getAssets(), scoreView, inferenceHandler, sensorOrientation); getActivity().getAssets(), scoreView, inferenceHandler, sensorOrientation);
LOGGER.i("Tensorflow initialized."); LOGGER.i("TensorFlow initialized.");
} }
/** /**

4
tensorflow/examples/android/src/org/tensorflow/demo/TensorflowClassifier.java → tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowClassifier.java
View File

@ -27,11 +27,11 @@ import java.util.StringTokenizer;
/** /**
* JNI wrapper class for the Tensorflow native code. * JNI wrapper class for the Tensorflow native code.
*/ */
public class TensorflowClassifier implements Classifier { public class TensorFlowClassifier implements Classifier {
private static final String TAG = "TensorflowClassifier"; private static final String TAG = "TensorflowClassifier";
// jni native methods. // jni native methods.
public native int initializeTensorflow( public native int initializeTensorFlow(
AssetManager assetManager, AssetManager assetManager,
String model, String model,
String labels, String labels,

6
tensorflow/examples/android/src/org/tensorflow/demo/TensorflowImageListener.java → tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowImageListener.java
View File

@ -37,7 +37,7 @@ import java.util.List;
/** /**
* Class that takes in preview frames and converts the image to Bitmaps to process with Tensorflow. * Class that takes in preview frames and converts the image to Bitmaps to process with Tensorflow.
*/ */
public class TensorflowImageListener implements OnImageAvailableListener { public class TensorFlowImageListener implements OnImageAvailableListener {
private static final Logger LOGGER = new Logger(); private static final Logger LOGGER = new Logger();
private static final boolean SAVE_PREVIEW_BITMAP = false; private static final boolean SAVE_PREVIEW_BITMAP = false;
@ -61,7 +61,7 @@ public class TensorflowImageListener implements OnImageAvailableListener {
private Integer sensorOrientation; private Integer sensorOrientation;
private final TensorflowClassifier tensorflow = new TensorflowClassifier(); private final TensorFlowClassifier tensorflow = new TensorFlowClassifier();
private int previewWidth = 0; private int previewWidth = 0;
private int previewHeight = 0; private int previewHeight = 0;
@ -81,7 +81,7 @@ public class TensorflowImageListener implements OnImageAvailableListener {
final Handler handler, final Handler handler,
final Integer sensorOrientation) { final Integer sensorOrientation) {
Assert.assertNotNull(sensorOrientation); Assert.assertNotNull(sensorOrientation);
tensorflow.initializeTensorflow( tensorflow.initializeTensorFlow(
assetManager, MODEL_FILE, LABEL_FILE, NUM_CLASSES, INPUT_SIZE, IMAGE_MEAN, IMAGE_STD, assetManager, MODEL_FILE, LABEL_FILE, NUM_CLASSES, INPUT_SIZE, IMAGE_MEAN, IMAGE_STD,
INPUT_NAME, OUTPUT_NAME); INPUT_NAME, OUTPUT_NAME);
this.scoreView = scoreView; this.scoreView = scoreView;