Pre-allocate memory for processed image bytes too

Pulsus/FFmpeg/FFmpegContext.cs

@@ -69,7 +69,6 @@ public int audioSamplesTotal
 
 		Stream stream;
 		string path;
-		byte[] managedBuffer;
 
 		int decodedFrames;
 
@@ -484,20 +483,6 @@ private bool ConvertFrame()
 			return true;
 		}
 
-		public byte[] GetFrameData()
-		{
-			int bufferSize = 0;
-			sbyte* buffer = GetFrameBuffer(out bufferSize);
-
-			// allocate and copy the data to managed memory
-			if (managedBuffer == null || managedBuffer.Length != bufferSize)
-				managedBuffer = new byte[bufferSize];
-
-			Marshal.Copy((IntPtr)buffer, managedBuffer, 0, bufferSize);
-
-			return managedBuffer;
-		}
-
 		public int GetFrameData(ref byte[] bytes, int startIndex)
 		{
 			int bufferSize = 0;

Pulsus/FFmpeg/FFmpegHelper.cs

@@ -83,28 +83,22 @@ public static void Init()
 
 		public static byte[] ImageFromFile(string path, out int width, out int height, out int bytesPerPixel)
 		{
-			FFmpegVideo video = new FFmpegVideo();
-			width = 0;
-			height = 0;
-			bytesPerPixel = 0;
-
-			video.Load(path);
-
-			List<byte> bytes = new List<byte>();
-			video.OnNextFrame += (data) => bytes.AddRange(data);
-
-			if (video.isVideo)
-				video.ReadNextFrame();
-			else
-				video.ReadFrames();
-
-			width = video.width;
-			height = video.height;
-			bytesPerPixel = 4;
+			using (FFmpegVideo video = new FFmpegVideo())
+			{
+				video.Load(path);
 
-			video.Dispose();
+				width = video.width;
+				height = video.height;
+				bytesPerPixel = 4;
 
-			return bytes.ToArray();
+				if (video.isVideo)
+				{
+					video.ReadNextFrame();
+					return video.imageBytes;
+				}
+				else
+					return video.ReadFrames();
+			}
 		}
 
 		public static byte[] SoundFromFile(string path, out int sampleRate, out int channels, out ushort sampleFormatSDL)

Pulsus/FFmpeg/FFmpegVideo.cs

@@ -18,13 +18,16 @@ public class FFmpegVideo : IDisposable
 
 		public OnNextFrameDelegate OnNextFrame;
 
+		private byte[] bytes = null;
+		public byte[] imageBytes { get { return bytes; } }
+
 		public bool isVideo { get { return length > 0.0; } }
 
-		string path;
-		double nextFramePts;
-		FFmpegContext ffContext;
-		Thread loadThread;
-		AutoResetEvent nextFrameEvent;
+		private string path;
+		private double nextFramePts;
+		private FFmpegContext ffContext;
+		private Thread loadThread;
+		private AutoResetEvent nextFrameEvent;
 
 		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 		public delegate void OnNextFrameDelegate(byte[] data);
@@ -80,6 +83,8 @@ private void Load(Stream stream)
 
 			// setup resamplers and other format converters if needed
 			ffContext.ConvertToFormat(AVPixelFormat.AV_PIX_FMT_BGRA);
+
+			bytes = new byte[width * height * 4];
 		}
 
 		public void Update(double deltaTime)
@@ -91,19 +96,23 @@ public void Update(double deltaTime)
 
 			if (currentTime >= nextFramePts && presentedFrames < decodedFrames)
 			{
-				OnNextFrame(ffContext.GetFrameData());
+				ffContext.GetFrameData(ref bytes, 0);
+				if (OnNextFrame != null)
+					OnNextFrame(bytes);
+
 				presentedFrames++;
 				nextFrameEvent.Set();
 			}
 		}
 
-		public void ReadFrames()
+		public byte[] ReadFrames()
 		{
-			while (ffContext.ReadFrame())
-			{
-				OnNextFrame(ffContext.GetFrameData());
-				presentedFrames++;
-			}
+			if (!ffContext.ReadFrame())
+				return null;
+
+			ffContext.GetFrameData(ref bytes, 0);	
+			presentedFrames++;
+			return bytes;
 		}
 
 		public void Start()

Pulsus/Gameplay/BGAObject.cs

@@ -1,7 +1,7 @@
-using Pulsus.FFmpeg;
-using Pulsus.Graphics;
+using System;
 using System.IO;
-using System;
+using Pulsus.FFmpeg;
+using Pulsus.Graphics;
 
 namespace Pulsus.Gameplay
 {
@@ -78,7 +78,7 @@ public bool Load(string basePath = "")
 			{
 				video.Load(fullPath);
 				texture = new Texture2D(video.width, video.height);
-				video.OnNextFrame += texture.SetData;
+				video.OnNextFrame += (data) => texture.SetData(data);
 			}
 			catch when (Path.GetExtension(filename).ToLower() == ".lua")
 			{
@@ -93,7 +93,7 @@ public bool Load(string basePath = "")
 				if (video != null)
 					video.Dispose();
 				video = null;
-				
+
 				return false;
 			}
 
@@ -105,7 +105,7 @@ public bool Load(string basePath = "")
 			else
 			{
 				// fully load image files
-				video.ReadFrames();
+				video.OnNextFrame(video.ReadFrames());
 				video.Dispose();
 				video = null;
 			}