From cb4ca5479bdc10c2c0a0cf032c4e3fae2577df60 Mon Sep 17 00:00:00 2001
From: du <13220750630.163.com>
Date: 星期四, 29 五月 2025 17:17:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/digitalhumans/vo/DigitalHumansRespVO.java | 3 ++-
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/digitalhumans/vo/DigitalHumansRespVO.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/digitalhumans/vo/DigitalHumansRespVO.java
index 7f59a97..bf272be 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/digitalhumans/vo/DigitalHumansRespVO.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/digitalhumans/vo/DigitalHumansRespVO.java
@@ -104,4 +104,5 @@
//杩囨湡鏃堕棿
private Date expireDate;
-}
\ No newline at end of file
+ private Integer isTransparent;
+}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java
index 86b308f..cdeb917 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java
@@ -170,10 +170,10 @@
// 褰撴病鏈変汉鍍忔椂锛岃棰戞斁鍦� cover 鐨勪笅灞�
builder = new ProcessBuilder(
"ffmpeg",
- "-i", cover1, // 鑳屾櫙鍥� 1
- "-i", substring1, // 瑙嗛锛堝惈闊抽锛�
- "-i", cover1, // 鑳屾櫙鍥� 2
- "-i", cover, // PPT 鍐呭
+ "-loop", "1", "-i", cover1, // 鑳屾櫙鍥�1锛堝姩鎬佹寔缁級
+ "-i", substring1, // 瑙嗛锛堝惈闊抽锛�
+ "-loop", "1", "-i", cover1, // 鑳屾櫙鍥�2锛堝姩鎬佹寔缁級
+ "-loop", "1", "-i", cover, // PPT 鍐呭锛堝姩鎬佹寔缁級
"-filter_complex",
"[0:v]scale=" + Math.round(scene.getBackground().getWidth()) + ":" + Math.round(scene.getBackground().getHeight()) + "[bg1];" +
"[1:v]scale=" + Math.round(scene.getComponents().get(0).getWidth()) + ":" + Math.round(scene.getComponents().get(0).getHeight()) + "[v1];" +
--
Gitblit v1.9.3