From e7057e3c1509c66b71e6a0d0d0d09b0ef636442f Mon Sep 17 00:00:00 2001
From: cloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 29 Sep 2020 19:19:04 +0000
Subject: [PATCH] client: Add cap.h and move capture struct to it.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12967 d7cf8633-e32d-0410-b094-e92efae38249
---
 cap.h                          | 64 ++++++++++++++++++++++++++++++++++
 client.h                       | 55 +----------------------------
 darkplaces-sdl2-vs2017.vcxproj |  1 +
 darkplaces-sdl2-vs2019.vcxproj |  1 +
 4 files changed, 67 insertions(+), 54 deletions(-)
 create mode 100644 cap.h

diff --git a/cap.h b/cap.h
new file mode 100644
index 00000000..fe5da569
--- /dev/null
+++ b/cap.h
@@ -0,0 +1,64 @@
+#ifndef CAP_H
+#define CAP_H
+
+#ifdef CONFIG_VIDEO_CAPTURE
+
+#include "qtypes.h"
+#include "qdefs.h"
+#include "fs.h"
+#include "snd_main.h"
+
+typedef enum capturevideoformat_e
+{
+	CAPTUREVIDEOFORMAT_AVI_I420,
+	CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA
+}
+capturevideoformat_t;
+
+typedef struct capturevideostate_s
+{
+	double startrealtime;
+	double framerate;
+	int framestep;
+	int framestepframe;
+	qbool active;
+	qbool realtime;
+	qbool error;
+	int soundrate;
+	int soundchannels;
+	int frame;
+	double starttime;
+	double lastfpstime;
+	int lastfpsframe;
+	int soundsampleframe;
+	unsigned char *screenbuffer;
+	unsigned char *outbuffer;
+	char basename[MAX_QPATH];
+	int width, height;
+
+	// precomputed RGB to YUV tables
+	// converts the RGB values to YUV (see cap_avi.c for how to use them)
+	short rgbtoyuvscaletable[3][3][256];
+	unsigned char yuvnormalizetable[3][256];
+
+	// precomputed gamma ramp (only needed if the capturevideo module uses RGB output)
+	// note: to map from these values to RGB24, you have to multiply by 255.0/65535.0, then add 0.5, then cast to integer
+	unsigned short vidramp[256 * 3];
+
+	// stuff to be filled in by the video format module
+	capturevideoformat_t format;
+	const char *formatextension;
+	qfile_t *videofile;
+		// always use this:
+		//   cls.capturevideo.videofile = FS_OpenRealFile(va(vabuf, sizeof(vabuf), "%s.%s", cls.capturevideo.basename, cls.capturevideo.formatextension), "wb", false);
+	void (*endvideo) (void);
+	void (*videoframes) (int num);
+	void (*soundframe) (const portable_sampleframe_t *paintbuffer, size_t length);
+
+	// format specific data
+	void *formatspecific;
+}
+capturevideostate_t;
+#endif
+
+#endif
diff --git a/client.h b/client.h
index 8f361356..d1673500 100644
--- a/client.h
+++ b/client.h
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "matrixlib.h"
 #include "snd_main.h"
 #include "view.h"
+#include "cap.h"
 
 // NOTE: r_stat_name[] must match this indexing
 typedef enum r_stat_e
@@ -739,60 +740,6 @@ typedef enum qw_downloadtype_e
 }
 qw_downloadtype_t;
 
-#ifdef CONFIG_VIDEO_CAPTURE
-typedef enum capturevideoformat_e
-{
-	CAPTUREVIDEOFORMAT_AVI_I420,
-	CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA
-}
-capturevideoformat_t;
-
-typedef struct capturevideostate_s
-{
-	double startrealtime;
-	double framerate;
-	int framestep;
-	int framestepframe;
-	qbool active;
-	qbool realtime;
-	qbool error;
-	int soundrate;
-	int soundchannels;
-	int frame;
-	double starttime;
-	double lastfpstime;
-	int lastfpsframe;
-	int soundsampleframe;
-	unsigned char *screenbuffer;
-	unsigned char *outbuffer;
-	char basename[MAX_QPATH];
-	int width, height;
-
-	// precomputed RGB to YUV tables
-	// converts the RGB values to YUV (see cap_avi.c for how to use them)
-	short rgbtoyuvscaletable[3][3][256];
-	unsigned char yuvnormalizetable[3][256];
-
-	// precomputed gamma ramp (only needed if the capturevideo module uses RGB output)
-	// note: to map from these values to RGB24, you have to multiply by 255.0/65535.0, then add 0.5, then cast to integer
-	unsigned short vidramp[256 * 3];
-
-	// stuff to be filled in by the video format module
-	capturevideoformat_t format;
-	const char *formatextension;
-	qfile_t *videofile;
-		// always use this:
-		//   cls.capturevideo.videofile = FS_OpenRealFile(va(vabuf, sizeof(vabuf), "%s.%s", cls.capturevideo.basename, cls.capturevideo.formatextension), "wb", false);
-	void (*endvideo) (void);
-	void (*videoframes) (int num);
-	void (*soundframe) (const portable_sampleframe_t *paintbuffer, size_t length);
-
-	// format specific data
-	void *formatspecific;
-}
-capturevideostate_t;
-#endif
-
 #define CL_MAX_DOWNLOADACKS 4
 
 typedef struct cl_downloadack_s
diff --git a/darkplaces-sdl2-vs2017.vcxproj b/darkplaces-sdl2-vs2017.vcxproj
index b29dd399..9e639574 100644
--- a/darkplaces-sdl2-vs2017.vcxproj
+++ b/darkplaces-sdl2-vs2017.vcxproj
@@ -315,6 +315,7 @@
   <ItemGroup>
     <ClInclude Include="bih.h" />
     <ClInclude Include="bspfile.h" />
+    <ClInclude Include="cap.h" />
     <ClInclude Include="cap_avi.h" />
     <ClInclude Include="cap_ogg.h" />
     <ClInclude Include="cdaudio.h" />
diff --git a/darkplaces-sdl2-vs2019.vcxproj b/darkplaces-sdl2-vs2019.vcxproj
index 88960827..0c89882b 100644
--- a/darkplaces-sdl2-vs2019.vcxproj
+++ b/darkplaces-sdl2-vs2019.vcxproj
@@ -316,6 +316,7 @@
   <ItemGroup>
     <ClInclude Include="bih.h" />
     <ClInclude Include="bspfile.h" />
+    <ClInclude Include="cap.h" />
     <ClInclude Include="cap_avi.h" />
     <ClInclude Include="cap_ogg.h" />
     <ClInclude Include="cdaudio.h" />
-- 
2.39.2