Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed unneeded mutex from ffmpeg decoder

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-03-07 18:30:19 +01:00
1 parent 7381d3de20
commit ecb981e237
1 file changed
+14 -24
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs
+14 -24
View File
@@ -260,7 +260,6 @@ namespace Vocaluxe.Lib.Video
AutoResetEvent EventDecode = new AutoResetEvent(false); AutoResetEvent EventDecode = new AutoResetEvent(false);
SFrameBuffer[] _FrameBuffer = new SFrameBuffer[5]; SFrameBuffer[] _FrameBuffer = new SFrameBuffer[5];
Object MutexFramebuffer = new Object(); Object MutexFramebuffer = new Object();
Object MutexFrame = new Object();
Object MutexSyncSignals = new Object(); Object MutexSyncSignals = new Object();
public Decoder() public Decoder()
@@ -595,17 +594,13 @@ namespace Vocaluxe.Lib.Video
if (!_BeforeLoop && (!DropFrame || FrameFinished != 0)) if (!_BeforeLoop && (!DropFrame || FrameFinished != 0))
{ {
lock (MutexFrame) try
{ {
try FrameFinished = CAcinerella.ac_get_frame(_instance, _videodecoder);
{ }
FrameFinished = CAcinerella.ac_get_frame(_instance, _videodecoder); catch (Exception)
} {
catch (Exception) CLog.LogError("Error AcGetFrame " + _FileName);
{
CLog.LogError("Error AcGetFrame " + _FileName);
}
} }
} }
@@ -673,23 +668,18 @@ namespace Vocaluxe.Lib.Video
_waiting = true; _waiting = true;
else else
{ {
TAc_decoder Videodecoder = (TAc_decoder)Marshal.PtrToStructure(_videodecoder, typeof(TAc_decoder));
lock (MutexFrame) _FrameBuffer[num].time = _VideoTime;
_VideoTime = (float)Videodecoder.timecode;
if (Videodecoder.buffer != IntPtr.Zero)
{ {
TAc_decoder Videodecoder = (TAc_decoder)Marshal.PtrToStructure(_videodecoder, typeof(TAc_decoder)); Marshal.Copy(Videodecoder.buffer, _FrameBuffer[num].data, 0, _Width * _Height * 4);
_FrameBuffer[num].time = _VideoTime;
_VideoTime = (float)Videodecoder.timecode;
if (Videodecoder.buffer != IntPtr.Zero)
{
Marshal.Copy(Videodecoder.buffer, _FrameBuffer[num].data, 0, _Width * _Height * 4);
_FrameBuffer[num].displayed = false; _FrameBuffer[num].displayed = false;
}
} }
_waiting = false; _waiting = false;
} }
} }