development-history/proxy.git

			@@ -9,7 +9,7 @@
			targetSdkVersion 23
			ndk {
			//abiFilters 'armeabi-v7a', 'x86' , 'x86_64', 'armeabi' , 'arm64-v8a'
			abiFilters 'arm64-v8a'
			abiFilters 'armeabi-v7a'
			}
			externalNativeBuild {
			cmake {

			@@ -6,8 +6,7 @@
			#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -fno-rtti -Wall -UNDEBUG")
			#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG")

			set(WORKSPACE_PATH "E:/Documents/works")
			set(ARCH "arm64-v8a")
			set(WORKSPACE_PATH "D:/workspace/proxy")

			include_directories(
			"${WORKSPACE_PATH}/RtspFace"
			@@ -60,6 +59,7 @@
			"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
			"${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
			"${WORKSPACE_PATH}/RtspFace/MediaHelper.cpp"
			"${WORKSPACE_PATH}/RtspFace/PreAllocBufferQueue.cpp"
			"${WORKSPACE_PATH}/RtspFace/GraphicHelper.cpp"
			"${WORKSPACE_PATH}/RtspFace/PL_RTSPClient.cpp"
			"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp"
			@@ -89,6 +89,7 @@
			"${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/LiveServerMediaSubsession.cpp"
			"${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/LiveRTSPServer.cpp"
			"${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/FFmpegH264Source.cpp"
			"${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/H264FramedSource.cpp"
			)

			# Include libraries needed for native-codec-jni lib

			@@ -414,14 +414,6 @@
			cameraWrapper.plplContext.params.push_back(100);
			}

			//struct ScopeMutexLocker
			//{
			// pthread_mutex_t* mut;
			// ScopeMutexLocker(pthread_mutex_t* _mut) : mut(_mut){pthread_mutex_lock(mut);};
			// ~ScopeMutexLocker(){pthread_mutex_unlock(mut);}
			// //ScopeMutexLocker(&(cameraWrapper.live_daemon_mut));
			//};

			void cw_elem_destory_func(PipeLineElem* elem)
			{
			delete elem;

			@@ -101,7 +101,7 @@
			RtspFaceNative.setFaceLabel(2, i+1, "abcd");
			}

			RtspFaceNative.setLocalIP("192.168.1.82");
			RtspFaceNative.setLocalIP("192.168.1.93");

			mGLView1 = (MyGLSurfaceView) findViewById(R.id.glsurfaceview1);

	VisitFace/RtspNativeCodec/app/build.gradle	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史