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

Improve picking best image w PGS/fading - thx peter-qgd :)

Browse Source 
Fix #5066
This commit is contained in:
Nikolaj Olsson 2021-05-30 08:30:48 +02:00
parent fd052ad16f
commit ceebc28d4b
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/libse/BluRaySup/BluRaySupParser.cs
View File

@ -844,7 +844,10 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup
}
}
// merge images that are the same (probably due to fade)
// Merge images that are the same (probably due to fade)
// First we find groups with same pixels
var removeIndices = new List<DeleteIndex>();
int deleteNo = 0;
for (int pcsIndex = pcsList.Count - 1; pcsIndex > 0; pcsIndex--)
{
var cur = pcsList[pcsIndex];
@ -879,9 +882,36 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup
if (remove)
{
prev.EndTime = cur.EndTime;
pcsList.RemoveAt(pcsIndex);
if (!removeIndices.Any(p => p.Number == deleteNo && p.Index == pcsIndex - 1))
{
removeIndices.Add(new DeleteIndex { Number = deleteNo, Index = pcsIndex - 1 });
}
if (!removeIndices.Any(p => p.Number == deleteNo && p.Index == pcsIndex))
{
removeIndices.Add(new DeleteIndex { Number = deleteNo, Index = pcsIndex });
}
}
}
}
else
{
deleteNo++;
}
}
// Use the middle image of each group with same pixels
foreach (var group in removeIndices.GroupBy(p => p.Number).OrderBy(p => p.Key))
{
var arr = group.OrderByDescending(p => p.Index).ToArray();
var middle = (int)Math.Round(group.Count() / 2.0);
var middleElement = arr[middle];
pcsList[middleElement.Index].StartTime = pcsList[arr.Last().Index].StartTime;
pcsList[middleElement.Index].EndTime = pcsList[arr.First().Index].EndTime;
foreach (var deleteIndex in group.OrderByDescending(p => p.Index))
{
if (deleteIndex != middleElement)
{
pcsList.RemoveAt(deleteIndex.Index);
}
}
}
@ -899,6 +929,12 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup
return pcsList;
}
public class DeleteIndex
{
public int Number { get; set; }
public int Index { get; set; }
}
private static bool ByteArraysEqual(byte[] b1, byte[] b2)
{
if (b1 == b2)