Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.
TypeScript agent-skillscodex-clideskop-appdubbingimage-generationlocalizationskillsttsvideo-editingvideo-generationvideo-transcriptionvideo-translation
fix: wrap burned subtitles by rendered size
wulienf1aff502d394
diff --git a/internal/service/render_stage.go b/internal/service/render_stage.goindex 02982bf0..912680e7 100644--- a/internal/service/render_stage.go+++ b/internal/service/render_stage.go@@ -20,6 +20,8 @@ type RenderVideoRequest struct {StepParam *types.SubtitleTaskStepParam}+type resolutionProbe func(inputVideo string) (int, int, error)+func (s Service) RenderVideo(ctx context.Context, req RenderVideoRequest) (string, error) {return renderSubtitleFile(ctx, req)}@@ -62,19 +64,13 @@ func renderSubtitleFile(ctx context.Context, req RenderVideoRequest) (string, erstepParam = &types.SubtitleTaskStepParam{TaskBasePath: req.Workdir}req.StepParam = stepParam}- if err := srtToAss(req.SubtitleFile, assPath, req.Horizontal, stepParam); err != nil {- return "", fmt.Errorf("renderSubtitleFile srtToAss error: %w", err)+ preparedReq, err := prepareSubtitleRenderLayout(req, getResolution, convertToVertical)+ if err != nil {+ return "", fmt.Errorf("renderSubtitleFile prepare subtitle layout error: %w", err)}- if !req.Horizontal {- width, height, err := getResolution(req.InputVideo)- if err != nil {- return "", fmt.Errorf("renderSubtitleFile getResolution error: %w", err)- }- inputVideo, err := prepareRenderVideoInput(req, width, height, convertToVertical)- if err != nil {- return "", fmt.Errorf("renderSubtitleFile prepare vertical input error: %w", err)- }- req.InputVideo = inputVideo+ req = preparedReq+ if err := srtToAss(req.SubtitleFile, assPath, req.Horizontal, req.StepParam); err != nil {+ return "", fmt.Errorf("renderSubtitleFile srtToAss error: %w", err)}args, _ := buildEmbedSubtitleArgs(req)cmd := exec.CommandContext(ctx, storage.FfmpegPath, args...)@@ -87,6 +83,29 @@ func renderSubtitleFile(ctx context.Context, req RenderVideoRequest) (string, ertype verticalConverter func(inputVideo, outputVideo, majorTitle, minorTitle string) error+func prepareSubtitleRenderLayout(req RenderVideoRequest, probe resolutionProbe, convert verticalConverter) (RenderVideoRequest, error) {+ if req.StepParam == nil {+ req.StepParam = &types.SubtitleTaskStepParam{TaskBasePath: req.Workdir}+ }+ width, height, err := probe(req.InputVideo)+ if err != nil {+ return req, fmt.Errorf("get resolution error: %w", err)+ }+ if !req.Horizontal {+ inputVideo, err := prepareRenderVideoInput(req, width, height, convert)+ if err != nil {+ return req, fmt.Errorf("prepare vertical input error: %w", err)+ }+ req.InputVideo = inputVideo+ if width > height {+ width, height = 720, 1280+ }+ }+ req.StepParam.RenderWidth = width+ req.StepParam.RenderHeight = height+ return req, nil+}+func prepareRenderVideoInput(req RenderVideoRequest, width, height int, convert verticalConverter) (string, error) {if req.Horizontal || width <= height {return req.InputVideo, nildiff --git a/internal/service/render_stage_test.go b/internal/service/render_stage_test.goindex 5875f404..f4d7b408 100644--- a/internal/service/render_stage_test.go+++ b/internal/service/render_stage_test.go@@ -85,6 +85,59 @@ func TestPrepareRenderVideoInputConvertsHorizontalVerticalRequest(t *testing.T)}}+func TestPrepareSubtitleRenderLayoutSetsHorizontalDimensions(t *testing.T) {+ req := RenderVideoRequest{+ InputVideo: "tasks/demo/origin_video.mp4",+ Horizontal: true,+ StepParam: &types.SubtitleTaskStepParam{},+ }++ got, err := prepareSubtitleRenderLayout(req, func(input string) (int, int, error) {+ if input != req.InputVideo {+ t.Fatalf("probe input = %q, want %q", input, req.InputVideo)+ }+ return 1920, 1080, nil+ }, func(input, output, majorTitle, minorTitle string) error {+ t.Fatal("horizontal render should not convert video")+ return nil+ })+ if err != nil {+ t.Fatalf("prepareSubtitleRenderLayout() error = %v", err)+ }+ if got.StepParam.RenderWidth != 1920 || got.StepParam.RenderHeight != 1080 {+ t.Fatalf("Render dimensions = %dx%d, want 1920x1080", got.StepParam.RenderWidth, got.StepParam.RenderHeight)+ }+ if got.InputVideo != req.InputVideo {+ t.Fatalf("InputVideo = %q, want %q", got.InputVideo, req.InputVideo)+ }+}++func TestPrepareSubtitleRenderLayoutSetsConvertedVerticalDimensions(t *testing.T) {+ workdir := filepath.Join("tasks", "demo")+ req := RenderVideoRequest{+ Workdir: workdir,+ InputVideo: filepath.Join(workdir, "origin_video.mp4"),+ Horizontal: false,+ StepParam: &types.SubtitleTaskStepParam{TaskBasePath: workdir},+ }++ got, err := prepareSubtitleRenderLayout(req, func(input string) (int, int, error) {+ return 1280, 720, nil+ }, func(input, output, majorTitle, minorTitle string) error {+ return nil+ })+ if err != nil {+ t.Fatalf("prepareSubtitleRenderLayout() error = %v", err)+ }+ wantInput := filepath.Join(workdir, types.SubtitleTaskTransferredVerticalVideoFileName)+ if got.InputVideo != wantInput {+ t.Fatalf("InputVideo = %q, want converted vertical path %q", got.InputVideo, wantInput)+ }+ if got.StepParam.RenderWidth != 720 || got.StepParam.RenderHeight != 1280 {+ t.Fatalf("Render dimensions = %dx%d, want 720x1280", got.StepParam.RenderWidth, got.StepParam.RenderHeight)+ }+}+func TestGetFontPathsUsesChineseCapableFontsOnDarwin(t *testing.T) {bold, regular, err := fontPathsForOS("darwin", func(path string) bool {return strings.Contains(path, "Hiragino Sans GB")diff --git a/internal/service/srt_embed.go b/internal/service/srt_embed.goindex 1b9e3679..c5e1878d 100644--- a/internal/service/srt_embed.go+++ b/internal/service/srt_embed.go@@ -21,6 +21,7 @@ import ("strings""sync""time"+ "unicode""github.com/go-ego/gse""go.uber.org/zap"@@ -32,7 +33,12 @@ var (chineseSegmenterErr error)-const verticalChineseMaxRunesPerLine = 18+const (+ verticalChineseMaxRunesPerLine = 18+ assDefaultPlayResX = 384+ assDefaultPlayResY = 288+ subtitleWrapSafetyRatio = 0.92+)func (s Service) embedSubtitles(ctx context.Context, stepParam *types.SubtitleTaskStepParam) error {var err error@@ -232,6 +238,306 @@ func subtitleTextDisplayWidth(text string) int {return width}+type subtitleWrapConfig struct {+ maxLineWidth float64+ fontSize float64+ scaleX float64+ spacing float64+}++func newSubtitleWrapConfig(style subtitlestyle.Style, stepParam *types.SubtitleTaskStepParam) subtitleWrapConfig {+ width := assDefaultPlayResX+ if stepParam != nil && stepParam.RenderWidth > 0 && stepParam.RenderHeight > 0 {+ scale := math.Min(float64(assDefaultPlayResX)/float64(stepParam.RenderWidth), float64(assDefaultPlayResY)/float64(stepParam.RenderHeight))+ width = int(math.Floor(float64(stepParam.RenderWidth) * scale))+ if width < 1 {+ width = assDefaultPlayResX+ }+ }++ fontSize := float64(styleIntValue(style.FontSize, 14))+ marginL := float64(styleIntValue(style.MarginL, 10))+ marginR := float64(styleIntValue(style.MarginR, 10))+ maxLineWidth := (float64(width) - marginL - marginR) * subtitleWrapSafetyRatio+ if maxLineWidth < fontSize {+ maxLineWidth = fontSize+ }++ return subtitleWrapConfig{+ maxLineWidth: maxLineWidth,+ fontSize: fontSize,+ scaleX: float64(styleIntValue(style.ScaleX, 100)) / 100,+ spacing: styleFloatValue(style.Spacing, 0),+ }+}++func styleIntValue(value *int, fallback int) int {+ if value == nil {+ return fallback+ }+ return *value+}++func styleFloatValue(value *float64, fallback float64) float64 {+ if value == nil {+ return fallback+ }+ return *value+}++func wrapSubtitleForASS(text string, style subtitlestyle.Style, stepParam *types.SubtitleTaskStepParam) []string {+ text = util.CleanPunction(strings.TrimSpace(text))+ if text == "" {+ return nil+ }+ config := newSubtitleWrapConfig(style, stepParam)+ if estimateSubtitleTextWidth(text, config) <= config.maxLineWidth {+ return []string{text}+ }+ if containsCJKOrThai(text) {+ return wrapCJKSubtitle(text, config)+ }+ return []string{text}+}++func wrapVerticalChineseSubtitleForASS(text string, style subtitlestyle.Style, stepParam *types.SubtitleTaskStepParam) []string {+ config := newSubtitleWrapConfig(style, stepParam)+ legacyMaxWidth := config.fontSize * float64(verticalChineseMaxRunesPerLine)+ if legacyMaxWidth > 0 && legacyMaxWidth < config.maxLineWidth {+ config.maxLineWidth = legacyMaxWidth+ }+ text = util.CleanPunction(strings.TrimSpace(text))+ if text == "" {+ return nil+ }+ if estimateSubtitleTextWidth(text, config) <= config.maxLineWidth {+ return []string{text}+ }+ return wrapCJKSubtitle(text, config)+}++func joinASSLines(lines []string) string {+ return strings.Join(lines, `\N`)+}++func wrapCJKSubtitle(text string, config subtitleWrapConfig) []string {+ tokens := []string{}+ if containsChinese(text) {+ tokens = segmentChineseText(text)+ }+ if len(tokens) == 0 {+ for _, r := range text {+ tokens = append(tokens, string(r))+ }+ }++ var lines []string+ var current strings.Builder+ currentWidth := 0.0+ for _, token := range tokens {+ tokenWidth := estimateSubtitleTextWidth(token, config)+ if tokenWidth > config.maxLineWidth {+ if current.Len() > 0 {+ lines = append(lines, util.CleanPunction(current.String()))+ current.Reset()+ currentWidth = 0+ }+ chunks := wrapCJKRunesByWidth(token, config)+ if len(chunks) == 0 {+ continue+ }+ if len(chunks) > 1 {+ lines = append(lines, chunks[:len(chunks)-1]...)+ }+ lastChunk := chunks[len(chunks)-1]+ current.WriteString(lastChunk)+ currentWidth = estimateSubtitleTextWidth(lastChunk, config)+ continue+ }+ if !isTrailingSubtitlePunctuation(token) &&+ current.Len() > 0 &&+ currentWidth+tokenWidth > config.maxLineWidth {+ lines = append(lines, util.CleanPunction(current.String()))+ current.Reset()+ currentWidth = 0+ }+ current.WriteString(token)+ currentWidth += tokenWidth+ }+ if current.Len() > 0 {+ lines = append(lines, util.CleanPunction(current.String()))+ }+ return balanceChineseSubtitleLines(lines, tokens)+}++func balanceChineseSubtitleLines(lines []string, tokens []string) []string {+ lines = rebalanceShortChineseTrailingLine(lines)+ if len(lines) != 2 {+ return lines+ }+ if subtitleTextDisplayWidth(lines[0]) < subtitleTextDisplayWidth(lines[1]) {+ return lines+ }+ if len(tokens) < 2 {+ return lines+ }+ targetFirstWidth := subtitleTextDisplayWidth(lines[0]+lines[1]) * 2 / 5+ if targetFirstWidth < 1 {+ targetFirstWidth = 1+ }+ splitAt := bestChineseTokenSplitByDisplayWidth(tokens, targetFirstWidth)+ if splitAt <= 0 || splitAt >= len(tokens) {+ return lines+ }+ balanced := []string{+ util.CleanPunction(strings.Join(tokens[:splitAt], "")),+ util.CleanPunction(strings.Join(tokens[splitAt:], "")),+ }+ if balanced[0] == "" || balanced[1] == "" {+ return lines+ }+ if subtitleTextDisplayWidth(balanced[0]) >= subtitleTextDisplayWidth(balanced[1]) {+ return lines+ }+ return balanced+}++func bestChineseTokenSplitByDisplayWidth(tokens []string, targetWidth int) int {+ best := 1+ bestDiff := math.MaxInt+ currentWidth := 0+ for i, token := range tokens[:len(tokens)-1] {+ currentWidth += subtitleTextDisplayWidth(token)+ diff := int(math.Abs(float64(currentWidth - targetWidth)))+ if isPreferredChineseTokenBreak(token, tokens[i+1]) {+ diff -= 2+ }+ if diff < bestDiff {+ bestDiff = diff+ best = i + 1+ }+ }+ return best+}++func isPreferredChineseTokenBreak(prev, next string) bool {+ prevRunes := []rune(prev)+ nextRunes := []rune(next)+ if len(prevRunes) == 0 || len(nextRunes) == 0 {+ return false+ }+ prevLast := prevRunes[len(prevRunes)-1]+ nextFirst := nextRunes[0]+ if strings.ContainsRune(",。!?;:、,.!?;:", prevLast) {+ return true+ }+ if strings.ContainsRune("的了着过呢吗吧啊呀和与或但而就都也", prevLast) {+ return true+ }+ if strings.ContainsRune(",。!?;:、,.!?;:", nextFirst) {+ return false+ }+ return false+}++func wrapCJKRunesByWidth(text string, config subtitleWrapConfig) []string {+ var lines []string+ var current strings.Builder+ currentWidth := 0.0+ for _, r := range text {+ part := string(r)+ partWidth := estimateSubtitleTextWidth(part, config)+ if current.Len() > 0 && currentWidth+partWidth > config.maxLineWidth {+ lines = append(lines, util.CleanPunction(current.String()))+ current.Reset()+ currentWidth = 0+ }+ current.WriteRune(r)+ currentWidth += partWidth+ }+ if current.Len() > 0 {+ lines = append(lines, util.CleanPunction(current.String()))+ }+ if len(lines) == 0 {+ return []string{util.CleanPunction(text)}+ }+ return lines+}++func estimateSubtitleTextWidth(text string, config subtitleWrapConfig) float64 {+ width := 0.0+ runeCount := 0+ for _, r := range text {+ width += subtitleRuneWidth(r, config.fontSize)+ runeCount+++ }+ if runeCount > 1 {+ width += float64(runeCount-1) * config.spacing+ }+ return width * config.scaleX+}++func subtitleRuneWidth(r rune, fontSize float64) float64 {+ switch {+ case unicode.IsSpace(r):+ return fontSize * 0.33+ case isCJKRune(r):+ return fontSize+ case isThaiRune(r):+ return fontSize * 0.92+ case isWideScriptRune(r):+ return fontSize * 0.95+ case r >= 'A' && r <= 'Z':+ return fontSize * 0.66+ case r >= 'a' && r <= 'z':+ return fontSize * 0.56+ case r >= '0' && r <= '9':+ return fontSize * 0.56+ case unicode.IsPunct(r):+ return fontSize * 0.38+ default:+ return fontSize * 0.62+ }+}++func containsCJKOrThai(text string) bool {+ for _, r := range text {+ if isCJKRune(r) || isThaiRune(r) {+ return true+ }+ }+ return false+}++func containsChinese(text string) bool {+ for _, r := range text {+ if r >= '\u4e00' && r <= '\u9fff' {+ return true+ }+ }+ return false+}++func isCJKRune(r rune) bool {+ return (r >= '\u4e00' && r <= '\u9fff') ||+ (r >= '\u3040' && r <= '\u30ff') ||+ (r >= '\u3400' && r <= '\u4dbf') ||+ (r >= '\uac00' && r <= '\ud7af') ||+ (r >= '\uff00' && r <= '\uffef')+}++func isThaiRune(r rune) bool {+ return r >= '\u0e00' && r <= '\u0e7f'+}++func isWideScriptRune(r rune) bool {+ return (r >= '\u0590' && r <= '\u05ff') ||+ (r >= '\u0600' && r <= '\u06ff') ||+ (r >= '\u0900' && r <= '\u097f') ||+ (r >= '\u0980' && r <= '\u09ff') ||+ (r >= '\u0b80' && r <= '\u0bff')+}+func isTrailingSubtitlePunctuation(segment string) bool {for _, r := range segment {if !strings.ContainsRune(",,.。!?”\"》", r) {@@ -459,13 +765,16 @@ func srtToAss(inputSRT, outputASS string, isHorizontal bool, stepParam *types.SustartFormatted := formatTimestamp(startTime)endFormatted := formatTimestamp(endTime)if len(subtitleLines) == 1 {- combinedText := fmt.Sprintf("%s{\\an%d}{\\rMajor}%s", majorTags, majorAlignment, util.CleanPunction(subtitleLines[0]))+ majorText := joinASSLines(wrapSubtitleForASS(subtitleLines[0], screenStyle.Major, stepParam))+ combinedText := fmt.Sprintf("%s{\\an%d}{\\rMajor}%s", majorTags, majorAlignment, majorText)_, _ = assFile.WriteString(fmt.Sprintf("Dialogue: 0,%s,%s,Major,,0,0,0,,%s\n", startFormatted, endFormatted, combinedText))continue}+ majorText := joinASSLines(wrapSubtitleForASS(subtitleLines[0], screenStyle.Major, stepParam))+ minorText := joinASSLines(wrapSubtitleForASS(subtitleLines[1], screenStyle.Minor, stepParam))combinedText := fmt.Sprintf("%s{\\an%d}{\\rMajor}%s\\N%s{\\an%d}{\\rMinor}%s",- majorTags, majorAlignment, subtitleLines[0],- minorTags, minorAlignment, util.CleanPunction(subtitleLines[1]))+ majorTags, majorAlignment, majorText,+ minorTags, minorAlignment, minorText)_, _ = assFile.WriteString(fmt.Sprintf("Dialogue: 0,%s,%s,Major,,0,0,0,,%s\n", startFormatted, endFormatted, combinedText))}} else {@@ -505,7 +814,10 @@ func srtToAss(inputSRT, outputASS string, isHorizontal bool, stepParam *types.Suif !util.ContainsAlphabetic(content) {// 处理中文字幕- chineseLines := splitChineseText(content, verticalChineseMaxRunesPerLine)+ chineseLines := wrapVerticalChineseSubtitleForASS(content, screenStyle.Major, stepParam)+ if len(chineseLines) == 0 {+ chineseLines = splitChineseText(content, verticalChineseMaxRunesPerLine)+ }totalTime := endTime - startTimefor i, line := range chineseLines {iStart := startTime + time.Duration(float64(i)*float64(totalTime)/float64(len(chineseLines)))@@ -525,7 +837,7 @@ func srtToAss(inputSRT, outputASS string, isHorizontal bool, stepParam *types.Su// 处理英文字幕startFormatted := formatTimestamp(startTime)endFormatted := formatTimestamp(endTime)- cleanedText := util.CleanPunction(content)+ cleanedText := joinASSLines(wrapSubtitleForASS(content, screenStyle.Minor, stepParam))combinedText := fmt.Sprintf("%s{\\an%d}{\\rMinor}%s",minorTags,minorAlignment,diff --git a/internal/service/srt_embed_test.go b/internal/service/srt_embed_test.goindex de4e14f2..9478a8c2 100644--- a/internal/service/srt_embed_test.go+++ b/internal/service/srt_embed_test.go@@ -147,6 +147,166 @@ func TestHorizontalAssUsesCustomSubtitleStyle(t *testing.T) {}}+func TestHorizontalAssWrapsLargeFontChineseSubtitle(t *testing.T) {+ dir := t.TempDir()+ in := filepath.Join(dir, "large-chinese.srt")+ out := filepath.Join(dir, "large-chinese.ass")+ content := "1\n00:00:00,840 --> 00:00:02,900\n这是一段字号很大的中文字幕如果不自动换行就会超出屏幕之外影响观看体验\n\n"+ if err := os.WriteFile(in, []byte(content), 0644); err != nil {+ t.Fatal(err)+ }++ fontSize := 80+ style := subtitlestyle.DefaultStyleSet()+ style.Horizontal.Major.FontSize = &fontSize++ err := srtToAss(in, out, true, &types.SubtitleTaskStepParam{+ TaskBasePath: dir,+ SubtitleStyle: style,+ })+ if err != nil {+ t.Fatalf("srtToAss() error = %v", err)+ }+ data, err := os.ReadFile(out)+ if err != nil {+ t.Fatal(err)+ }+ ass := string(data)+ if !strings.Contains(ass, `\N`) {+ t.Fatalf("large-font Chinese subtitle was not wrapped: %s", ass)+ }+}++func TestHorizontalAssWrapsChineseWithShorterFirstLine(t *testing.T) {+ fontSize := 26+ style := subtitlestyle.DefaultStyleSet()+ style.Horizontal.Major.FontSize = &fontSize++ got := wrapSubtitleForASS("只是想让你知道你走在正确的道路上", style.Horizontal.Major, &types.SubtitleTaskStepParam{+ RenderWidth: 1920,+ RenderHeight: 1080,+ })+ if len(got) != 2 {+ t.Fatalf("wrapped line count = %d, want 2; lines = %#v", len(got), got)+ }++ firstWidth := subtitleDisplayWidth(got[0])+ secondWidth := subtitleDisplayWidth(got[1])+ if firstWidth >= secondWidth {+ t.Fatalf("first Chinese subtitle line should be shorter than second: lines=%#v widths=%d,%d", got, firstWidth, secondWidth)+ }+ if strings.Contains(strings.Join(got, "\n"), "知\n道") {+ t.Fatalf("Chinese subtitle should not break inside the word 知道: lines=%#v", got)+ }+}++func TestHorizontalAssWrapsChineseAtWordBoundaries(t *testing.T) {+ fontSize := 26+ style := subtitlestyle.DefaultStyleSet()+ style.Horizontal.Major.FontSize = &fontSize++ got := wrapSubtitleForASS("很多克服糟糕的日子和重新开始", style.Horizontal.Major, &types.SubtitleTaskStepParam{+ RenderWidth: 1920,+ RenderHeight: 1080,+ })+ joined := strings.Join(got, "\n")+ if strings.Contains(joined, "糟\n糕") {+ t.Fatalf("Chinese subtitle should not break inside the word 糟糕: lines=%#v", got)+ }+}++func TestHorizontalAssDoesNotInsertEnglishLineBreaks(t *testing.T) {+ dir := t.TempDir()+ in := filepath.Join(dir, "large-english.srt")+ out := filepath.Join(dir, "large-english.ass")+ content := "1\n00:00:00,840 --> 00:00:02,900\nThis large subtitle should wrap at natural word boundaries before it runs beyond the edge of the video frame\n\n"+ if err := os.WriteFile(in, []byte(content), 0644); err != nil {+ t.Fatal(err)+ }++ fontSize := 58+ style := subtitlestyle.DefaultStyleSet()+ style.Horizontal.Major.FontSize = &fontSize++ err := srtToAss(in, out, true, &types.SubtitleTaskStepParam{+ TaskBasePath: dir,+ SubtitleStyle: style,+ })+ if err != nil {+ t.Fatalf("srtToAss() error = %v", err)+ }+ data, err := os.ReadFile(out)+ if err != nil {+ t.Fatal(err)+ }+ ass := string(data)+ if strings.Contains(ass, `\N`) {+ t.Fatalf("English subtitle should rely on ASS/libass wrapping, not manual line breaks: %s", ass)+ }+}++func TestHorizontalAssDoesNotSplitLongEnglishToken(t *testing.T) {+ dir := t.TempDir()+ in := filepath.Join(dir, "long-token.srt")+ out := filepath.Join(dir, "long-token.ass")+ content := "1\n00:00:00,840 --> 00:00:02,900\nDonaudampfschifffahrtsgesellschaftskapitaensmuetzeDonaudampfschifffahrtsgesellschaftskapitaensmuetze\n\n"+ if err := os.WriteFile(in, []byte(content), 0644); err != nil {+ t.Fatal(err)+ }++ fontSize := 46+ style := subtitlestyle.DefaultStyleSet()+ style.Horizontal.Major.FontSize = &fontSize++ err := srtToAss(in, out, true, &types.SubtitleTaskStepParam{+ TaskBasePath: dir,+ SubtitleStyle: style,+ })+ if err != nil {+ t.Fatalf("srtToAss() error = %v", err)+ }+ data, err := os.ReadFile(out)+ if err != nil {+ t.Fatal(err)+ }+ ass := string(data)+ if strings.Contains(ass, `\N`) {+ t.Fatalf("long English token should rely on ASS/libass wrapping, not manual line breaks: %s", ass)+ }+}++func TestHorizontalAssWrapsUsingNarrowRenderWidth(t *testing.T) {+ dir := t.TempDir()+ in := filepath.Join(dir, "narrow-chinese.srt")+ out := filepath.Join(dir, "narrow-chinese.ass")+ content := "1\n00:00:00,840 --> 00:00:02,900\n这段字幕需要适配窄屏\n\n"+ if err := os.WriteFile(in, []byte(content), 0644); err != nil {+ t.Fatal(err)+ }++ fontSize := 22+ style := subtitlestyle.DefaultStyleSet()+ style.Horizontal.Major.FontSize = &fontSize++ err := srtToAss(in, out, true, &types.SubtitleTaskStepParam{+ TaskBasePath: dir,+ SubtitleStyle: style,+ RenderWidth: 720,+ RenderHeight: 1280,+ })+ if err != nil {+ t.Fatalf("srtToAss() error = %v", err)+ }+ data, err := os.ReadFile(out)+ if err != nil {+ t.Fatal(err)+ }+ ass := string(data)+ if !strings.Contains(ass, `\N`) {+ t.Fatalf("narrow render width was not used for subtitle wrapping: %s", ass)+ }+}+func TestVerticalAssUsesCustomMinorStyle(t *testing.T) {dir := t.TempDir()in := filepath.Join(dir, "subtitle.srt")diff --git a/internal/types/subtitle_task.go b/internal/types/subtitle_task.goindex 1715656e..c854a1a6 100644--- a/internal/types/subtitle_task.go+++ b/internal/types/subtitle_task.go@@ -354,6 +354,8 @@ type SubtitleTaskStepParam struct {VideoWithTtsFilePath string // 替换源视频的音频为tts结果后的视频路径VttSwitch bool // 是否使用VTT格式字幕文件SubtitleStyle *subtitlestyle.StyleSet // CLI/Agent 传入的字幕样式;nil 时使用默认样式+ RenderWidth int // 当前待烧录字幕视频宽度,用于按字号估算自动换行+ RenderHeight int // 当前待烧录字幕视频高度,用于按字号估算自动换行}type SrtSentence struct {