Skip to content

Commit 41bc0d5

Browse files
willmiwillmi
authored
Merge pull request #2 from ALiceYuko/master
update with inner 7.1.0
2 parents 0e5e210 + db71ee6 commit 41bc0d5

File tree

125 files changed

+1257
-82770
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1257
-82770
lines changed

‎7z.exe‎

286 KB
Binary file not shown.

‎FULivePC/CMakeLists.txt‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,38 @@ if(WIN32)
195195

196196
STRING(FIND $ENV{CMAKE_GENERATOR} "Win64" IsFinded)
197197
if(${IsFinded} EQUAL -1)
198-
set(SrcNamaDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FaceUnity-SDK-PC/lib/win32)
198+
set(SrcNamaDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FaceUnity-SDK-PC/lib/win32)
199+
set(SrcFreeImageDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FreeImage/lib/win32)
200+
set(SrcOpenCVDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/opencv400/lib/win32)
201+
set(SrcOpenCVDLLFileFFmpeg ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/opencv400/lib/win32/opencv_ffmpeg400.dll)
199202
else()
200-
set(SrcNamaDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FaceUnity-SDK-PC/lib/win64)
203+
set(SrcNamaDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FaceUnity-SDK-PC/lib/win64)
204+
set(SrcFreeImageDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FreeImage/lib/win64)
205+
set(SrcOpenCVDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/opencv400/lib/win64)
206+
set(SrcOpenCVDLLFileFFmpeg ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/opencv400/lib/win64/opencv_ffmpeg400_64.dll)
201207
endif()
202208

203209
add_custom_command(TARGET ${target}
204210
POST_BUILD
211+
212+
COMMAND ${CMAKE_COMMAND} -E make_directory $ENV{CMAKE_DEBUG_OUTPUT}
213+
COMMAND ${CMAKE_COMMAND} -E make_directory $ENV{CMAKE_RUNTIME_OUTPUT}
214+
205215
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcNamaDLLFolder}/fuai.dll $ENV{CMAKE_DEBUG_OUTPUT}
206216
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcNamaDLLFolder}/CNamaSDK.dll $ENV{CMAKE_DEBUG_OUTPUT}
207217
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcNamaDLLFolder}/fuai.dll $ENV{CMAKE_RUNTIME_OUTPUT}
208218
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcNamaDLLFolder}/CNamaSDK.dll $ENV{CMAKE_RUNTIME_OUTPUT}
209-
COMMENT "copy nama")
219+
220+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcFreeImageDLLFolder}/FreeImage.dll $ENV{CMAKE_DEBUG_OUTPUT}
221+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcOpenCVDLLFileFFmpeg} $ENV{CMAKE_DEBUG_OUTPUT}
222+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcOpenCVDLLFolder}/opencv_world400d.dll $ENV{CMAKE_DEBUG_OUTPUT}
223+
224+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcFreeImageDLLFolder}/FreeImage.dll $ENV{CMAKE_RUNTIME_OUTPUT}
225+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcOpenCVDLLFileFFmpeg} $ENV{CMAKE_RUNTIME_OUTPUT}
226+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcOpenCVDLLFolder}/opencv_world400.dll $ENV{CMAKE_RUNTIME_OUTPUT}
227+
228+
COMMENT "copy dll"
229+
)
210230

211231
elseif(APPLE)
212232
target_link_libraries(${target}

‎FULivePC/Config.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ const std::string g_ai_bgseg = "AI_model/ai_bgseg.bundle";
2323

2424
const std::string g_ai_hairseg = "AI_model/ai_hairseg.bundle";
2525

26+
const std::string g_ai_human_process = "AI_model/ai_human_processor_pc.bundle";
27+
2628
const std::string g_fuDataDir = "assets";
2729

2830
const std::string g_v3Data = "v3.bundle";

‎FULivePC/GUI/Gui.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ void Gui::render(Nama::UniquePtr& nama)
814814
ImVec2 frameUV_LB = ImVec2(1, 0);
815815
ImVec2 frameUV_RT = ImVec2(0, 1);
816816

817-
static cv::Mat processedFrame = frameMat.clone();
817+
cv::Mat processedFrame = frameMat.clone();
818818
//ReleaseMutex(hMutex);
819819
cv::cvtColor(frameMat, processedFrame, cv::COLOR_BGR2RGBA);
820820
//float tempTime = GetTickCount();

‎FULivePC/MAC_DATA/Info.plist‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSCameraUsageDescription</key>
6+
<string>Open Your Camera</string>
7+
<key>CFBundleDevelopmentRegion</key>
8+
<string>$(DEVELOPMENT_LANGUAGE)</string>
9+
<key>CFBundleExecutable</key>
10+
<string>$(EXECUTABLE_NAME)</string>
11+
<key>CFBundleIconFile</key>
12+
<string></string>
13+
<key>CFBundleIdentifier</key>
14+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
15+
<key>CFBundleInfoDictionaryVersion</key>
16+
<string>6.0</string>
17+
<key>CFBundleName</key>
18+
<string>$(PRODUCT_NAME)</string>
19+
<key>CFBundlePackageType</key>
20+
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
21+
<key>CFBundleShortVersionString</key>
22+
<string>1.0</string>
23+
<key>CFBundleVersion</key>
24+
<string>1</string>
25+
<key>LSMinimumSystemVersion</key>
26+
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
27+
<key>NSHumanReadableCopyright</key>
28+
<string>Copyright © 2020 liufei. All rights reserved.</string>
29+
<key>NSMainNibFile</key>
30+
<string>MainMenu</string>
31+
<key>NSPrincipalClass</key>
32+
<string>NSApplication</string>
33+
<key>NSSupportsAutomaticTermination</key>
34+
<true/>
35+
<key>NSSupportsSuddenTermination</key>
36+
<true/>
37+
</dict>
38+
</plist>

‎FULivePC/MAC_DATA/ResPic.bundle/readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
push Photo here

‎FULivePC/MAC_DATA/Resource.bundle/config.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"jet_mask.bundle": "鼓腮帮子",
3+
"future_warrior.bundle": "张嘴试试",
4+
"luhantongkuan_ztt_fu.bundle": "眨一眨眼",
5+
"xiaobianzi_zh_fu.bundle": "微笑触发",
6+
"xiaoxueshen_ztt_fu.bundle": "吹气触发",
7+
"sdx2.bundle": "皱眉触发",
8+
"qingqing_ztt_fu.bundle": "嘟嘴试试",
9+
10+
"fu_lm_koreaheart.bundle": "单手手指比心",
11+
"fu_zh_baoquan.bundle": "双手抱拳",
12+
"fu_zh_hezxiong.bundle": "双手合十",
13+
"fu_ztt_live520.bundle": "双手比心",
14+
"ssd_thread_thumb.bundle": "竖个拇指",
15+
"ssd_thread_six.bundle": "比个六",
16+
"ssd_thread_cute.bundle": "双拳卖萌",
17+
18+
"makeup_icon_combination_age.bundle": "减龄妆",
19+
"makeup_icon_combination_bored_cat.bundle": "厌世猫妆",
20+
"makeup_icon_combination_daisy.bundle": "雏菊妆",
21+
"makeup_icon_combination_early_autumn.bundle": "初秋妆",
22+
"makeup_icon_combination_girl.bundle": "少女妆",
23+
"makeup_icon_combination_harbour_wind.bundle": "港风妆",
24+
"makeup_icon_combination_mermaid.bundle": "人鱼妆",
25+
"makeup_icon_combination_purple_rhyme.bundle": "紫韵妆",
26+
"makeup_icon_combination_red_maple.bundle": "红枫妆",
27+
"makeup_icon_combination_rose.bundle": "ROSE妆",
28+
"makeup_icon_combination_supermodel.bundle": "超模妆",
29+
"makeup_icon_combination_warm_winter.bundle": "暖冬妆",
30+
"makeup_icon_combination_paper_cranes.bundle": "千纸鹤妆"
31+
}
32+

‎FULivePC/MAC_DATA/Resource.bundle/msyh.ttc‎

18.7 MB
Binary file not shown.

‎FULivePC/Nama.cpp‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ bool Nama::ReOpenCamera(int camID)
101101
{
102102
mCapture->closeCamera();
103103
mCapture->initCamera(mCapture->rs_width, mCapture->rs_height,camID);
104+
mFrameWidth = mCapture->m_dstFrameSize.width;
105+
mFrameHeight = mCapture->m_dstFrameSize.height;
104106
fuOnCameraChange();
105107
}
106108
return true;
@@ -225,13 +227,21 @@ bool Nama::Init(uint32_t& width, uint32_t& height)
225227
}
226228
fuLoadAIModelFromPackage(reinterpret_cast<float*>(&ai_beseg_green_model_data[0]), ai_beseg_green_model_data.size(), FUAITYPE::FUAITYPE_BACKGROUNDSEGMENTATION_GREEN);
227229

228-
std::vector<char> ai_beseg_model_data;
230+
/*std::vector<char> ai_beseg_model_data;
229231
if (false == FuTool::LoadBundle(g_ai_bgseg, ai_beseg_model_data))
230232
{
231233
std::cout << "Error: fail load bgseg model" << g_ai_bgseg << std::endl;
232234
return false;
233235
}
234-
fuLoadAIModelFromPackage(reinterpret_cast<float*>(&ai_beseg_model_data[0]), ai_beseg_model_data.size(), FUAITYPE::FUAITYPE_BACKGROUNDSEGMENTATION);
236+
fuLoadAIModelFromPackage(reinterpret_cast<float*>(&ai_beseg_model_data[0]), ai_beseg_model_data.size(), FUAITYPE::FUAITYPE_BACKGROUNDSEGMENTATION);*/
237+
238+
std::vector<char> ai_human_process_model_data;
239+
if (false == FuTool::LoadBundle(g_ai_human_process, ai_human_process_model_data))
240+
{
241+
std::cout << "Error: fail load ai_human_process" << g_ai_human_process << std::endl;
242+
return false;
243+
}
244+
fuLoadAIModelFromPackage(reinterpret_cast<float*>(&ai_human_process_model_data[0]), ai_human_process_model_data.size(), FUAITYPE::FUAITYPE_HUMAN_PROCESSOR);
235245

236246
std::vector<char> ai_hairseg_model_data;
237247
if (false == FuTool::LoadBundle(g_ai_hairseg, ai_hairseg_model_data))

0 commit comments

Comments
 (0)