From 74f8ea758319002a821d18eb2bf27e36cdb559d0 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 06 四月 2017 12:21:59 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp
index 5a88d00..1a276ee 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp
@@ -47,12 +47,13 @@
PL_AndroidMediaCodecDecoder* amcDecoder = (PL_AndroidMediaCodecDecoder*)pipeLine->push_elem("PL_AndroidMediaCodecDecoder");
ret = amcDecoder->init(&amcdConfig);
- if (!ret)
+ if (!ret)
{
LOG_ERROR << "amcDecoder.init error" << LOG_ENDL;
return false;
}
-
+
+#ifdef USE_ST_SDK
PL_SensetimeFaceTrack* sfTrack = (PL_SensetimeFaceTrack*)pipeLine->push_elem("PL_SensetimeFaceTrack");
ret = sfTrack->init(&sftConfig);
if (!ret)
@@ -60,6 +61,7 @@
LOG_ERROR << "sfTrack.init error" << LOG_ENDL;
return false;
}
+#endif
return true;
}
@@ -82,19 +84,21 @@
if (cameraWrapper.faceCacheLocked)
continue;
- PipeMaterial pm;
+#ifdef USE_ST_SDK
+ PipeMaterial pm;
ret = last->gain(pm);
-
+
if (!ret)
continue;
-
+
int faceCount = cameraWrapper.faceCache.cachePm(pm);
-
+
if (faceCount != 0 && cameraWrapper.faceCallback != 0)
{
// #todo jni thread may not able to invoke java callback
//env->CallVoidMethod(obj, callback, cameraIdx , faceCount);
}
+#endif
}
LOG_INFO << "CameraWrapper::live_daemon_thd stop, ret=" << LOG_ENDL;
--
Gitblit v1.8.0