Refactor Java API (#806)
This commit is contained in:
@@ -8,7 +8,6 @@
|
||||
|
||||
#include "sherpa-onnx/csrc/macros.h"
|
||||
#include "sherpa-onnx/csrc/onnx-utils.h"
|
||||
#include "sherpa-onnx/csrc/wave-reader.h"
|
||||
#include "sherpa-onnx/csrc/wave-writer.h"
|
||||
#include "sherpa-onnx/jni/common.h"
|
||||
|
||||
@@ -43,69 +42,6 @@ JNIEXPORT jboolean JNICALL Java_com_k2fsa_sherpa_onnx_GeneratedAudio_saveImpl(
|
||||
return ok;
|
||||
}
|
||||
|
||||
static jobjectArray ReadWaveImpl(JNIEnv *env, std::istream &is,
|
||||
const char *p_filename) {
|
||||
bool is_ok = false;
|
||||
int32_t sampling_rate = -1;
|
||||
std::vector<float> samples =
|
||||
sherpa_onnx::ReadWave(is, &sampling_rate, &is_ok);
|
||||
|
||||
if (!is_ok) {
|
||||
SHERPA_ONNX_LOGE("Failed to read %s", p_filename);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
jfloatArray samples_arr = env->NewFloatArray(samples.size());
|
||||
env->SetFloatArrayRegion(samples_arr, 0, samples.size(), samples.data());
|
||||
|
||||
jobjectArray obj_arr = (jobjectArray)env->NewObjectArray(
|
||||
2, env->FindClass("java/lang/Object"), nullptr);
|
||||
|
||||
env->SetObjectArrayElement(obj_arr, 0, samples_arr);
|
||||
env->SetObjectArrayElement(obj_arr, 1, NewInteger(env, sampling_rate));
|
||||
|
||||
return obj_arr;
|
||||
}
|
||||
|
||||
SHERPA_ONNX_EXTERN_C
|
||||
JNIEXPORT jobjectArray JNICALL
|
||||
Java_com_k2fsa_sherpa_onnx_WaveReader_00024Companion_readWaveFromFile(
|
||||
JNIEnv *env, jclass /*cls*/, jstring filename) {
|
||||
const char *p_filename = env->GetStringUTFChars(filename, nullptr);
|
||||
std::ifstream is(p_filename, std::ios::binary);
|
||||
|
||||
auto obj_arr = ReadWaveImpl(env, is, p_filename);
|
||||
|
||||
env->ReleaseStringUTFChars(filename, p_filename);
|
||||
|
||||
return obj_arr;
|
||||
}
|
||||
|
||||
SHERPA_ONNX_EXTERN_C
|
||||
JNIEXPORT jobjectArray JNICALL
|
||||
Java_com_k2fsa_sherpa_onnx_WaveReader_00024Companion_readWaveFromAsset(
|
||||
JNIEnv *env, jclass /*cls*/, jobject asset_manager, jstring filename) {
|
||||
const char *p_filename = env->GetStringUTFChars(filename, nullptr);
|
||||
#if __ANDROID_API__ >= 9
|
||||
AAssetManager *mgr = AAssetManager_fromJava(env, asset_manager);
|
||||
if (!mgr) {
|
||||
SHERPA_ONNX_LOGE("Failed to get asset manager: %p", mgr);
|
||||
exit(-1);
|
||||
}
|
||||
std::vector<char> buffer = sherpa_onnx::ReadFile(mgr, p_filename);
|
||||
|
||||
std::istrstream is(buffer.data(), buffer.size());
|
||||
#else
|
||||
std::ifstream is(p_filename, std::ios::binary);
|
||||
#endif
|
||||
|
||||
auto obj_arr = ReadWaveImpl(env, is, p_filename);
|
||||
|
||||
env->ReleaseStringUTFChars(filename, p_filename);
|
||||
|
||||
return obj_arr;
|
||||
}
|
||||
|
||||
#if 0
|
||||
SHERPA_ONNX_EXTERN_C
|
||||
JNIEXPORT void JNICALL
|
||||
|
||||
Reference in New Issue
Block a user