Enable the reading from assets.

Author: Xreki

Demo/Android/AICamera/app/CMakeLists.txt

@@ -26,6 +26,7 @@ find_package(Paddle)
 
 set(SRC_FILES src/main/cpp/image_recognizer_jni.cpp
               src/main/cpp/paddle_image_recognizer.cpp
+              src/main/cpp/binary_reader.cpp
               src/main/cpp/image_utils.cpp)
 
 set(LINK_FLAGS "-Wl,--version-script ${CMAKE_CURRENT_SOURCE_DIR}/paddle_jni.map")

Demo/Android/AICamera/app/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "26.0.1"
     defaultConfig {
         applicationId "com.paddlepaddle.aicamera"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
@@ -15,9 +15,7 @@ android {
         }
         externalNativeBuild {
             cmake {
-                arguments "-DANDROID_TOOLCHAIN=gcc",
-                        "-DANDROID_ARM_NEON=FALSE",
-                        "-DCMAKE_VERBOSE_MAKEFILE=1"
+                arguments "-DCMAKE_VERBOSE_MAKEFILE=1"
                 cppFlags "-O3 -std=c++11 -frtti -fexceptions"
             }
         }
@@ -53,4 +51,4 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
-}
+}

Demo/Android/AICamera/app/src/main/cpp/android_common.h

@@ -0,0 +1,31 @@
+/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. */
+
+#ifndef ANDROID_COMMON_H
+#define ANDROID_COMMON_H
+
+#include <android/asset_manager.h>
+#include <android/log.h>
+#include <stdlib.h>
+
+#define TAG "ImageRecognizer"
+
+#define LOGI(format, ...) \
+  __android_log_print(ANDROID_LOG_INFO, TAG, format, ##__VA_ARGS__)
+#define LOGW(format, ...) \
+  __android_log_print(ANDROID_LOG_WARN, TAG, format, ##__VA_ARGS__)
+#define LOGE(format, ...) \
+  __android_log_print(ANDROID_LOG_ERROR, TAG, "Error: " format, ##__VA_ARGS__)
+
+#endif  // ANDROID_COMMON_H

Demo/Android/AICamera/app/src/main/cpp/binary_reader.cpp

@@ -0,0 +1,98 @@
+/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. */
+
+#include <stdlib.h>
+
+#include "binary_reader.h"
+
+#define TAG "BinaryReader"
+
+#ifdef __ANDROID__
+#include <android/log.h>
+#define LOGI(format, ...) \
+  __android_log_print(ANDROID_LOG_INFO, TAG, format, ##__VA_ARGS__)
+#define LOGW(format, ...) \
+  __android_log_print(ANDROID_LOG_WARN, TAG, format, ##__VA_ARGS__)
+#define LOGE(format, ...) \
+  __android_log_print(ANDROID_LOG_ERROR, TAG, "Error: " format, ##__VA_ARGS__)
+#else
+#include <stdio.h>
+#define LOGI(format, ...) \
+  fprintf(stdout, "[" TAG "]" format "\n", ##__VA_ARGS__)
+#define LOGW(format, ...) \
+  fprintf(stdout, "[" TAG "]" format "\n", ##__VA_ARGS__)
+#define LOGE(format, ...) \
+  fprintf(stderr, "[" TAG "]Error: " format "\n", ##__VA_ARGS__)
+#endif
+
+void* BinaryReader::read_binary_from_external(const char* filename,
+                                              long* size) {
+  FILE* file = fopen(filename, "rb");
+  if (file == nullptr) {
+    LOGE("%s open failure.", filename);
+    return nullptr;
+  }
+
+  fseek(file, 0L, SEEK_END);
+  *size = ftell(file);
+  fseek(file, 0L, SEEK_SET);
+
+  void* buf = malloc(*size);
+  if (buf == nullptr) {
+    LOGE("memory allocation failure, size %ld.", *size);
+    return nullptr;
+  }
+
+  fread(buf, 1, *size, file);
+
+  fclose(file);
+  file = nullptr;
+
+  return buf;
+}
+
+#ifdef __ANDROID__
+AAssetManager* BinaryReader::aasset_manager_(nullptr);
+
+void* BinaryReader::read_binary_from_asset(const char* filename, long* size) {
+  if (aasset_manager_ != nullptr) {
+    AAsset* asset =
+        AAssetManager_open(aasset_manager_, filename, AASSET_MODE_STREAMING);
+
+    if (asset != nullptr) {
+      *size = AAsset_getLength(asset);
+
+      void* buf = (char*)malloc(*size);
+      if (buf == nullptr) {
+        LOGW("memory allocation failure, size %ld", *size);
+        return nullptr;
+      }
+
+      if (AAsset_read(asset, buf, *size) > 0) {
+        AAsset_close(asset);
+        return buf;
+      } else {
+        LOGW("read %s failure, size %ld.", filename, *size);
+      }
+
+      AAsset_close(asset);
+      asset = nullptr;
+    } else {
+      LOGW("%s does not exist in assets.", filename);
+    }
+  }
+
+  return nullptr;
+}
+#endif

Demo/Android/AICamera/app/src/main/cpp/binary_reader.h

@@ -0,0 +1,50 @@
+/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. */
+
+#pragma once
+
+#ifdef __ANDROID__
+#include <android/asset_manager.h>
+#endif
+
+class BinaryReader {
+public:
+  void* operator()(const char* filename, long* size) {
+#ifdef __ANDROID__
+    void* buf = read_binary_from_asset(filename, size);
+#else
+    void* buf = NULL;
+#endif
+    if (buf == NULL) {
+      buf = read_binary_from_external(filename, size);
+    }
+    return buf;
+  }
+
+private:
+  void* read_binary_from_external(const char* filename, long* size);
+
+#ifdef __ANDROID__
+private:
+  void* read_binary_from_asset(const char* filename, long* size);
+
+public:
+  static void set_aasset_manager(AAssetManager* aasset_manager) {
+    aasset_manager_ = aasset_manager;
+  }
+
+private:
+  static AAssetManager* aasset_manager_;
+#endif
+};