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

Fix for export to DOST time codes - thx Christian :)

Browse Source
This commit is contained in:
niksedk 2015-08-30 08:23:07 +02:00
parent 8ec554a42a
commit 3c98cbb3f3
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Forms/ExportPngXml.cs
View File

@ -120,12 +120,17 @@ namespace Nikse.SubtitleEdit.Forms
} }
} }
private string BdnXmlTimeCode(TimeCode timecode) private int MillisecondsToFramesMaxFrameRate(double milliseconds)
{ {
var fr = FrameRate; int frames = (int)Math.Round(milliseconds / (TimeCode.BaseUnit / FrameRate));
var tc = new TimeCode(timecode.TotalMilliseconds * (Math.Ceiling(fr) / fr)); if (frames >= FrameRate)
int frames = SubtitleFormat.MillisecondsToFramesMaxFrameRate(tc.Milliseconds); frames = (int)(FrameRate - 0.01);
return string.Format("{0:00}:{1:00}:{2:00}:{3:00}", tc.Hours, tc.Minutes, tc.Seconds, frames); return frames;
}
private string ToHHMMSSFF(TimeCode timecode)
{
return string.Format("{0:00}:{1:00}:{2:00}:{3:00}", timecode.Hours, timecode.Minutes, timecode.Seconds, MillisecondsToFramesMaxFrameRate(timecode.Milliseconds));
} }
private static ContentAlignment GetAlignmentFromParagraph(MakeBitmapParameter p, SubtitleFormat format, Subtitle subtitle) private static ContentAlignment GetAlignmentFromParagraph(MakeBitmapParameter p, SubtitleFormat format, Subtitle subtitle)
@ -841,7 +846,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
"<Name Title=\"subtitle_exp\" Content=\"\"/>" + Environment.NewLine + "<Name Title=\"subtitle_exp\" Content=\"\"/>" + Environment.NewLine +
"<Language Code=\"eng\"/>" + Environment.NewLine + "<Language Code=\"eng\"/>" + Environment.NewLine +
"<Format VideoFormat=\"" + videoFormat + "\" FrameRate=\"" + FrameRate.ToString(CultureInfo.InvariantCulture) + "\" DropFrame=\"False\"/>" + Environment.NewLine + "<Format VideoFormat=\"" + videoFormat + "\" FrameRate=\"" + FrameRate.ToString(CultureInfo.InvariantCulture) + "\" DropFrame=\"False\"/>" + Environment.NewLine +
"<Events Type=\"Graphic\" FirstEventInTC=\"" + BdnXmlTimeCode(first.StartTime) + "\" LastEventOutTC=\"" + BdnXmlTimeCode(last.EndTime) + "\" NumberofEvents=\"" + imagesSavedCount.ToString(CultureInfo.InvariantCulture) + "\"/>" + Environment.NewLine + "<Events Type=\"Graphic\" FirstEventInTC=\"" + ToHHMMSSFF(first.StartTime) + "\" LastEventOutTC=\"" + ToHHMMSSFF(last.EndTime) + "\" NumberofEvents=\"" + imagesSavedCount.ToString(CultureInfo.InvariantCulture) + "\"/>" + Environment.NewLine +
"</Description>" + Environment.NewLine + "</Description>" + Environment.NewLine +
"<Events>" + Environment.NewLine + "<Events>" + Environment.NewLine +
"</Events>" + Environment.NewLine + "</Events>" + Environment.NewLine +
@ -1270,8 +1275,8 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
if (param.Alignment == ContentAlignment.MiddleLeft || param.Alignment == ContentAlignment.MiddleCenter || param.Alignment == ContentAlignment.MiddleRight) if (param.Alignment == ContentAlignment.MiddleLeft || param.Alignment == ContentAlignment.MiddleCenter || param.Alignment == ContentAlignment.MiddleRight)
top = param.ScreenHeight - (param.Bitmap.Height / 2); top = param.ScreenHeight - (param.Bitmap.Height / 2);
string startTime = BdnXmlTimeCode(param.P.StartTime); string startTime = ToHHMMSSFF(param.P.StartTime);
string endTime = BdnXmlTimeCode(param.P.EndTime); string endTime = ToHHMMSSFF(param.P.EndTime);
sb.AppendLine(string.Format(paragraphWriteFormat, numberString, startTime, endTime, Path.GetFileName(fileName), left, top)); sb.AppendLine(string.Format(paragraphWriteFormat, numberString, startTime, endTime, Path.GetFileName(fileName), left, top));
param.Saved = true; param.Saved = true;
@ -1399,8 +1404,8 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
//<Event InTC="00:00:24:07" OutTC="00:00:31:13" Forced="False"> //<Event InTC="00:00:24:07" OutTC="00:00:31:13" Forced="False">
// <Graphic Width="696" Height="111" X="612" Y="930">subtitle_exp_0001.png</Graphic> // <Graphic Width="696" Height="111" X="612" Y="930">subtitle_exp_0001.png</Graphic>
//</Event> //</Event>
sb.AppendLine("<Event InTC=\"" + BdnXmlTimeCode(param.P.StartTime) + "\" OutTC=\"" + sb.AppendLine("<Event InTC=\"" + ToHHMMSSFF(param.P.StartTime) + "\" OutTC=\"" +
BdnXmlTimeCode(param.P.EndTime) + "\" Forced=\"" + param.Forced.ToString().ToLower() + "\">"); ToHHMMSSFF(param.P.EndTime) + "\" Forced=\"" + param.Forced.ToString().ToLower() + "\">");
int x = (width - param.Bitmap.Width) / 2; int x = (width - param.Bitmap.Width) / 2;
int y = height - (param.Bitmap.Height + param.BottomMargin); int y = height - (param.Bitmap.Height + param.BottomMargin);