From 22fe3eb94f8e65ebad5d55b12c371a0b69bfc04a Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 12 五月 2017 10:18:12 +0800
Subject: [PATCH] add release
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
index bc88de2..fa09ee6 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
@@ -17,7 +17,7 @@
#include "DebugNetwork.h"
-#include <mediastreamer2/include/mediastreamer2/msjava.h>
+//#include <mediastreamer2/include/mediastreamer2/msjava.h>
std::stringstream logss;
//std::fstream logss("/storage/sdcard/log.log", std::fstream::out);
@@ -183,7 +183,7 @@
}
// set the surface
-void Java_cn_com_basic_face_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surfaceDecoder, jobject surfaceRender)
+void Java_cn_com_basic_face_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surfaceRender)
{
LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setSurface" << LOG_ENDL;
assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
@@ -192,12 +192,12 @@
CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
// obtain a native windowRender from a Java surface
- if (cameraWrapper.windowDecode != nullptr)
- {
- ANativeWindow_release((ANativeWindow*)(cameraWrapper.windowDecode));
- cameraWrapper.windowDecode = NULL;
- }
- cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, surfaceDecoder);
+ //if (cameraWrapper.windowDecode != nullptr)
+ //{
+ // ANativeWindow_release((ANativeWindow*)(cameraWrapper.windowDecode));
+ // cameraWrapper.windowDecode = NULL;
+ //}
+ //cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, surfaceDecoder);
//cameraWrapper.windowDecode = getSurfaceHolderGetSurface(env, surfaceDecoder);
//cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, (jobject)getSurfaceHolderGetSurface(env, surfaceDecoder));
@@ -235,7 +235,7 @@
{
cameraWrapper.amcdConfig.ak_mime = "video/avc";
cameraWrapper.amcdConfig.ak_width = 1920;
- cameraWrapper.amcdConfig.ak_height = 1088;
+ cameraWrapper.amcdConfig.ak_height = 1080; // nvida yuv420p,1088; Amlogic yuv420p,1080
//cameraWrapper.amcdConfig.windowSurfaceDecode = cameraWrapper.windowDecode; //cameraWrapper.windowDecode;
//cameraWrapper.amcdConfig.windowSurfaceRender = cameraWrapper.windowRender; //cameraWrapper.windowRender;
cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
--
Gitblit v1.8.0