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/CameraWrapper.cpp | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp
index 20290c2..2a2596d 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp
@@ -37,6 +37,11 @@
bool CameraWrapper::initPl()
{
+ PipeLine::register_global_elem_creator("PL_RTSPClient", create_PL_RTSPClient);
+ PipeLine::register_global_elem_creator("PL_AndroidMediaCodecDecoder", create_PL_AndroidMediaCodecDecoder);
+ PipeLine::register_global_elem_creator("PL_AndroidSurfaceViewRender", create_PL_AndroidSurfaceViewRender);
+ PipeLine::register_global_elem_creator("PL_SensetimeFaceTrack", create_PL_SensetimeFaceTrack);
+
PL_RTSPClient* rtspClient = (PL_RTSPClient*)pipeLine->push_elem("PL_RTSPClient");
bool ret = rtspClient->init(&rtspConfig);
if (!ret)
@@ -47,11 +52,19 @@
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;
}
+
+ PL_AndroidSurfaceViewRender* asvRender = (PL_AndroidSurfaceViewRender*)pipeLine->push_elem("PL_AndroidSurfaceViewRender");
+ ret = asvRender->init(&asvrConfig);
+ if (!ret)
+ {
+ LOG_ERROR << "asvRender.init error" << LOG_ENDL;
+ return false;
+ }
#ifdef USE_ST_SDK
PL_SensetimeFaceTrack* sfTrack = (PL_SensetimeFaceTrack*)pipeLine->push_elem("PL_SensetimeFaceTrack");
@@ -64,10 +77,6 @@
#endif
return true;
-}
-
-static void java_mt_callback() {
-
}
static void invokeCallback(CameraWrapper& cameraWrapper, int faceCount)
--
Gitblit v1.8.0