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

Fix issue wtih Tesseract "Stop"

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-09-20 16:42:02 +02:00
parent 5c3b77d38e
commit ac2f66e1fc
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Forms/Ocr/VobSubOcr.cs
View File

@ -5103,6 +5103,11 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
private readonly object _lockObj = new object();
public void OcrDone(int index, TesseractThreadRunner.ImageJob job)
{
if (_abort)
{
return;
}
_tesseractAsyncStrings[index] = job.Result;
Application.DoEvents();
lock (_lockObj)

40
src/Logic/Ocr/Tesseract/TesseractThreadRunner.cs
View File

@ -38,6 +38,10 @@ namespace Nikse.SubtitleEdit.Logic.Ocr.Tesseract
{
if (_abort)
{
lock (QueueLock)
{
_jobQueue.Clear();
}
return;
}
@ -62,26 +66,45 @@ namespace Nikse.SubtitleEdit.Logic.Ocr.Tesseract
EngineMode = engineMode,
Run302 = run302
};
bmp.Save(job.FileName, System.Drawing.Imaging.ImageFormat.Png);
ThreadPool.QueueUserWorkItem(DoOcr, job);
_jobQueue.Enqueue(job);
}
public void CheckQueue()
{
if (_abort || _jobQueue.Count == 0)
if (_abort)
{
return;
}
lock (QueueLock)
{
_jobQueue.Enqueue(job);
}
bmp.Save(job.FileName, System.Drawing.Imaging.ImageFormat.Png);
ThreadPool.QueueUserWorkItem(DoOcr, job);
}
public void CheckQueue()
{
lock (QueueLock)
{
if (_jobQueue.Count == 0)
{
return;
}
if (_abort)
{
_jobQueue.Clear();
return;
}
var checkTime = DateTime.UtcNow;
var job = _jobQueue.Peek();
if (job != null && job.Completed < checkTime)
{
_jobQueue.Dequeue();
if (!_abort)
if (_abort)
{
_jobQueue.Clear();
}
else
{
_callback?.Invoke(job.Index, job);
}
@ -93,6 +116,5 @@ namespace Nikse.SubtitleEdit.Logic.Ocr.Tesseract
{
_abort = true;
}
}
}