From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 194 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 176 insertions(+), 18 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
index 834affc..bc88de2 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
@@ -17,6 +17,8 @@
#include "DebugNetwork.h"
+#include <mediastreamer2/include/mediastreamer2/msjava.h>
+
std::stringstream logss;
//std::fstream logss("/storage/sdcard/log.log", std::fstream::out);
//std::fstream logss("/storage/emulated/0/log.log", std::fstream::out);
@@ -58,8 +60,130 @@
env->ReleaseStringUTFChars(ipaddr, utf8);
}
+static jclass _jcOutputSurface = nullptr;
+static jmethodID _jmOutputSurface_ctor = nullptr;
+static jmethodID _jmOutputSurface_getSurface = nullptr;
+static jmethodID _jmOutputSurface_readPixels = nullptr;
+static jmethodID _jmOutputSurface_awaitNewImage = nullptr;
+static jmethodID _jmOutputSurface_drawImage = nullptr;
+static jmethodID _jmOutputSurface_makeCurrent = nullptr;
+
+static jobject _jobjOutputSurface = nullptr;
+static jobject _jobjSurface = nullptr;
+static JNIEnv *_env = nullptr;
+
+void readPixels(void* surface, uint8_t* buf, size_t& maxSize)
+{
+ //ANativeWindow* window = (ANativeWindow*)surface;
+
+ CameraWrapper& cameraWrapper(g_CameraWrappers[0]);
+
+ int getEnvStat = cameraWrapper.javaVM->GetEnv((void **)&(cameraWrapper.javaEnv), JNI_VERSION_1_6);
+ if (getEnvStat == JNI_EDETACHED)
+ {
+ //LOG_WARN << "GetEnv: not attached" << std::endl;
+ if (cameraWrapper.javaVM->AttachCurrentThread(&(cameraWrapper.javaEnv), NULL) != 0)
+ LOG_WARN << "Failed to attach" << LOG_ENDL;
+ else
+ getEnvStat = JNI_OK;
+ }
+ else if (getEnvStat == JNI_OK)
+ {
+ }
+ else if (getEnvStat == JNI_EVERSION)
+ LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;
+ else if (getEnvStat == JNI_ERR)
+ LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;
+
+ if (maxSize==0)
+ {
+ //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_makeCurrent);
+ }
+ else
+ {
+ //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_awaitNewImage);
+ //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_drawImage);
+//
+ //jbyteArray jbarrBuffer = (jbyteArray)cameraWrapper.javaEnv->CallObjectMethod(_jobjOutputSurface, _jmOutputSurface_readPixels);
+ //if (jbarrBuffer != nullptr)
+ // cameraWrapper.javaEnv->GetByteArrayRegion(jbarrBuffer, 0, 640 * 480 * 2, (jbyte*)buf);
+ }
+
+ if (cameraWrapper.javaEnv->ExceptionCheck())
+ cameraWrapper.javaEnv->ExceptionDescribe();
+
+ cameraWrapper.javaVM->DetachCurrentThread();
+}
+
+
+/*
+static void* createDecodeSurface()
+{
+ CameraWrapper& cameraWrapper(g_CameraWrappers[0]);
+
+ //OutputSurface outputSurface = null;
+ //outputSurface = new OutputSurface(mWidth, mHeight);
+ //outputSurface.getSurface();
+ //outputSurface.release();
+
+
+ //int getEnvStat = cameraWrapper.javaVM->GetEnv((void **)&(cameraWrapper.javaEnv), JNI_VERSION_1_6);
+ //if (getEnvStat == JNI_EDETACHED)
+ //{
+ // //LOG_WARN << "GetEnv: not attached" << std::endl;
+ // if (cameraWrapper.javaVM->AttachCurrentThread(&(cameraWrapper.javaEnv), NULL) != 0)
+ // LOG_WARN << "Failed to attach" << LOG_ENDL;
+ // else
+ // getEnvStat = JNI_OK;
+ //}
+ //else if (getEnvStat == JNI_OK)
+ //{
+ //}
+ //else if (getEnvStat == JNI_EVERSION)
+ // LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;
+ //else if (getEnvStat == JNI_ERR)
+ // LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;
+
+ //void* ret = nullptr;
+ //{
+ // jclass jcOutputSurface = _jcOutputSurface = cameraWrapper.javaEnv->FindClass("com/example/nativecodec/OutputSurface");
+ // _jcOutputSurface = static_cast<jclass>( cameraWrapper.javaEnv->NewGlobalRef( jcOutputSurface ));
+//
+ // jmethodID jmOutputSurface_ctor = _jmOutputSurface_ctor = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "<init>", "(II)V");
+ // jmethodID jmOutputSurface_getSurface = _jmOutputSurface_getSurface = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "getSurface", "()Landroid/view/Surface;");
+ // jmethodID jmOutputSurface_readPixels = _jmOutputSurface_readPixels = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "readPixels", "()[B");
+//
+ // jmethodID jmOutputSurface_awaitNewImage = _jmOutputSurface_awaitNewImage = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "awaitNewImage", "()V");
+ // jmethodID jmOutputSurface_drawImage = _jmOutputSurface_drawImage = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "drawImage", "()V");
+ // jmethodID jmOutputSurface_makeCurrent = _jmOutputSurface_makeCurrent = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "makeCurrent", "()V");
+//
+ // jobject jobjOutputSurface = _jobjOutputSurface = cameraWrapper.javaEnv->NewObject(jcOutputSurface , jmOutputSurface_ctor, 1920, 1088);
+ // _jobjOutputSurface = static_cast<jobject>( cameraWrapper.javaEnv->NewGlobalRef( jobjOutputSurface ));
+//
+ // jobject jobjSurface = _jobjSurface = cameraWrapper.javaEnv->CallObjectMethod(jobjOutputSurface, jmOutputSurface_getSurface);
+ // ret = ANativeWindow_fromSurface(cameraWrapper.javaEnv, jobjSurface);
+ // cameraWrapper.amcdConfig.readPixels_callback = readPixels;
+ //}
+
+ //if (cameraWrapper.javaEnv->ExceptionCheck())
+ // cameraWrapper.javaEnv->ExceptionDescribe();
+//
+ //cameraWrapper.javaVM->DetachCurrentThread();
+
+ //return ret;
+}
+*/
+
+static void* getSurfaceHolderGetSurface(JNIEnv* env, jobject jobjSurfaceHolder)
+{
+ jclass jcSurfaceHolder = env->FindClass("android/view/SurfaceHolder");
+ jmethodID jmSurfaceHolder_getSurface = env->GetMethodID(jcSurfaceHolder, "getSurface", "()Landroid/view/Surface;");
+ jobject surface = env->CallObjectMethod(jobjSurfaceHolder, jmSurfaceHolder_getSurface);
+ return surface;
+}
+
// set the surface
-void Java_cn_com_basic_face_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surface)
+void Java_cn_com_basic_face_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surfaceDecoder, jobject surfaceRender)
{
LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setSurface" << LOG_ENDL;
assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
@@ -67,14 +191,25 @@
CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
- // obtain a native window from a Java surface
- if (cameraWrapper.window)
- {
- ANativeWindow_release((ANativeWindow*)(cameraWrapper.window));
- cameraWrapper.window = NULL;
+ // obtain a native windowRender from a Java surface
+ if (cameraWrapper.windowDecode != nullptr)
+ {
+ ANativeWindow_release((ANativeWindow*)(cameraWrapper.windowDecode));
+ cameraWrapper.windowDecode = NULL;
}
- cameraWrapper.window = ANativeWindow_fromSurface(env, surface);
- LOGP(DEBUG, "@@@ setsurface %p", cameraWrapper.window);
+ cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, surfaceDecoder);
+ //cameraWrapper.windowDecode = getSurfaceHolderGetSurface(env, surfaceDecoder);
+ //cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, (jobject)getSurfaceHolderGetSurface(env, surfaceDecoder));
+
+ if (cameraWrapper.windowRender != nullptr)
+ {
+ ANativeWindow_release((ANativeWindow*)(cameraWrapper.windowRender));
+ cameraWrapper.windowRender = NULL;
+ }
+ cameraWrapper.windowRender = ANativeWindow_fromSurface(env, surfaceRender);
+ //cameraWrapper.windowRender = ANativeWindow_fromSurface(env, (jobject)getSurfaceHolderGetSurface(env, surfaceRender));
+
+ LOGP(DEBUG, "@@@ setsurface %p,%p", cameraWrapper.windowDecode, cameraWrapper.windowRender);
}
jboolean Java_cn_com_basic_face_util_RtspFaceNative_createPlayer(JNIEnv* env, jclass clazz, jint cameraIdx, jstring uri)
@@ -99,22 +234,28 @@
{
cameraWrapper.amcdConfig.ak_mime = "video/avc";
- cameraWrapper.amcdConfig.ak_width = 640;
- cameraWrapper.amcdConfig.ak_height = 480;
- cameraWrapper.amcdConfig.windowSurface = nullptr; // cameraWrapper.window
- cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
+ cameraWrapper.amcdConfig.ak_width = 1920;
+ cameraWrapper.amcdConfig.ak_height = 1088;
+ //cameraWrapper.amcdConfig.windowSurfaceDecode = cameraWrapper.windowDecode; //cameraWrapper.windowDecode;
+ //cameraWrapper.amcdConfig.windowSurfaceRender = cameraWrapper.windowRender; //cameraWrapper.windowRender;
+ cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
+ cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = false;
cameraWrapper.amcdConfig.generateDecodedDataPerFrame = 1;
- cameraWrapper.amcdConfig.renderFromOutputBuffIdx = false;//true
- cameraWrapper.amcdConfig.renderFromOutputBuff = false;
+
+ //cameraWrapper.amcdConfig.createSurface_callback = createDecodeSurface;
+ //cameraWrapper.amcdConfig.readPixels_callback = readPixels;
+
#ifndef USE_ST_SDK
- cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = true;
+cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = true;//#todo
#endif
}
{
- cameraWrapper.asvrConfig.windowSurface = cameraWrapper.window;
+ cameraWrapper.asvrConfig.windowSurface = cameraWrapper.windowRender;
cameraWrapper.asvrConfig.outputOriginFrame = true;
cameraWrapper.asvrConfig.outputRenderFrame = true;
+ cameraWrapper.asvrConfig.scaleToWidth = 640;
+ cameraWrapper.asvrConfig.scaleToHeight = 480;
}
{
@@ -122,7 +263,9 @@
cameraWrapper.sftConfig.detect_face_cnt_limit = MAX_FACE;
cameraWrapper.sftConfig.draw_face_rect = false;
cameraWrapper.sftConfig.draw_face_feature_point = false;
- cameraWrapper.sftConfig.generate_face_feature = true;
+ cameraWrapper.sftConfig.generate_face_feature = true;
+ cameraWrapper.sftConfig.explode_feature_rect_x = 30;
+ cameraWrapper.sftConfig.explode_feature_rect_y = 40;
cameraWrapper.sftConfig.doTrackPerFrame = 50;
}
@@ -144,6 +287,8 @@
cameraWrapper.stop();
}
+
+//#todo remove
//see: https://github.com/BelledonneCommunications/mediastreamer2/blob/master/src/android/android_mediacodec.cpp
static int handle_java_exception(JNIEnv *env) {
if (env->ExceptionCheck()) {
@@ -153,7 +298,7 @@
}
return 0;
}
-
+//#todo remove
static bool _loadClass(JNIEnv *env, const char *className, jclass *_class) {
*_class = env->FindClass(className);
if(handle_java_exception(env) == -1 || *_class == NULL) {
@@ -163,6 +308,7 @@
return true;
}
+//#todo remove
static bool _getStaticMethodID(JNIEnv *env, jclass _class, const char *name, const char *sig, jmethodID *method) {
*method = env->GetStaticMethodID(_class, name, sig);
if(handle_java_exception(env) == -1 || *method == NULL) {
@@ -184,6 +330,8 @@
// set for multithread callback
env->GetJavaVM(&(cameraWrapper.javaVM));
cameraWrapper.javaEnv = env;
+
+ //ms_set_jvm(cameraWrapper.javaVM);
std::string _className;
{
@@ -443,4 +591,14 @@
#endif
}
+jstring Java_cn_com_basic_face_util_RtspFaceNative_dbgGetLog(JNIEnv *env, jclass clazz)
+{
+ return env->NewStringUTF(g_dbgLog.c_str());
+}
+
+//void Java_cn_com_basic_face_util_RtspFaceNative_dbgReadTexture(JNIEnv* env, jclass clazz)
+//{
+// dbgReadTexture();
+//}
+
}
--
Gitblit v1.8.0