rough out some more AV related stuff; not done or ready yet

BizHawk.Client.EmuHawk/AVOut/AVSync.cs

@@ -0,0 +1,246 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public class AudioStretcher : AVStretcher
+	{
+		public AudioStretcher(IVideoWriter w)
+		{
+			this.w = w;
+		}
+
+		private long _soundRemainder; // audio timekeeping for video dumping
+		private short[] _samples = new short[0];
+
+		public void DumpAV(IVideoProvider v, ISoundProvider s, out short[] samples, out int samplesprovided)
+		{
+			if (!aset || !vset)
+				throw new InvalidOperationException("Must set params first!");
+
+			long nsampnum = samplerate * (long)fpsden + _soundRemainder;
+			long nsamp = nsampnum / fpsnum;
+
+			// exactly remember fractional parts of an audio sample
+			_soundRemainder = nsampnum % fpsnum;
+
+			if (nsamp * channels != _samples.Length)
+				_samples = new short[nsamp * channels];
+			samples = _samples;
+			s.GetSamples(samples);
+			samplesprovided = (int)nsamp;
+
+			w.AddFrame(v);
+			w.AddSamples(samples);
+		}
+	}
+
+	public class VideoStretcher : AVStretcher
+	{
+		public VideoStretcher(IVideoWriter w)
+		{
+			this.w = w;
+		}
+
+		private short[] _samples = new short[0];
+
+		// how many extra audio samples there are (* fpsnum)
+		private long exaudio_num;
+
+		private bool pset = false;
+		private long threshone;
+		private long threshmore;
+		private long threshtotal;
+
+		private void VerifyParams()
+		{
+			if (!aset || !vset)
+				throw new InvalidOperationException("Must set params first!");
+
+			if (!pset)
+			{
+				pset = true;
+
+				// each video frame committed counts as (fpsden * samplerate / fpsnum) audio samples
+				threshtotal = fpsden * (long)samplerate;
+
+				// blah blah blah
+				threshone = (long)(threshtotal * 0.4);
+				threshmore = (long)(threshtotal * 0.9);
+			}
+		}
+
+		public void DumpAV(IVideoProvider v, ISyncSoundProvider s, out short[] samples, out int samplesprovided)
+		{
+			VerifyParams();
+			s.GetSamples(out samples, out samplesprovided);
+			exaudio_num += samplesprovided * (long)fpsnum;
+
+			if (exaudio_num >= threshone)
+			{
+				// add frame once
+				w.AddFrame(v);
+				exaudio_num -= threshtotal;
+			}
+			else
+			{
+				Console.WriteLine("Dropped Frame!");
+			}
+			while (exaudio_num >= threshmore)
+			{
+				// add frame again!
+				w.AddFrame(v);
+				exaudio_num -= threshtotal;
+				Console.WriteLine("Dupped Frame!");
+			}
+
+			// a bit of hackey due to the fact that this api can't read a
+			// usable buffer length separately from the actual length of the buffer
+			if (samples.Length == samplesprovided * channels)
+			{
+				w.AddSamples(samples);
+			}
+			else
+			{
+				if (_samples.Length != samplesprovided * channels)
+					_samples = new short[samplesprovided * channels];
+
+				Buffer.BlockCopy(samples, 0, _samples, 0, samplesprovided * channels * sizeof(short));
+				w.AddSamples(_samples);
+			}
+		}
+	}
+
+	public abstract class AVStretcher : VWWrap, IVideoWriter
+	{
+		protected int fpsnum;
+		protected int fpsden;
+		protected bool vset = false;
+
+		protected int samplerate;
+		protected int channels;
+		protected int bits;
+		protected bool aset = false;
+
+
+		public new virtual void SetMovieParameters(int fpsnum, int fpsden)
+		{
+			if (vset)
+				throw new InvalidOperationException();
+			vset = true;
+			this.fpsnum = fpsnum;
+			this.fpsden = fpsden;
+
+			base.SetMovieParameters(fpsnum, fpsden);
+		}
+
+		public new virtual void SetAudioParameters(int sampleRate, int channels, int bits)
+		{
+			if (aset)
+				throw new InvalidOperationException();
+			if (bits != 16)
+				throw new InvalidOperationException("Only 16 bit audio is supported!");
+			aset = true;
+			this.samplerate = sampleRate;
+			this.channels = channels;
+			this.bits = bits;
+
+			base.SetAudioParameters(sampleRate, channels, bits);
+		}
+
+		public new virtual void SetFrame(int frame)
+		{
+			// this writer will never support this capability
+		}
+
+		public new virtual void AddFrame(IVideoProvider source)
+		{
+			throw new InvalidOperationException("Must call AddAV()!");
+		}
+
+		public new virtual void AddSamples(short[] samples)
+		{
+			throw new InvalidOperationException("Must call AddAV()!");
+		}
+
+	}
+
+	public abstract class VWWrap : IVideoWriter
+	{
+		protected IVideoWriter w;
+
+		public void SetVideoCodecToken(IDisposable token)
+		{
+			w.SetVideoCodecToken(token);
+		}
+
+		public void SetDefaultVideoCodecToken()
+		{
+			w.SetDefaultVideoCodecToken();
+		}
+
+		public void OpenFile(string baseName)
+		{
+			w.OpenFile(baseName);
+		}
+
+		public void CloseFile()
+		{
+			w.CloseFile();
+		}
+
+		public void SetFrame(int frame)
+		{
+			w.SetFrame(frame);
+		}
+
+		public void AddFrame(IVideoProvider source)
+		{
+			w.AddFrame(source);
+		}
+
+		public void AddSamples(short[] samples)
+		{
+			w.AddSamples(samples);
+		}
+
+		public IDisposable AcquireVideoCodecToken(System.Windows.Forms.IWin32Window hwnd)
+		{
+			return w.AcquireVideoCodecToken(hwnd);
+		}
+
+		public void SetMovieParameters(int fpsnum, int fpsden)
+		{
+			w.SetMovieParameters(fpsnum, fpsden);
+		}
+
+		public void SetVideoParameters(int width, int height)
+		{
+			w.SetVideoParameters(width, height);
+		}
+
+		public void SetAudioParameters(int sampleRate, int channels, int bits)
+		{
+			w.SetAudioParameters(sampleRate, channels, bits);
+		}
+
+		public void SetMetaData(string gameName, string authors, ulong lengthMS, ulong rerecords)
+		{
+			w.SetMetaData(gameName, authors, lengthMS, rerecords);
+		}
+
+		public string DesiredExtension()
+		{
+			return w.DesiredExtension();
+		}
+
+		public void Dispose()
+		{
+			w.Dispose();
+		}
+	}
+}

BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj

@@ -126,6 +126,7 @@
       <DependentUpon>ArchiveChooser.cs</DependentUpon>
     </Compile>
     <Compile Include="AVOut\AviWriter.cs" />
+    <Compile Include="AVOut\AVSync.cs" />
     <Compile Include="AVOut\BitmapBufferVideoProvder.cs" />
     <Compile Include="AVOut\BmpVideoProvder.cs" />
     <Compile Include="AVOut\FFmpegWriter.cs" />