diff options
| author |  Andrew Harp <andrewharp@google.com> | 2017-08-09 21:07:30 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-08-09 21:10:57 -0700 |
| commit | ada51982f60746c2c2147117c5f2e0c972725143 (patch) | |
| tree | 2c8f916b22e4d360ac4201e53511fb65c57150f4 /tensorflow/examples/android | |
| parent | 3bacb98c300302446a6cbc44576a8fe7d407a024 (diff) | |
Android demo: revert calls to yuv -> rgb conversion methods so that Java fallback can be used if libtensorflow_demo.so method is not found. Resolves #12110
PiperOrigin-RevId: 164812287
Diffstat (limited to 'tensorflow/examples/android')
| -rw-r--r-- | tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java | 3 | ||||
| -rw-r--r-- | tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java | 20 |
2 files changed, 10 insertions, 13 deletions
diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java index b9542582e6..03294436b8 100644 --- a/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java +++ b/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java @@ -157,13 +157,12 @@ public abstract class CameraActivity extends Activity implements OnImageAvailabl yuvBytes[0], yuvBytes[1], yuvBytes[2], - rgbBytes, previewWidth, previewHeight, yRowStride, uvRowStride, uvPixelStride, - false); + rgbBytes); image.close(); } catch (final Exception e) { diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java index b2a22f3963..91b2831306 100644 --- a/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java +++ b/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java @@ -298,17 +298,15 @@ public class DetectorActivity extends CameraActivity implements OnImageAvailable final int uvRowStride = planes[1].getRowStride(); final int uvPixelStride = planes[1].getPixelStride(); ImageUtils.convertYUV420ToARGB8888( - yuvBytes[0], - yuvBytes[1], - yuvBytes[2], - rgbBytes, - previewWidth, - previewHeight, - yRowStride, - uvRowStride, - uvPixelStride, - false); - + yuvBytes[0], + yuvBytes[1], + yuvBytes[2], + previewWidth, + previewHeight, + yRowStride, + uvRowStride, + uvPixelStride, + rgbBytes); image.close(); } catch (final Exception e) { |