From 3d3a92d352ed8a17a9bdec256c7e41a2cde2169c Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 08 三月 2017 11:51:53 +0800
Subject: [PATCH] decode 2-way 1080p
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index bb520d7..915d490 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -2,35 +2,33 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -UNDEBUG")
-add_library(native-codec-jni SHARED
- looper.cpp
- native-codec-jni.cpp
- "D:/workspace/proxy/RtspFace/Logger/src/logger.cc")
+add_library(rtspface SHARED
+ RtspNativeCodecJNI.cpp
+ "D:/workspace/proxy/RtspFace/PipeLine.cpp"
+ "D:/workspace/proxy/RtspFace/Logger/src/logger.cc"
+ "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp"
+ "D:/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp"
+ )
# Include libraries needed for native-codec-jni lib
-target_link_libraries(native-codec-jni
+target_link_libraries(rtspface
android
log
mediandk
OpenMAXAL)
-include_directories("D:/workspace/proxy/RtspNativeCodec/app/libs/live555/include"
- "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment"
- "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/include/groupsock"
- "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/include/liveMedia"
- "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/include/UsageEnvironment")
+include_directories("D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment"
-target_link_libraries(native-codec-jni
- "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/lib/libliveMedia.a"
- "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/lib/libgroupsock.a"
- "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/lib/libBasicUsageEnvironment.a"
- "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/lib/libUsageEnvironment.a")
+ "D:/workspace/JniHelpers/src/main/cpp")
+
+target_link_libraries(rtspface
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libliveMedia.a"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libgroupsock.a"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libBasicUsageEnvironment.a"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libUsageEnvironment.a")
include_directories("D:/workspace/proxy/RtspFace")
-
-#add_library(rtspface STATIC
-# "D:/workspace/proxy/RtspFace/PipeLine.cpp"
-# "D:/workspace/proxy/RtspFace/PipeLinePool.cpp"
-# "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp")
-
-# target_link_libraries(native-codec-jni rtspface)
--
Gitblit v1.8.0