Merge remote-tracking branch 'origin/master'

du

2025-05-29 cb4ca5479bdc10c2c0a0cf032c4e3fae2577df60

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

@@ -104,4 +104,5 @@
    //过期时间
    private Date expireDate;

}
    private Integer isTransparent;
}

 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];" +