From d3c698e18c5c1ea1bad9e6f30a938b85399431be Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Thu, 4 May 2023 08:09:15 +0800 Subject: [PATCH] =?UTF-8?q?[*]=20=E4=BC=98=E5=8C=960504?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 15 ++++++++------- taoyao-client-android/taoyao/.gitignore | 12 +++++------- .../taoyao/media/video/WatermarkProcesser.java | 2 ++ taoyao-client-web/.gitignore | 5 ----- 4 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 taoyao-client-web/.gitignore diff --git a/.gitignore b/.gitignore index f1c2c72..e60d0e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,14 @@ -*.log -*.project -*.settings -*.classpath -*.factorypath - -.vscode +.project +.settings +.classpath +.factorypath package-lock.json +.vscode + +dist logs +build target node_modules diff --git a/taoyao-client-android/taoyao/.gitignore b/taoyao-client-android/taoyao/.gitignore index 771339a..d7ef50e 100644 --- a/taoyao-client-android/taoyao/.gitignore +++ b/taoyao-client-android/taoyao/.gitignore @@ -1,9 +1,7 @@ -local.properties +.cxx +.idea +.gradle -**/.cxx -**/.idea -**/.gradle +media/deps -**/build - -media/deps \ No newline at end of file +local.properties \ No newline at end of file diff --git a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/video/WatermarkProcesser.java b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/video/WatermarkProcesser.java index 2ffd9ba..a38d0a6 100644 --- a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/video/WatermarkProcesser.java +++ b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/video/WatermarkProcesser.java @@ -21,6 +21,8 @@ import java.util.TimerTask; * 没有定时:26~32波动 * 定时水印:28~32 * + * TODO:优化调整位置优化性能减少内存拷贝 + * * @author acgist */ public class WatermarkProcesser extends VideoProcesser { diff --git a/taoyao-client-web/.gitignore b/taoyao-client-web/.gitignore deleted file mode 100644 index 1b2055a..0000000 --- a/taoyao-client-web/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.log - -logs -dist -node_modules