other: remove vnn

pixpark · Dec 31, 2024 · d8e5b94 · d8e5b94
1 parent 1547ac0
commit d8e5b94
Show file tree

Hide file tree

Showing 82 changed files with 20 additions and 3,498 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <h1 align="center">
-  <a href="https://github.com/pixpark/gpupixel"><img src="./docs/image/describe.png"></a>
+  GPUPixel
 </h1>
 
 <p align="center">
@@ -35,7 +35,7 @@
 
 ⛰️ GPUPixel is a real-time, high-performance image and video filter library, extremely easy to compile and integrate with  small library size.
 
-🔑 GPUPixel  is written in C++11 and is based on OpenGL/ES, incorporating a built-in beauty face filter that achieves commercial-grade beauty effects.
+🔑 GPUPixel  is written in C++11 and is based on OpenGL/ES, incorporating a built-in beauty face filter.
 
 🔌 GPUPixel supports platforms including `iOS`, `Android`, `Mac`, `Win` and `Linux`. It can theoretically be ported to any platform that supports OpenGL/ES.
 
@@ -44,11 +44,9 @@
 👉 **Video: <a href="https://youtu.be/9BY1Qx1NEPs" target="_blank">YouTube</a> | <a href="https://www.bilibili.com/video/BV1xQ4y1L7Fh/?share_source=copy_web&vd_source=46adcb1014fa989cfcbb4cc1e866831e" target="_blank">BiliBili</a>**
 
 
-|                   **Origin**                    |                    **Smooth**                     |                    **White**                     |                   **ThinFace**                    |
-| :---------------------------------------------: | :-----------------------------------------------: | :----------------------------------------------: | :-----------------------------------------------: |
-| <img src="./docs/image/origin.gif" width="180px"> |  <img src="./docs/image/smooth.gif" width="180px">  |  <img src="./docs/image/white.gif" width="180px">  | <img src="./docs/image/thinface.gif" width="180px"> |
-|                   **BigEye**                    |                   **Lipstick**                    |                   **Blusher**                    |                    **ON-OFF**                     |
-| <img src="./docs/image/bigeye.gif" width="180px"> | <img src="./docs/image/lipstick.gif" width="180px"> | <img src="./docs/image/blusher.gif" width="180px"> |  <img src="./docs/image/on-off.gif" width="180px">  |
+|                   **Origin**                    |                    **Smooth**                     |                    **White**                     |
+| :---------------------------------------------: | :-----------------------------------------------: | :----------------------------------------------: |
+| <img src="./docs/image/origin.gif" width="180px"> |  <img src="./docs/image/smooth.gif" width="180px">  |  <img src="./docs/image/white.gif" width="180px">  |
 
 ## Architecture
 ![](./docs/image/arch-en.svg)
@@ -63,11 +61,7 @@ This table compares the features supported by **GPUPixel** and **GPUImage** and
 | :-------------------- | :---------------------------------------------: | :------------------------------------------------: | :----------------------------------------------------------: |
 | 📷 **Filters:**        |                        ✅                        |                         ❌                          |                              ❌                               |
 | Skin Smoothing Filter |                        ✅                        |                         ❌                          |                              ❌                               |
-| Skin Whitening Filter |                        ✅                        |                         ❌                          |                              ❌                               |
-| Face Slimming Filter  |                        ✅                        |                         ❌                          |                              ❌                               |
-| Big Eyes Filter       |                        ✅                        |                         ❌                          |                              ❌                               |
-| Lipstick Filter       |                        ✅                        |                         ❌                          |                              ❌                               |
-| Blush Filter          |                        ✅                        |                         ❌                          |                              ❌                               |
+| Skin Whitening Filter |                        ✅                        |                         ❌                          |                                                        ❌                               |
 | More Build in Filter  |                        ✅                        |                         ✅                          |                              ✅                               |
 | 🎬 **Input Formats:**  |                                                 |                                                    |                                                              |
 | YUV420P(I420)         |                        ✅                        |                         ❌                          |                              ❌                               |
@@ -141,7 +135,6 @@ At the same time, please consider supporting GPUPixel by sharing it on social me
 1. [GPUImage](https://github.com/BradLarson/GPUImage) 
 2. [CainCamera](https://github.com/CainKernel/CainCamera)
 3. [AwemeLike](https://github.com/ZZZZou/AwemeLike)
-4. [VNN](https://github.com/joyycom/VNN)
 
 ## License
 This repository is available under the [MIT License](https://github.com/pixpark/gpupixel?tab=MIT-1-ov-file#readme).
diff --git a/examples/app.cmake b/examples/app.cmake
@@ -77,8 +77,6 @@ IF(${CURRENT_OS} STREQUAL "linux")
 						GL
 						glfw)
 	SET(GPUPIXEL_LIBS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libgpupixel.so)	
-	FIlE(GLOB VNN_LIBS 
-		${CMAKE_CURRENT_SOURCE_DIR}/../src/third_party/vnn/libs/${CURRENT_OS}/*
 	)
 	set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-Wl,-rpath,./")
 ELSEIF(${CURRENT_OS} STREQUAL "windows")
@@ -87,10 +85,6 @@ ELSEIF(${CURRENT_OS} STREQUAL "windows")
 						opengl32
 						glfw3)
 
-	FIlE(GLOB VNN_LIBS 
-		${CMAKE_CURRENT_SOURCE_DIR}/../src/third_party/vnn/libs/${CURRENT_OS}/x64/*
-	)
-
 	SET(GPUPIXEL_LIBS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/gpupixel.dll)
 	set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-Wl,-rpath,./")
 ENDIF()
@@ -102,18 +96,15 @@ FILE(GLOB RESOURCE_FILES
 	"${CMAKE_CURRENT_SOURCE_DIR}/../src/resources/*"        
 )
 list(APPEND RESOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/../examples/desktop/demo.png")
-list(APPEND RESOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/../src/third_party/vnn/models/vnn_face278_data/face_pc[1.0.0].vnnmodel")
 
 MACRO(EXPORT_INCLUDE)
 ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} PRE_BUILD 
 				COMMAND ${CMAKE_COMMAND} -E copy 
 				${RESOURCE_FILES} ${APP_RESOURCE_DIR}
 				COMMENT "Copying resource files to output/app directory.")
 
-# copy gpupixel and vnn lib
+# copy gpupixel lib
 ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
-				COMMAND ${CMAKE_COMMAND} -E copy_if_different
-				${VNN_LIBS} ${COPY_DST_RUNTIME_DIR}
 				COMMAND ${CMAKE_COMMAND} -E copy_if_different
 				${GPUPIXEL_LIBS} ${COPY_DST_RUNTIME_DIR}
 				)

diff --git a/src/core/gpupixel.h b/src/core/gpupixel.h
@@ -42,11 +42,6 @@
 
 // face filters
 #include "beauty_face_filter.h"
-#include "face_makeup_filter.h"
-#include "lipstick_filter.h"
-#include "blusher_filter.h"
-#include "face_reshape_filter.h"
-
 #include "box_blur_filter.h"
 #include "box_high_pass_filter.h"
 

diff --git a/src/face_detect/face_detector.cc b/src/face_detect/face_detector.cc
diff --git a/src/face_detect/face_detector.h b/src/face_detect/face_detector.h
diff --git a/src/filter/blusher_filter.cc b/src/filter/blusher_filter.cc
diff --git a/src/filter/blusher_filter.h b/src/filter/blusher_filter.h