Separate Video/VideoPlayer from Theora implementation and allow new codecs to be registered

Author: kiddkaffeine

FNA.Core.csproj

@@ -328,8 +328,10 @@
 		<Compile Include="src\Media\VideoSoundtrackType.cs" />
 		<Compile Include="src\Media\VisualizationData.cs" />
 		<Compile Include="src\Media\Xiph\BaseYUVPlayer.cs" />
+		<Compile Include="src\Media\Xiph\IVideoPlayerImpl.cs" />
 		<Compile Include="src\Media\Xiph\Video.cs" />
 		<Compile Include="src\Media\Xiph\VideoPlayer.cs" />
+		<Compile Include="src\Media\Xiph\VideoPlayerTheora.cs" />
 		<Compile Include="src\NamespaceDocs.cs" />
 		<Compile Include="src\Plane.cs" />
 		<Compile Include="src\PlaneIntersectionType.cs" />

FNA.NetFramework.csproj

@@ -329,8 +329,10 @@
 		<Compile Include="src\Media\VideoSoundtrackType.cs" />
 		<Compile Include="src\Media\VisualizationData.cs" />
 		<Compile Include="src\Media\Xiph\BaseYUVPlayer.cs" />
+		<Compile Include="src\Media\Xiph\IVideoPlayerImpl.cs" />
 		<Compile Include="src\Media\Xiph\Video.cs" />
 		<Compile Include="src\Media\Xiph\VideoPlayer.cs" />
+		<Compile Include="src\Media\Xiph\VideoPlayerTheora.cs" />
 		<Compile Include="src\NamespaceDocs.cs" />
 		<Compile Include="src\Plane.cs" />
 		<Compile Include="src\PlaneIntersectionType.cs" />

FNA.NetStandard.csproj

@@ -327,8 +327,10 @@
 		<Compile Include="src\Media\VideoSoundtrackType.cs" />
 		<Compile Include="src\Media\VisualizationData.cs" />
 		<Compile Include="src\Media\Xiph\BaseYUVPlayer.cs" />
+		<Compile Include="src\Media\Xiph\IVideoPlayerImpl.cs" />
 		<Compile Include="src\Media\Xiph\Video.cs" />
 		<Compile Include="src\Media\Xiph\VideoPlayer.cs" />
+		<Compile Include="src\Media\Xiph\VideoPlayerTheora.cs" />
 		<Compile Include="src\NamespaceDocs.cs" />
 		<Compile Include="src\Plane.cs" />
 		<Compile Include="src\PlaneIntersectionType.cs" />

FNA.csproj

@@ -399,8 +399,10 @@
     <Compile Include="src\Media\VideoSoundtrackType.cs" />
     <Compile Include="src\Media\VisualizationData.cs" />
     <Compile Include="src\Media\Xiph\BaseYUVPlayer.cs" />
+    <Compile Include="src\Media\Xiph\IVideoPlayerImpl.cs" />
     <Compile Include="src\Media\Xiph\Video.cs" />
     <Compile Include="src\Media\Xiph\VideoPlayer.cs" />
+    <Compile Include="src\Media\Xiph\VideoPlayerTheora.cs" />
     <Compile Include="src\NamespaceDocs.cs" />
     <Compile Include="src\Plane.cs" />
     <Compile Include="src\PlaneIntersectionType.cs" />

Makefile

@@ -311,9 +311,11 @@ SRC = \
 	src/Media/SongCollection.cs \
 	src/Media/VideoSoundtrackType.cs \
 	src/Media/VisualizationData.cs \
+	src/Media/Xiph/IVideoPlayerImpl.cs \
 	src/Media/Xiph/BaseYUVPlayer.cs \
 	src/Media/Xiph/Video.cs \
 	src/Media/Xiph/VideoPlayer.cs \
+	src/Media/Xiph/VideoPlayerTheora.cs \
 	src/NamespaceDocs.cs \
 	src/Plane.cs \
 	src/PlaneIntersectionType.cs \

src/Media/Xiph/IVideoPlayerImpl.cs

@@ -0,0 +1,68 @@
+#region License
+/* FNA - XNA4 Reimplementation for Desktop Platforms
+ * Copyright 2009-2024 Ethan Lee and the MonoGame Team
+ *
+ * Released under the Microsoft Public License.
+ * See LICENSE for details.
+ */
+#endregion
+
+#region Using Statements
+using System;
+using Microsoft.Xna.Framework.Graphics;
+#endregion
+
+namespace Microsoft.Xna.Framework.Media
+{
+	public interface IVideoPlayerImpl : IDisposable
+	{
+		#region Public Member Data: XNA VideoPlayer Implementation
+
+		bool IsLooped
+		{
+			get;
+			set;
+		}
+
+		bool IsMuted
+		{
+			get;
+			set;
+		}
+
+		TimeSpan PlayPosition
+		{
+			get;
+		}
+
+		MediaState State
+		{
+			get;
+		}
+
+		Video Video
+		{
+			get;
+		}
+
+		float Volume
+		{
+			get;
+			set;
+		}
+
+		#endregion
+
+		#region Public Methods: XNA VideoPlayer Implementation
+
+		Texture2D GetTexture();
+		void Play(Video video);
+		void Stop();
+		void Pause();
+		void Resume();
+		void SetAudioTrackEXT(int track);
+		void SetVideoTrackEXT(int track);
+
+		#endregion
+	}
+}

src/Media/Xiph/Video.cs

@@ -9,8 +9,8 @@
 
 #region Using Statements
 using System;
+using System.Collections.Generic;
 using System.IO;
-
 using Microsoft.Xna.Framework.Graphics;
 #endregion
 
@@ -61,6 +61,12 @@ internal GraphicsDevice GraphicsDevice
 			private set;
 		}
 
+		internal String Codec
+		{
+			get;
+			private set;
+		}
+
 		#endregion
 
 		#region Internal Variables
@@ -86,24 +92,11 @@ internal Video(string fileName, GraphicsDevice device)
 				throw new FileNotFoundException(fileName);
 			}
 
-			IntPtr theora;
-			int width;
-			int height;
-			double fps;
-			Theorafile.th_pixel_fmt fmt;
-			Theorafile.tf_fopen(fileName, out theora);
-			Theorafile.tf_videoinfo(
-				theora,
-				out width,
-				out height,
-				out fps,
-				out fmt
-			);
-			Theorafile.tf_close(ref theora);
-
-			Width = width;
-			Height = height;
-			FramesPerSecond = (float) fps;
+			Codec = GuessCodec(fileName);
+			VideoPlayer.VideoInfo info = VideoPlayer.codecInfoReaders[Codec](fileName);
+			Width = info.width;
+			Height = info.height;
+			FramesPerSecond = (float) info.fps;
 
 			// FIXME: This is a part of the Duration hack!
 			Duration = TimeSpan.MaxValue;
@@ -118,6 +111,18 @@ internal Video(
 			int height,
 			float framesPerSecond,
 			VideoSoundtrackType soundtrackType
+		) : this(fileName, device, durationMS, width, height, framesPerSecond, soundtrackType, GuessCodec(fileName)) {
+		}
+
+		internal Video(
+			string fileName,
+			GraphicsDevice device,
+			int durationMS,
+			int width,
+			int height,
+			float framesPerSecond,
+			VideoSoundtrackType soundtrackType,
+			string codec
 		) {
 			handle = fileName;
 			GraphicsDevice = device;
@@ -130,6 +135,7 @@ VideoSoundtrackType soundtrackType
 			Width = width;
 			Height = height;
 			FramesPerSecond = framesPerSecond;
+			Codec = codec;
 
 			// FIXME: Oh, hey! I wish we had this info in Theora!
 			Duration = TimeSpan.FromMilliseconds(durationMS);
@@ -141,7 +147,7 @@ VideoSoundtrackType soundtrackType
 		#endregion
 
 		#region Public Extensions
-		
+
 		public static Video FromUriEXT(Uri uri, GraphicsDevice graphicsDevice)
 		{
 			string path;
@@ -169,7 +175,7 @@ public static Video FromUriEXT(Uri uri, GraphicsDevice graphicsDevice)
 
 		internal int audioTrack = -1;
 		internal int videoTrack = -1;
-		internal VideoPlayer parent;
+		internal IVideoPlayerImpl parent;
 
 		public void SetAudioTrackEXT(int track)
 		{
@@ -190,5 +196,24 @@ public void SetVideoTrackEXT(int track)
 		}
 
 		#endregion
+
+		#region Private Static Methods
+
+		private static string GuessCodec(String filename)
+		{
+			filename = filename.ToLower();
+			foreach (KeyValuePair<string, string> kvp in VideoPlayer.codecExtensions)
+			{
+				if (filename.EndsWith(kvp.Key))
+				{
+					return kvp.Value;
+				}
+			}
+
+			// For backwards compatibility
+			return "Theora";
+		}
+
+		#endregion
 	}
 }