alwaysLink 编译 OlaFaceUnity

This commit is contained in:
Wang.Renzhu 2022-07-21 10:45:36 +08:00
parent 5d80df4edb
commit a9a9cc6b47
15 changed files with 2172 additions and 2327 deletions

View File

@ -118,6 +118,7 @@ OLARENDER_SRCS = [
"Source.cpp", "Source.cpp",
"SourceImage.cpp", "SourceImage.cpp",
"IOSTarget.cpp", "IOSTarget.cpp",
"CVFramebuffer.cpp",
"SourceCamera.cpp", "SourceCamera.cpp",
"TargetView.cpp", "TargetView.cpp",
"FilterGroup.cpp", "FilterGroup.cpp",

View File

@ -4,6 +4,7 @@
// //
// Created by wangrenzhu on 2021/4/30. // Created by wangrenzhu on 2021/4/30.
// //
#if defined(__APPLE__)
#include "CVFramebuffer.hpp" #include "CVFramebuffer.hpp"
#include <assert.h> #include <assert.h>
#include <algorithm> #include <algorithm>
@ -358,3 +359,4 @@ void CVFramebuffer::_bindFramebuffer() {
NS_GI_END NS_GI_END
#endif

View File

@ -7,7 +7,7 @@
#ifndef CVFramebuffer_hpp #ifndef CVFramebuffer_hpp
#define CVFramebuffer_hpp #define CVFramebuffer_hpp
#if defined(__APPLE__)
#include <stdio.h> #include <stdio.h>
#include <OpenGLES/ES3/gl.h> #include <OpenGLES/ES3/gl.h>
#include <OpenGLES/ES3/glext.h> #include <OpenGLES/ES3/glext.h>
@ -56,5 +56,5 @@ namespace Opipe {
} }
#endif
#endif /* CVFramebuffer_hpp */ #endif /* CVFramebuffer_hpp */

View File

@ -5,7 +5,6 @@ cc_library(
"face_mesh_module.cc", "face_mesh_module.cc",
"face_mesh_beauty_render.cc", "face_mesh_beauty_render.cc",
"face_mesh_module_imp.cc", "face_mesh_module_imp.cc",
], ],
hdrs = [ hdrs = [
"face_mesh_module.h", "face_mesh_module.h",
@ -20,11 +19,15 @@ cc_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
"//mediapipe/render/module/common:olamodule_common_library", "//mediapipe/render/module/common:olamodule_common_library",
"//mediapipe/render/core:core",
] + select({ ] + select({
"//mediapipe:ios_i386": [], "//mediapipe:ios_i386": [],
"//mediapipe:ios_x86_64": [], "//mediapipe:ios_x86_64": [],
"//mediapipe:apple": [
"//mediapipe/render/core:core-ios",
],
"//conditions:default": [ "//conditions:default": [
# "//mediapipe/render/core:core",
"//mediapipe/graphs/face_mesh:mobile_calculators", "//mediapipe/graphs/face_mesh:mobile_calculators",
"//mediapipe/framework/formats:landmark_cc_proto", "//mediapipe/framework/formats:landmark_cc_proto",
], ],

View File

@ -47,4 +47,4 @@ namespace Opipe
int64_t timeStamp) = 0; int64_t timeStamp) = 0;
}; };
} }
#endif #endif

View File

@ -1,3 +1,6 @@
#ifndef OPIPE_FaceMeshModule_Impl
#define OPIPE_FaceMeshModule_Impl
#include "mediapipe/render/module/common/ola_graph.h" #include "mediapipe/render/module/common/ola_graph.h"
#include "mediapipe/render/core/OpipeDispatch.hpp" #include "mediapipe/render/core/OpipeDispatch.hpp"
#include "face_mesh_module.h" #include "face_mesh_module.h"
@ -60,3 +63,4 @@ namespace Opipe
std::shared_ptr<FaceMeshCallFrameDelegate> _delegate; std::shared_ptr<FaceMeshCallFrameDelegate> _delegate;
}; };
} }
#endif

View File

@ -29,6 +29,7 @@ objc_library(
], ],
"//conditions:default": [], "//conditions:default": [],
}), }),
alwayslink = True,
sdk_frameworks = [ sdk_frameworks = [
"AVFoundation", "AVFoundation",
"CoreGraphics", "CoreGraphics",
@ -41,5 +42,7 @@ objc_library(
"CoreVideo", "CoreVideo",
"IOSurface", "IOSurface",
"Foundation", "Foundation",
"AssetsLibrary",
"QuartzCore",
], ],
) )

View File

@ -1,6 +1,9 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <CoreVideo/CoreVideo.h>
@interface OlaFaceUnity : NSObject @interface OlaFaceUnity : NSObject
@end //- (void)processVideoFrame:(CVPixelbufferRef)pixelbuffer;
@end

View File

@ -0,0 +1,8 @@
#import "OlaFaceUnity.h"
@interface OlaFaceUnity()
@end
@implementation OlaFaceUnity
@end

View File

@ -144,70 +144,70 @@ BUILD_SETTINGS = BazelBuildSettings(
'/private/var/tmp/_bazel_wangrenzhu/b244be861f40c753b454f38ce4e943dc', '/private/var/tmp/_bazel_wangrenzhu/b244be861f40c753b454f38ce4e943dc',
'ios_arm64', 'ios_arm64',
{ {
'ios_arm64': [ 'watchos_i386': [
'--apple_platform_type=ios', '--apple_platform_type=watchos',
'--cpu=ios_arm64', '--watchos_cpus=i386',
'--watchos_cpus=armv7k,arm64_32', ],
'tvos_x86_64': [
'--apple_platform_type=tvos',
'--tvos_cpus=x86_64',
], ],
'watchos_arm64_32': [ 'watchos_arm64_32': [
'--apple_platform_type=watchos', '--apple_platform_type=watchos',
'--watchos_cpus=armv7k,arm64_32', '--watchos_cpus=armv7k,arm64_32',
], ],
'macos_arm64': [
'--apple_platform_type=macos',
'--cpu=darwin_arm64',
],
'ios_x86_64': [
'--apple_platform_type=ios',
'--cpu=ios_x86_64',
'--watchos_cpus=i386',
],
'macos_x86_64': [
'--apple_platform_type=macos',
'--cpu=darwin_x86_64',
],
'ios_armv7': [
'--apple_platform_type=ios',
'--cpu=ios_armv7',
'--watchos_cpus=armv7k',
],
'watchos_x86_64': [
'--apple_platform_type=watchos',
'--watchos_cpus=i386',
],
'macos_arm64e': [
'--apple_platform_type=macos',
'--cpu=darwin_arm64e',
],
'ios_arm64': [
'--apple_platform_type=ios',
'--cpu=ios_arm64',
'--watchos_cpus=armv7k,arm64_32',
],
'ios_sim_arm64': [ 'ios_sim_arm64': [
'--apple_platform_type=ios', '--apple_platform_type=ios',
'--cpu=ios_sim_arm64', '--cpu=ios_sim_arm64',
'--watchos_cpus=armv7k', '--watchos_cpus=armv7k',
], ],
'macos_arm64': [ 'ios_arm64e': [
'--apple_platform_type=macos', '--apple_platform_type=ios',
'--cpu=darwin_arm64', '--cpu=ios_arm64e',
],
'watchos_armv7k': [
'--apple_platform_type=watchos',
'--watchos_cpus=armv7k,arm64_32', '--watchos_cpus=armv7k,arm64_32',
], ],
'macos_x86_64': [ 'tvos_arm64': [
'--apple_platform_type=macos',
'--cpu=darwin_x86_64',
],
'ios_x86_64': [
'--apple_platform_type=ios',
'--cpu=ios_x86_64',
'--watchos_cpus=i386',
],
'macos_arm64e': [
'--apple_platform_type=macos',
'--cpu=darwin_arm64e',
],
'tvos_x86_64': [
'--apple_platform_type=tvos', '--apple_platform_type=tvos',
'--tvos_cpus=x86_64', '--tvos_cpus=arm64',
], ],
'ios_i386': [ 'ios_i386': [
'--apple_platform_type=ios', '--apple_platform_type=ios',
'--cpu=ios_i386', '--cpu=ios_i386',
'--watchos_cpus=i386', '--watchos_cpus=i386',
], ],
'tvos_arm64': [ 'watchos_armv7k': [
'--apple_platform_type=tvos',
'--tvos_cpus=arm64',
],
'watchos_x86_64': [
'--apple_platform_type=watchos', '--apple_platform_type=watchos',
'--watchos_cpus=i386',
],
'ios_armv7': [
'--apple_platform_type=ios',
'--cpu=ios_armv7',
'--watchos_cpus=armv7k',
],
'watchos_i386': [
'--apple_platform_type=watchos',
'--watchos_cpus=i386',
],
'ios_arm64e': [
'--apple_platform_type=ios',
'--cpu=ios_arm64e',
'--watchos_cpus=armv7k,arm64_32', '--watchos_cpus=armv7k,arm64_32',
], ],
}, },

View File

@ -3,5 +3,4 @@
platform settings -w "/Users/wangrenzhu/Documents/github/mediapipe-render/" platform settings -w "/Users/wangrenzhu/Documents/github/mediapipe-render/"
# This enables implicitly loading Clang modules which can be disabled when a Swift module was built with explicit modules enabled. # This enables implicitly loading Clang modules which can be disabled when a Swift module was built with explicit modules enabled.
settings set -- target.swift-extra-clang-flags "-fimplicit-module-maps" settings set -- target.swift-extra-clang-flags "-fimplicit-module-maps"
# This maps the normalized root to that used by 'OlaFaceUnity.xcodeproj'. settings clear target.source-map
settings set target.source-map "./" "/Users/wangrenzhu/Documents/github/mediapipe-render/"

View File

@ -2,26 +2,26 @@
<Scheme LastUpgradeVersion="1000" version="1.3"> <Scheme LastUpgradeVersion="1000" version="1.3">
<BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES">
<BuildActionEntries> <BuildActionEntries>
<BuildActionEntry buildForTesting="YES" buildForRunning="YES" buildForProfiling="YES" buildForArchiving="YES" buildForAnalyzing="YES"> <BuildActionEntry buildForProfiling="YES" buildForTesting="YES" buildForAnalyzing="YES" buildForArchiving="YES" buildForRunning="YES">
<BuildableReference BlueprintIdentifier="D50916B940C1AF2200000000" ReferencedContainer="container:OlaFaceUnity.xcodeproj" BuildableIdentifier="primary" BuildableName="OlaFaceUnityFramework.framework" BlueprintName="OlaFaceUnityFramework"></BuildableReference> <BuildableReference BuildableIdentifier="primary" BlueprintName="OlaFaceUnityFramework" ReferencedContainer="container:OlaFaceUnity.xcodeproj" BlueprintIdentifier="D50916B940C1AF2200000000" BuildableName="OlaFaceUnityFramework.framework"></BuildableReference>
</BuildActionEntry> </BuildActionEntry>
</BuildActionEntries> </BuildActionEntries>
</BuildAction> </BuildAction>
<TestAction shouldUseLaunchSchemeArgsEnv="YES" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" customLLDBInitFile="$(PROJECT_FILE_PATH)/.tulsi/Utils/lldbinit" buildConfiguration="__TulsiTestRunner_Debug"> <TestAction customLLDBInitFile="$(PROJECT_FILE_PATH)/.tulsi/Utils/lldbinit" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" buildConfiguration="__TulsiTestRunner_Debug">
<Testables></Testables> <Testables></Testables>
<BuildableProductRunnable runnableDebuggingMode="0"> <BuildableProductRunnable runnableDebuggingMode="0">
<BuildableReference BuildableName="OlaFaceUnityFramework.framework" BuildableIdentifier="primary" BlueprintName="OlaFaceUnityFramework" ReferencedContainer="container:OlaFaceUnity.xcodeproj" BlueprintIdentifier="D50916B940C1AF2200000000"></BuildableReference> <BuildableReference ReferencedContainer="container:OlaFaceUnity.xcodeproj" BlueprintIdentifier="D50916B940C1AF2200000000" BlueprintName="OlaFaceUnityFramework" BuildableName="OlaFaceUnityFramework.framework" BuildableIdentifier="primary"></BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
</TestAction> </TestAction>
<LaunchAction buildConfiguration="Debug" customLLDBInitFile="$(PROJECT_FILE_PATH)/.tulsi/Utils/lldbinit" allowLocationSimulation="YES" debugDocumentVersioning="YES" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" useCustomWorkingDirectory="NO" ignoresPersistentStateOnLaunch="NO" debugServiceExtension="internal" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB"> <LaunchAction buildConfiguration="Debug" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" allowLocationSimulation="YES" debugServiceExtension="internal" debugDocumentVersioning="YES" customLLDBInitFile="$(PROJECT_FILE_PATH)/.tulsi/Utils/lldbinit" useCustomWorkingDirectory="NO" ignoresPersistentStateOnLaunch="NO" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" launchStyle="0">
<EnvironmentVariables></EnvironmentVariables> <EnvironmentVariables></EnvironmentVariables>
<BuildableProductRunnable runnableDebuggingMode="0"> <BuildableProductRunnable runnableDebuggingMode="0">
<BuildableReference BuildableName="OlaFaceUnityFramework.framework" BuildableIdentifier="primary" BlueprintIdentifier="D50916B940C1AF2200000000" BlueprintName="OlaFaceUnityFramework" ReferencedContainer="container:OlaFaceUnity.xcodeproj"></BuildableReference> <BuildableReference BlueprintIdentifier="D50916B940C1AF2200000000" BlueprintName="OlaFaceUnityFramework" ReferencedContainer="container:OlaFaceUnity.xcodeproj" BuildableIdentifier="primary" BuildableName="OlaFaceUnityFramework.framework"></BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
</LaunchAction> </LaunchAction>
<ProfileAction useCustomWorkingDirectory="NO" buildConfiguration="__TulsiTestRunner_Release" shouldUseLaunchSchemeArgsEnv="YES" debugDocumentVersioning="YES"> <ProfileAction buildConfiguration="__TulsiTestRunner_Release" useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" debugDocumentVersioning="YES">
<BuildableProductRunnable runnableDebuggingMode="0"> <BuildableProductRunnable runnableDebuggingMode="0">
<BuildableReference BlueprintName="OlaFaceUnityFramework" ReferencedContainer="container:OlaFaceUnity.xcodeproj" BuildableName="OlaFaceUnityFramework.framework" BlueprintIdentifier="D50916B940C1AF2200000000" BuildableIdentifier="primary"></BuildableReference> <BuildableReference BlueprintName="OlaFaceUnityFramework" ReferencedContainer="container:OlaFaceUnity.xcodeproj" BuildableIdentifier="primary" BuildableName="OlaFaceUnityFramework.framework" BlueprintIdentifier="D50916B940C1AF2200000000"></BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
</ProfileAction> </ProfileAction>
<AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction>

View File

@ -1,27 +1,27 @@
<Scheme LastUpgradeVersion="1000" version="1.3"> <Scheme LastUpgradeVersion="1000" version="1.3">
<BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES"> <BuildAction buildImplicitDependencies="YES" parallelizeBuildables="YES">
<BuildActionEntries> <BuildActionEntries>
<BuildActionEntry buildForRunning="YES" buildForAnalyzing="YES" buildForArchiving="YES" buildForTesting="YES" buildForProfiling="YES"> <BuildActionEntry buildForAnalyzing="YES" buildForTesting="YES" buildForRunning="YES" buildForProfiling="YES" buildForArchiving="YES">
<BuildableReference BlueprintIdentifier="D50916B9F55B29BE00000000" BuildableName="libmediapipe-render-module-beauty-ios-OlaFaceUnityLibrary.a" BuildableIdentifier="primary" BlueprintName="mediapipe-render-module-beauty-ios-OlaFaceUnityLibrary" ReferencedContainer="container:OlaFaceUnity.xcodeproj"></BuildableReference> <BuildableReference BlueprintName="mediapipe-render-module-beauty-ios-OlaFaceUnityLibrary" BuildableName="libmediapipe-render-module-beauty-ios-OlaFaceUnityLibrary.a" ReferencedContainer="container:OlaFaceUnity.xcodeproj" BlueprintIdentifier="D50916B9F55B29BE00000000" BuildableIdentifier="primary"></BuildableReference>
</BuildActionEntry> </BuildActionEntry>
</BuildActionEntries> </BuildActionEntries>
</BuildAction> </BuildAction>
<TestAction selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" customLLDBInitFile="$(PROJECT_FILE_PATH)/.tulsi/Utils/lldbinit" buildConfiguration="__TulsiTestRunner_Debug" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB"> <TestAction customLLDBInitFile="$(PROJECT_FILE_PATH)/.tulsi/Utils/lldbinit" buildConfiguration="__TulsiTestRunner_Debug" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" shouldUseLaunchSchemeArgsEnv="YES" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB">
<Testables></Testables> <Testables></Testables>
<BuildableProductRunnable runnableDebuggingMode="0"> <BuildableProductRunnable runnableDebuggingMode="0">
<BuildableReference ReferencedContainer="container:OlaFaceUnity.xcodeproj" BuildableIdentifier="primary" BlueprintIdentifier="D50916B9F55B29BE00000000" BuildableName="libmediapipe-render-module-beauty-ios-OlaFaceUnityLibrary.a" BlueprintName="mediapipe-render-module-beauty-ios-OlaFaceUnityLibrary"></BuildableReference> <BuildableReference BlueprintIdentifier="D50916B9F55B29BE00000000" BlueprintName="mediapipe-render-module-beauty-ios-OlaFaceUnityLibrary" BuildableIdentifier="primary" BuildableName="libmediapipe-render-module-beauty-ios-OlaFaceUnityLibrary.a" ReferencedContainer="container:OlaFaceUnity.xcodeproj"></BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
</TestAction> </TestAction>
<LaunchAction ignoresPersistentStateOnLaunch="NO" debugServiceExtension="internal" launchStyle="0" customLLDBInitFile="$(PROJECT_FILE_PATH)/.tulsi/Utils/lldbinit" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" debugDocumentVersioning="YES" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" allowLocationSimulation="YES" useCustomWorkingDirectory="NO" buildConfiguration="Debug"> <LaunchAction allowLocationSimulation="YES" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" buildConfiguration="Debug" ignoresPersistentStateOnLaunch="NO" debugServiceExtension="internal" launchStyle="0" customLLDBInitFile="$(PROJECT_FILE_PATH)/.tulsi/Utils/lldbinit" useCustomWorkingDirectory="NO" debugDocumentVersioning="YES">
<EnvironmentVariables></EnvironmentVariables> <EnvironmentVariables></EnvironmentVariables>
<MacroExpansion> <MacroExpansion>
<BuildableReference BuildableIdentifier="primary" BuildableName="libmediapipe-render-module-beauty-ios-OlaFaceUnityLibrary.a" BlueprintName="mediapipe-render-module-beauty-ios-OlaFaceUnityLibrary" ReferencedContainer="container:OlaFaceUnity.xcodeproj" BlueprintIdentifier="D50916B9F55B29BE00000000"></BuildableReference> <BuildableReference BuildableIdentifier="primary" BuildableName="libmediapipe-render-module-beauty-ios-OlaFaceUnityLibrary.a" BlueprintIdentifier="D50916B9F55B29BE00000000" BlueprintName="mediapipe-render-module-beauty-ios-OlaFaceUnityLibrary" ReferencedContainer="container:OlaFaceUnity.xcodeproj"></BuildableReference>
</MacroExpansion> </MacroExpansion>
</LaunchAction> </LaunchAction>
<ProfileAction buildConfiguration="__TulsiTestRunner_Release" shouldUseLaunchSchemeArgsEnv="YES" debugDocumentVersioning="YES" useCustomWorkingDirectory="NO"> <ProfileAction shouldUseLaunchSchemeArgsEnv="YES" useCustomWorkingDirectory="NO" buildConfiguration="__TulsiTestRunner_Release" debugDocumentVersioning="YES">
<MacroExpansion> <MacroExpansion>
<BuildableReference BlueprintIdentifier="D50916B9F55B29BE00000000" BuildableName="libmediapipe-render-module-beauty-ios-OlaFaceUnityLibrary.a" BuildableIdentifier="primary" BlueprintName="mediapipe-render-module-beauty-ios-OlaFaceUnityLibrary" ReferencedContainer="container:OlaFaceUnity.xcodeproj"></BuildableReference> <BuildableReference BuildableName="libmediapipe-render-module-beauty-ios-OlaFaceUnityLibrary.a" BlueprintIdentifier="D50916B9F55B29BE00000000" BlueprintName="mediapipe-render-module-beauty-ios-OlaFaceUnityLibrary" BuildableIdentifier="primary" ReferencedContainer="container:OlaFaceUnity.xcodeproj"></BuildableReference>
</MacroExpansion> </MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction buildConfiguration="Debug"></AnalyzeAction> <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction>