Add new api, setSelectedLabel

Author: tzutalin

app/src/main/java/com/tzutalin/vision/demo/ObjectDetectActivity.java

@@ -27,16 +27,15 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.Window;
-import android.widget.ImageView;
 import android.widget.Toast;
 
+import com.dexafree.materialList.card.Card;
+import com.dexafree.materialList.card.provider.BigImageCardProvider;
+import com.dexafree.materialList.view.MaterialListView;
 import com.tzutalin.vision.visionrecognition.ObjectDetector;
 import com.tzutalin.vision.visionrecognition.R;
 import com.tzutalin.vision.visionrecognition.VisionClassifierCreator;
 import com.tzutalin.vision.visionrecognition.VisionDetRet;
-import com.dexafree.materialList.card.Card;
-import com.dexafree.materialList.card.provider.BigImageCardProvider;
-import com.dexafree.materialList.view.MaterialListView;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -104,6 +103,7 @@ protected List<VisionDetRet> doInBackground(String... strings) {
                     mObjectDet = VisionClassifierCreator.createObjectDetector(getApplicationContext());
                     // TODO: Get Image's height and width
                     mObjectDet.init(0, 0);
+                    //mObjectDet.setSelectedLabel("person");
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
                 }

cnnlibs/src/main/java/com/tzutalin/vision/visionrecognition/CaffeClassifier.java

@@ -55,6 +55,7 @@ public abstract class CaffeClassifier<T> {
     protected String[] mSynsets;
     protected int mImgWidth;
     protected int mImgHeight;
+    private String mSelectedLabel;
 
     /**
      *
@@ -103,6 +104,15 @@ public void init(int imgWidth, int imgHeight) {
     public void deInit() {
     }
 
+
+    public void setSelectedLabel(String label) {
+        mSelectedLabel = label;
+    }
+
+    public void clearSelectedLabel() {
+        mSelectedLabel = null;
+    }
+
     private String[] getSynsetsFromFile(Context context) {
         if (!TextUtils.isEmpty(mSynsetPath)) {
             File file = new File(mSynsetPath);

cnnlibs/src/main/java/com/tzutalin/vision/visionrecognition/ObjectDetector.java

@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.text.TextUtils;
 import android.util.Log;
 
 import java.io.File;
@@ -48,7 +49,7 @@ public ObjectDetector(Context context, String modelPath, String wieghtsPath, Str
         if (new File(mModelPath).exists() == false ||
                 new File(mWeightsPath).exists() == false ||
                 new File(mSynsetPath).exists() == false ) {
-            throw new IllegalAccessException(" Cannot find model");
+            throw new IllegalAccessException("ObjectDetector cannot find model");
         }
     }
 
@@ -63,6 +64,19 @@ public void deInit() {
         super.deInit();
         jniRelease();
     }
+
+    @Override
+    public void setSelectedLabel(String label) {
+        super.setSelectedLabel(label);
+        jniSetSelectedLabel(label);
+    }
+
+    @Override
+    public void clearSelectedLabel() {
+        super.clearSelectedLabel();
+        jniSetSelectedLabel("");
+    }
+
     /**
      * Detect and locate objects according to the given image path
      * @param imgPath image path
@@ -73,13 +87,13 @@ public void deInit() {
      */
     @Override
     public List<VisionDetRet> classifyByPath(String imgPath) {
-        // TODO : If file path didn't exist
         List<VisionDetRet> ret = new ArrayList<VisionDetRet>();
 
-       /* BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inSampleSize = 1;
-        Bitmap bitmap = BitmapFactory.decodeFile(imgPath, options);
-        return classify(bitmap);*/
+        if (TextUtils.isEmpty(imgPath) || new File(imgPath).exists() == false) {
+            Log.e(TAG, "classifyByPath. Invalid Input path");
+            return ret;
+        }
+
         int numObjs = jniClassifyImgByPath(imgPath);
         for (int i = 0; i != numObjs; i++) {
             VisionDetRet det = new VisionDetRet();
@@ -106,15 +120,23 @@ public List<VisionDetRet> classify(Bitmap bitmap) {
                     "bitmap size doesn't match initialization");
         }*/
         List<VisionDetRet> ret = new ArrayList<VisionDetRet>();
+
+        // Check input
+        if (bitmap == null) {
+            Log.e(TAG, "classify. Invalid Input bitmap");
+            return ret;
+        }
+
         storeBitmap(bitmap);
+
         int numObjs = jniClassifyBitmap(_handler);
         for (int i = 0; i != numObjs; i++) {
             VisionDetRet det = new VisionDetRet();
             int success = jniGetDetRet(det, i);
-            android.util.Log.d(TAG , det.getLabel());
             if (success >= 0)
                 ret.add(det);
         }
+
         freeBitmap();
         return ret;
     }
@@ -136,6 +158,8 @@ private void freeBitmap() {
 
     protected native int jniRelease();
 
+    protected native int jniSetSelectedLabel(String label);
+
     protected native int jniClassifyImgByPath(String imgPath);
 
     private native int jniClassifyBitmap(ByteBuffer handler);

cnnlibs/src/main/java/com/tzutalin/vision/visionrecognition/SceneClassifier.java

@@ -18,6 +18,8 @@
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.text.TextUtils;
+import android.util.Log;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -32,6 +34,7 @@
  * {@link android.graphics.Bitmap} graphic object.
  */
 public class SceneClassifier extends CaffeClassifier<List<VisionDetRet>> {
+    private static final String TAG = "SceneClassifier";
     private static final int MODEL_DIM = 224;
     private ByteBuffer _handler = null;
 
@@ -50,7 +53,7 @@ public SceneClassifier(Context context, String sceneModelPath, String sceneWiegh
         if (new File(mModelPath).exists() == false ||
                 new File(mWeightsPath).exists() == false ||
                 new File(mSynsetPath).exists() == false ) {
-            throw new IllegalAccessException(" Cannot find model");
+            throw new IllegalAccessException("SceneClassifier cannot find model");
         }
     }
 
@@ -65,9 +68,14 @@ public SceneClassifier(Context context, String sceneModelPath, String sceneWiegh
      */
     @Override
     public List<VisionDetRet> classifyByPath(String imgPath) {
-        float[] propArray = jniClassifyImgByPath(imgPath);
         List<VisionDetRet> ret = new ArrayList<VisionDetRet>();
 
+        if (TextUtils.isEmpty(imgPath) || new File(imgPath).exists() == false) {
+            Log.e(TAG, "classifyByPath. Invalid Input path");
+            return ret;
+        }
+
+        float[] propArray = jniClassifyImgByPath(imgPath);
         if (propArray != null) {
             Map<String, Float> sortedmap = Utils.sortPrediction(mSynsets, propArray);
             int k_size = 10;
@@ -78,6 +86,7 @@ public List<VisionDetRet> classifyByPath(String imgPath) {
                     break;
             }
         }
+
         return ret;
     }
 
@@ -92,9 +101,16 @@ public List<VisionDetRet> classifyByPath(String imgPath) {
      */
     @Override
     public List<VisionDetRet> classify(Bitmap bitmap) {
+        List<VisionDetRet> ret = new ArrayList<VisionDetRet>();
+
+        // Check input
+        if (bitmap == null) {
+            Log.e(TAG, "classify. Invalid Input bitmap");
+            return ret;
+        }
+
         storeBitmap(bitmap);
 
-        List<VisionDetRet> ret = new ArrayList<VisionDetRet>();
         float[] propArray = jniClassifyBitmap(_handler);
         if (propArray != null) {
             Map<String, Float> sortedmap = Utils.sortPrediction(mSynsets, propArray);