ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AviWriter.cs : don't mix unmanaged allocation types

This commit is contained in:
goyuken 2012-08-03 22:02:04 +00:00
parent 49daf880fb
commit b14154b30c
1 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
BizHawk.MultiClient/AVOut/AviWriter.cs
View File

@ -328,11 +328,18 @@ namespace BizHawk.MultiClient
private CodecToken() { } private CodecToken() { }
public Win32.AVICOMPRESSOPTIONS comprOptions; public Win32.AVICOMPRESSOPTIONS comprOptions;
public string codec; public string codec;
/// <summary>
/// true if data was allocated by AviSaveOptions and should be freed by AVISaveOptionsFree
/// </summary>
bool allocated = false; bool allocated = false;
/// <summary>
/// true if data was allocated by AllocHGlobal and should be freed by FreeHGlobal
/// </summary>
bool marshaled = false;
public void Dispose() public void Dispose()
{ {
if (!allocated) return; if (allocated)
{
IntPtr[] infPtrs = new IntPtr[1]; IntPtr[] infPtrs = new IntPtr[1];
IntPtr mem; IntPtr mem;
@ -350,6 +357,21 @@ namespace BizHawk.MultiClient
comprOptions = new Win32.AVICOMPRESSOPTIONS(); comprOptions = new Win32.AVICOMPRESSOPTIONS();
allocated = false; allocated = false;
} }
if (marshaled)
{
IntPtr p;
p = (IntPtr)comprOptions.lpFormat;
if (p != IntPtr.Zero)
Marshal.FreeHGlobal(p);
p = (IntPtr)comprOptions.lpParms;
if (p != IntPtr.Zero)
Marshal.FreeHGlobal(p);
codec = null;
comprOptions = new Win32.AVICOMPRESSOPTIONS();
marshaled = false;
}
}
byte[] SerializeToByteArray() byte[] SerializeToByteArray()
{ {
@ -437,7 +459,12 @@ namespace BizHawk.MultiClient
} }
else else
comprOptions.lpParms = (int)IntPtr.Zero; comprOptions.lpParms = (int)IntPtr.Zero;
return CodecToken.TakePossession(comprOptions);
CodecToken ret = new CodecToken();
ret.marshaled = true;
ret.comprOptions = comprOptions;
ret.codec = Win32.decode_mmioFOURCC(comprOptions.fccHandler);
return ret;
} }
public string Serialize() public string Serialize()