Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 11:12:36 +01:00
Code Issues Projects Releases Wiki Activity

Work on #6725

Browse Source
This commit is contained in:
niksedk 2023-03-11 13:17:38 +01:00
parent 3ff0251030
commit 8fe5fa0319
4 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@ -2,7 +2,8 @@
3.6.12 (xth March 2023) BETA 3.6.12 (xth March 2023) BETA
* NEW: * NEW:
* Add Whsper via GPU (ConstMe, windows only) - thx albino1/darnn/smith02ct * Add embedding of subtitles in video files - thx David
* Add Whisper via GPU (ConstMe, windows only) - thx albino1/darnn/smith02ct
* Allow video cut when exporting video with burned-in sub - thx Daniela/David/Leon * Allow video cut when exporting video with burned-in sub - thx Daniela/David/Leon
* Batch convert: Image based format to png with time code - thx Ninelpienel * Batch convert: Image based format to png with time code - thx Ninelpienel
* Add new shortcut for split + auto-br - thx oep42 * Add new shortcut for split + auto-br - thx oep42

45
src/ui/Forms/GenerateVideoWithSoftSubs.cs
View File

@ -41,10 +41,10 @@ namespace Nikse.SubtitleEdit.Forms
Text = LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.Title; Text = LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.Title;
labelInputVideoFile.Text = LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.InputVideoFile; labelInputVideoFile.Text = LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.InputVideoFile;
labelSubtitles.Text = string.Empty; labelSubtitles.Text = string.Empty;
buttonAddSubtitles.Text = LanguageSettings.Current.DvdSubRip.Add; buttonAddSubtitles.Text = LanguageSettings.Current.DvdSubRip.Add;
ButtonRemoveSubtitles.Text = LanguageSettings.Current.SubStationAlphaStyles.Remove; ButtonRemoveSubtitles.Text = LanguageSettings.Current.SubStationAlphaStyles.Remove;
buttonClear.Text = LanguageSettings.Current.SubStationAlphaStyles.RemoveAll; buttonClear.Text = LanguageSettings.Current.SubStationAlphaStyles.RemoveAll;
ButtonMoveSubUp.Text = LanguageSettings.Current.DvdSubRip.MoveUp; ButtonMoveSubUp.Text = LanguageSettings.Current.DvdSubRip.MoveUp;
ButtonMoveSubDown.Text = LanguageSettings.Current.DvdSubRip.MoveDown; ButtonMoveSubDown.Text = LanguageSettings.Current.DvdSubRip.MoveDown;
buttonToggleForced.Text = LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.ToggleForced; buttonToggleForced.Text = LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.ToggleForced;
buttonSetDefault.Text = LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.ToggleDefault; buttonSetDefault.Text = LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.ToggleDefault;
@ -80,10 +80,7 @@ namespace Nikse.SubtitleEdit.Forms
private void LoadVideo(string inputVideoFileName) private void LoadVideo(string inputVideoFileName)
{ {
listViewSubtitles.Items.Clear(); if (string.IsNullOrEmpty(inputVideoFileName) || !File.Exists(inputVideoFileName))
_softSubs = new List<VideoPreviewGeneratorSub>();
if (!File.Exists(inputVideoFileName))
{ {
return; return;
} }
@ -95,6 +92,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
textBoxInputFileName.Text = inputVideoFileName; textBoxInputFileName.Text = inputVideoFileName;
buttonGenerate.Enabled = true;
_inputVideoFileName = inputVideoFileName; _inputVideoFileName = inputVideoFileName;
_videoInfo = videoInfo; _videoInfo = videoInfo;
@ -147,7 +145,7 @@ namespace Nikse.SubtitleEdit.Forms
var item = new ListViewItem var item = new ListViewItem
{ {
Tag = sub.Tag, Tag = sub.Tag,
Text = sub.SubtitleFormat != null ? sub.SubtitleFormat.Name : sub.Name, Text = sub.SubtitleFormat != null ? sub.SubtitleFormat.Name : sub.Format,
}; };
item.SubItems.Add(GetDisplayLanguage(sub.Language)); item.SubItems.Add(GetDisplayLanguage(sub.Language));
item.SubItems.Add(sub.IsDefault.ToString(CultureInfo.InvariantCulture)); item.SubItems.Add(sub.IsDefault.ToString(CultureInfo.InvariantCulture));
@ -191,6 +189,28 @@ namespace Nikse.SubtitleEdit.Forms
private void AddListViewItem(string fileName) private void AddListViewItem(string fileName)
{ {
if (string.IsNullOrEmpty(fileName) || !File.Exists(fileName))
{
return;
}
if (fileName.EndsWith(".sup", StringComparison.OrdinalIgnoreCase) &&
FileUtil.IsBluRaySup(fileName))
{
AddListViewItem(new VideoPreviewGeneratorSub
{
Name = Path.GetFileName(fileName),
Language = "eng", //TODO: get from file name or sup
Format = "Blu-ray sup",
SubtitleFormat = null,
IsNew = true,
IsForced = false,
IsDefault = false,
FileName = fileName,
});
return;
}
var subtitle = Subtitle.Parse(fileName); var subtitle = Subtitle.Parse(fileName);
if (subtitle == null || subtitle.Paragraphs.Count == 0) if (subtitle == null || subtitle.Paragraphs.Count == 0)
{ {
@ -263,7 +283,7 @@ namespace Nikse.SubtitleEdit.Forms
using (var saveDialog = new SaveFileDialog using (var saveDialog = new SaveFileDialog
{ {
FileName = SuggestNewVideoFileName(), FileName = SuggestNewVideoFileName(),
Filter = GetTargetVideoFilter(), Filter = GetTargetVideoFilter(),
AddExtension = true AddExtension = true
}) })
{ {
@ -312,7 +332,7 @@ namespace Nikse.SubtitleEdit.Forms
if (!File.Exists(VideoFileName) || new FileInfo(VideoFileName).Length == 0) if (!File.Exists(VideoFileName) || new FileInfo(VideoFileName).Length == 0)
{ {
SeLogger.Error(Environment.NewLine + "Generate embedded video failed: " + Environment.NewLine + _log); SeLogger.Error(Environment.NewLine + "Generate embedded video failed: " + Environment.NewLine + _log);
MessageBox.Show("Generate embedded video failed" + Environment.NewLine + MessageBox.Show("Generate embedded video failed" + Environment.NewLine +
"For more info see the error log: " + SeLogger.ErrorFile); "For more info see the error log: " + SeLogger.ErrorFile);
buttonGenerate.Enabled = true; buttonGenerate.Enabled = true;
groupBoxSettings.Enabled = true; groupBoxSettings.Enabled = true;
@ -441,13 +461,14 @@ namespace Nikse.SubtitleEdit.Forms
if (!File.Exists(_inputVideoFileName)) if (!File.Exists(_inputVideoFileName))
{ {
MessageBox.Show(string.Format(LanguageSettings.Current.Main.FileNotFound, _inputVideoFileName));
buttonGenerate.Enabled = false; buttonGenerate.Enabled = false;
return; }
else
{
buttonGenerate.Focus();
} }
UiUtil.FixFonts(groupBoxSettings, 2000); UiUtil.FixFonts(groupBoxSettings, 2000);
buttonGenerate.Focus();
} }
private void buttonOpenVideoFile_Click(object sender, EventArgs e) private void buttonOpenVideoFile_Click(object sender, EventArgs e)

2
src/ui/Forms/Main.cs
View File

@ -1757,7 +1757,7 @@ namespace Nikse.SubtitleEdit.Forms
openSecondSubtitleToolStripMenuItem.Text = _language.Menu.Video.OpenSecondSubtitle; openSecondSubtitleToolStripMenuItem.Text = _language.Menu.Video.OpenSecondSubtitle;
generateBlankVideoToolStripMenuItem.Text = _language.Menu.Video.GenerateBlankVideo; generateBlankVideoToolStripMenuItem.Text = _language.Menu.Video.GenerateBlankVideo;
generateVideoWithHardcodedSubtitleToolStripMenuItem.Text = _language.Menu.Video.GenerateVideoWithBurnedInSub; generateVideoWithHardcodedSubtitleToolStripMenuItem.Text = _language.Menu.Video.GenerateVideoWithBurnedInSub;
generateVideoWithHardcodedSubtitleToolStripMenuItem.Text = _language.Menu.Video.GenerateVideoWithEmbeddedSubs; generateVideoWithSoftcodedSubtitlesToolStripMenuItem.Text = _language.Menu.Video.GenerateVideoWithEmbeddedSubs;
videoaudioToTextToolStripMenuItem.Text = string.Format(_language.Menu.Video.VideoAudioToTextX, "Vosk/Kaldi"); videoaudioToTextToolStripMenuItem.Text = string.Format(_language.Menu.Video.VideoAudioToTextX, "Vosk/Kaldi");
audioToTextWhisperTolStripMenuItem.Text = string.Format(_language.Menu.Video.VideoAudioToTextX, "Whisper"); audioToTextWhisperTolStripMenuItem.Text = string.Format(_language.Menu.Video.VideoAudioToTextX, "Whisper");

15
src/ui/Logic/VideoPreviewGenerator.cs
View File

@ -4,7 +4,6 @@ using Nikse.SubtitleEdit.Forms;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Diagnostics.Eventing.Reader;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.Globalization; using System.Globalization;
@ -328,20 +327,24 @@ namespace Nikse.SubtitleEdit.Logic
{ {
subsFormat = " -c:s mov_text"; subsFormat = " -c:s mov_text";
} }
else if (softSub.SubtitleFormat.GetType() == typeof(SubRip)) else if (softSub.SubtitleFormat == null && softSub.Format == "Blu-ray sup")
{
subsFormat += $" -c:s:s:{count - 1} copy"; // should be "pgs" or "pgssub" or ?
}
else if (softSub.SubtitleFormat?.GetType() == typeof(SubRip))
{ {
subsFormat += $" -c:s:s:{count - 1} srt"; subsFormat += $" -c:s:s:{count - 1} srt";
} }
else if (softSub.SubtitleFormat.GetType() == typeof(AdvancedSubStationAlpha)) else if (softSub.SubtitleFormat?.GetType() == typeof(AdvancedSubStationAlpha))
{ {
subsFormat += $" -c:s:s:{count - 1} ass"; subsFormat += $" -c:s:s:{count - 1} ass";
} }
else if (softSub.SubtitleFormat.GetType() == typeof(SubStationAlpha)) else if (softSub.SubtitleFormat?.GetType() == typeof(SubStationAlpha))
{ {
subsFormat += $" -c:s:s:{count - 1} ssa"; subsFormat += $" -c:s:s:{count - 1} ssa";
} }
else if (softSub.SubtitleFormat.GetType() == typeof(WebVTT) || else if (softSub.SubtitleFormat?.GetType() == typeof(WebVTT) ||
softSub.SubtitleFormat.GetType() == typeof(WebVTTFileWithLineNumber)) softSub.SubtitleFormat?.GetType() == typeof(WebVTTFileWithLineNumber))
{ {
subsFormat += $" -c:s:s:{count - 1} webvtt"; subsFormat += $" -c:s:s:{count - 1} webvtt";
} }