Replaced virtualdub includes with new version

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1689 10f7b99b-c216-0410-bff0-8a66a9350fd8

6 files changed, 0 insertions, 462 deletions

diff --git a/include/virtualdub/Filter.h b/include/virtualdub/Filter.h
deleted file mode 100644
index 16215034d..000000000
--- a/include/virtualdub/Filter.h
+++ /dev/null
@@ -1,167 +0,0 @@
-#ifndef f_FILTER_H

-#define f_FILTER_H

-

-#include <windows.h>

-

-// This is really dumb, but necessary to support VTbls in C++.

-

-struct FilterVTbls {

-	void *pvtblVBitmap;

-};

-

-#ifdef VDEXT_MAIN

-struct FilterVTbls g_vtbls;

-#elif defined(VDEXT_NOTMAIN)

-extern struct FilterVTbls g_vtbls;

-#endif

-

-#define INITIALIZE_VTBLS		ff->InitVTables(&g_vtbls)

-

-#include "VBitmap.h"

-

-//////////////////

-

-struct CScriptObject;

-

-//////////////////

-

-enum {

-	FILTERPARAM_SWAP_BUFFERS	= 0x00000001L,

-	FILTERPARAM_NEEDS_LAST		= 0x00000002L,

-};

-

-///////////////////

-

-class VFBitmap;

-class FilterActivation;

-struct FilterFunctions;

-

-typedef int  (*FilterInitProc     )(FilterActivation *fa, const FilterFunctions *ff);

-typedef void (*FilterDeinitProc   )(FilterActivation *fa, const FilterFunctions *ff);

-typedef int  (*FilterRunProc      )(const FilterActivation *fa, const FilterFunctions *ff);

-typedef long (*FilterParamProc    )(FilterActivation *fa, const FilterFunctions *ff);

-typedef int  (*FilterConfigProc   )(FilterActivation *fa, const FilterFunctions *ff, HWND hWnd);

-typedef int  (*FilterConfig2Proc  )(FilterActivation *fa, const FilterFunctions *ff, HWND hWnd);

-typedef void (*FilterStringProc   )(const FilterActivation *fa, const FilterFunctions *ff, char *buf);

-typedef int  (*FilterStartProc    )(FilterActivation *fa, const FilterFunctions *ff);

-typedef int  (*FilterEndProc      )(FilterActivation *fa, const FilterFunctions *ff);

-typedef bool (*FilterScriptStrProc)(FilterActivation *fa, const FilterFunctions *, char *, int);

-

-typedef int (__cdecl *FilterModuleInitProc)(struct FilterModule *fm, const FilterFunctions *ff, int& vdfd_ver, int& vdfd_compat);

-typedef void (__cdecl *FilterModuleDeinitProc)(struct FilterModule *fm, const FilterFunctions *ff);

-

-//////////

-

-typedef void (__cdecl *FilterPreviewButtonCallback)(bool fNewState, void *pData);

-typedef void (__cdecl *FilterPreviewSampleCallback)(VFBitmap *, long lFrame, long lCount, void *pData);

-

-class IFilterPreview {

-public:

-	virtual void SetButtonCallback(FilterPreviewButtonCallback, void *)=0;

-	virtual void SetSampleCallback(FilterPreviewSampleCallback, void *)=0;

-

-	virtual bool isPreviewEnabled()=0;

-	virtual void Toggle(HWND)=0;

-	virtual void Display(HWND, bool)=0;

-	virtual void RedoFrame()=0;

-	virtual void RedoSystem()=0;

-	virtual void UndoSystem()=0;

-	virtual void InitButton(HWND)=0;

-	virtual void Close()=0;

-	virtual bool SampleCurrentFrame()=0;

-	virtual long SampleFrames()=0;

-};

-

-//////////

-

-#define VIRTUALDUB_FILTERDEF_VERSION		(4)

-#define	VIRTUALDUB_FILTERDEF_COMPATIBLE		(4)

-

-// v3: added lCurrentSourceFrame to FrameStateInfo

-// v4: lots of additions (VirtualDub 1.2)

-

-typedef struct FilterModule {

-	struct FilterModule *next, *prev;

-	HINSTANCE				hInstModule;

-	FilterModuleInitProc	initProc;

-	FilterModuleDeinitProc	deinitProc;

-} FilterModule;

-

-typedef struct FilterDefinition {

-

-	struct FilterDefinition *next, *prev;

-	FilterModule *module;

-

-	char *				name;

-	char *				desc;

-	char *				maker;

-	void *				private_data;

-	int					inst_data_size;

-

-	FilterInitProc		initProc;

-	FilterDeinitProc	deinitProc;

-	FilterRunProc		runProc;

-	FilterParamProc		paramProc;

-	FilterConfigProc	configProc;

-	FilterStringProc	stringProc;

-	FilterStartProc		startProc;

-	FilterEndProc		endProc;

-

-	CScriptObject	*script_obj;

-

-	FilterScriptStrProc	fssProc;

-

-} FilterDefinition;

-

-//////////

-

-// FilterStateInfo: contains dynamic info about file being processed

-

-class FilterStateInfo {

-public:

-	long	lCurrentFrame;				// current output frame

-	long	lMicrosecsPerFrame;			// microseconds per output frame

-	long	lCurrentSourceFrame;		// current source frame

-	long	lMicrosecsPerSrcFrame;		// microseconds per source frame

-	long	lSourceFrameMS;				// source frame timestamp

-	long	lDestFrameMS;				// output frame timestamp

-};

-

-// VFBitmap: VBitmap extended to hold filter-specific information

-

-class VFBitmap : public VBitmap {

-public:

-	enum {

-		NEEDS_HDC		= 0x00000001L,

-	};

-

-	DWORD	dwFlags;

-	HDC		hdc;

-};

-

-// FilterActivation: This is what is actually passed to filters at runtime.

-

-class FilterActivation {

-public:

-	FilterDefinition *filter;

-	void *filter_data;

-	VFBitmap &dst, &src;

-	VFBitmap *rsrc, *last;

-	unsigned long x1, y1, x2, y2;

-

-	FilterStateInfo *pfsi;

-	IFilterPreview *ifp;

-

-	FilterActivation(VFBitmap& _dst, VFBitmap& _src) : dst(_dst), src(_src) {}

-	FilterActivation(const FilterActivation& fa, VFBitmap& _dst, VFBitmap& _src);

-};

-

-struct FilterFunctions {

-	FilterDefinition *(*addFilter)(FilterModule *, FilterDefinition *, int fd_len);

-	void (*removeFilter)(FilterDefinition *);

-	bool (*isFPUEnabled)();

-	bool (*isMMXEnabled)();

-	void (*InitVTables)(struct FilterVTbls *);

-};

-

-#endif

diff --git a/include/virtualdub/ScriptError.h b/include/virtualdub/ScriptError.h
deleted file mode 100644
index af378e3b3..000000000
--- a/include/virtualdub/ScriptError.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef f_SYLIA_SCRIPTERROR_H

-#define f_SYLIA_SCRIPTERROR_H

-

-class CScriptError {

-public:

-	int err;

-

-	enum {

-		PARSE_ERROR=1,

-		SEMICOLON_EXPECTED,

-		IDENTIFIER_EXPECTED,

-

-		TYPE_INT_REQUIRED,

-		TYPE_ARRAY_REQUIRED,

-		TYPE_FUNCTION_REQUIRED,

-		TYPE_OBJECT_REQUIRED,

-

-		OBJECT_MEMBER_NAME_REQUIRED,

-		FUNCCALLEND_EXPECTED,

-		TOO_MANY_PARAMS,

-		DIVIDE_BY_ZERO,

-		VAR_NOT_FOUND,

-		MEMBER_NOT_FOUND,

-		OVERLOADED_FUNCTION_NOT_FOUND,

-		IDENT_TOO_LONG,

-		OPERATOR_EXPECTED,

-		CLOSEPARENS_EXPECTED,

-		CLOSEBRACKET_EXPECTED,

-

-		VAR_UNDEFINED,

-

-		OUT_OF_STRING_SPACE,

-		OUT_OF_MEMORY,

-		INTERNAL_ERROR,

-		EXTERNAL_ERROR,

-

-		FCALL_OUT_OF_RANGE,

-		FCALL_INVALID_PTYPE,

-		FCALL_UNKNOWN_STR,

-	};

-

-	CScriptError(int err_num) : err(err_num) { }

-

-	int getErr() { return err; }

-};

-

-#define SCRIPT_ERROR(x)			throw CScriptError(CScriptError::##x)

-

-extern "C" __declspec(dllexport) char * __stdcall TranslateScriptError(int);

-

-char inline *TranslateScriptError(CScriptError cse) {

-	return TranslateScriptError(cse.getErr());

-}

-

-#endif

diff --git a/include/virtualdub/ScriptInterpreter.h b/include/virtualdub/ScriptInterpreter.h
deleted file mode 100644
index 2c4b4ed07..000000000
--- a/include/virtualdub/ScriptInterpreter.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef f_SYLIA_SCRIPTINTERPRETER_H

-#define f_SYLIA_SCRIPTINTERPRETER_H

-

-class CScriptValue;

-class CScriptError;

-struct CScriptObject;

-class IScriptInterpreter;

-

-typedef CScriptValue (*ScriptRootHandlerPtr)(IScriptInterpreter *,char *,void *);

-

-class IScriptInterpreter {

-public:

-	virtual	void Destroy()										=0;

-

-	virtual void SetRootHandler(ScriptRootHandlerPtr, void *)	=0;

-

-	virtual void ExecuteLine(char *s)							=0;

-

-	virtual void ScriptError(int e)								=0;

-	virtual char* TranslateScriptError(CScriptError& cse)		=0;

-	virtual char** AllocTempString(long l)						=0;

-

-	virtual CScriptValue LookupObjectMember(CScriptObject *obj, void *, char *szIdent) = 0;

-};

-

-extern "C" __declspec(dllexport) IScriptInterpreter * __stdcall CreateScriptInterpreter();

-

-#define GETPROC_CREATESCRIPTINTERPRETER(hInst)	((IScriptInterpreter *(__stdcall *)())GetProcAddress(hInst, "_CreateScriptInterpreter@0"))

-

-#define EXT_SCRIPT_ERROR(x)	(isi->ScriptError((CScriptError::x)))

-

-#endif

diff --git a/include/virtualdub/ScriptValue.h b/include/virtualdub/ScriptValue.h
deleted file mode 100644
index 730f058be..000000000
--- a/include/virtualdub/ScriptValue.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef f_SYLIA_SCRIPTVALUE_H

-#define f_SYLIA_SCRIPTVALUE_H

-

-class CScriptArray;

-struct CScriptObject;

-class CScriptValue;

-class IScriptInterpreter;

-class VariableTableEntry;

-

-typedef CScriptValue (*ScriptObjectLookupFuncPtr)(IScriptInterpreter *, CScriptObject *, void *lpVoid, char *szName);

-typedef CScriptValue (*ScriptFunctionPtr)(IScriptInterpreter *, void *, CScriptValue *, int);

-typedef void (*ScriptVoidFunctionPtr)(IScriptInterpreter *, void *, CScriptValue *, int);

-typedef int (*ScriptIntFunctionPtr)(IScriptInterpreter *, void *, CScriptValue *, int);

-typedef CScriptValue (*ScriptArrayFunctionPtr)(IScriptInterpreter *, void *, int);

-

-typedef struct ScriptFunctionDef {

-	ScriptFunctionPtr func_ptr;

-	char *name;

-	char *arg_list;

-} ScriptFunctionDef;

-

-typedef struct ScriptObjectDef {

-	char *name;

-	CScriptObject *obj;

-} ScriptObjectDef;

-

-typedef struct CScriptObject {

-	ScriptObjectLookupFuncPtr Lookup;

-	ScriptFunctionDef		*func_list;

-	ScriptObjectDef			*obj_list;

-} CScriptObject;

-

-class CScriptValue {

-public:

-	enum { T_VOID, T_INT, T_PINT, T_STR, T_ARRAY, T_OBJECT, T_FNAME, T_FUNCTION, T_VARLV } type;

-	CScriptObject *thisPtr;

-	union {

-		int i;

-		int *pi;

-		char **s;

-		ScriptArrayFunctionPtr ary;

-		CScriptObject *obj;

-		ScriptFunctionPtr func;

-		ScriptFunctionDef *fname;

-		VariableTableEntry *vte;

-	} u;

-	void *lpVoid;

-

-	CScriptValue()						{ type = T_VOID; }

-	CScriptValue(int i)					{ type = T_INT;			u.i = i; }

-	CScriptValue(int *pi)				{ type = T_PINT;		u.pi = pi; }

-	CScriptValue(char **s)				{ type = T_STR;			u.s = s; }

-	CScriptValue(CScriptObject *obj)	{ type = T_OBJECT;		u.obj = obj; }

-	CScriptValue(CScriptObject *_thisPtr, ScriptArrayFunctionPtr csa) {

-		type = T_ARRAY;

-		u.ary = csa;

-		thisPtr = _thisPtr;

-	}

-	CScriptValue(CScriptObject *_thisPtr, ScriptFunctionDef *sfd)	{

-		type = T_FNAME;

-		u.fname = sfd;

-		thisPtr = _thisPtr;

-	}

-	CScriptValue(CScriptObject *_thisPtr, ScriptFunctionPtr fn)	{

-		type = T_FUNCTION;

-		u.func = fn;

-		thisPtr = _thisPtr;

-	}

-	CScriptValue(VariableTableEntry *vte) { type = T_VARLV;		u.vte = vte; }

-

-	bool isVoid()			{ return type == T_VOID; }

-	bool isInt()			{ return type == T_INT; }

-	bool isString()			{ return type == T_STR; }

-	bool isArray()			{ return type == T_ARRAY; }

-	bool isObject()			{ return type == T_OBJECT; }

-	bool isFName()			{ return type == T_FNAME; }

-	bool isFunction()		{ return type == T_FUNCTION; }

-	bool isVarLV()			{ return type == T_VARLV; }

-

-	int					asInt()			{ return u.i; }

-	char **				asString()		{ return u.s; }

-	ScriptArrayFunctionPtr		asArray()		{ return u.ary; }

-	CScriptObject *		asObject()		{ return u.obj; }

-	ScriptFunctionPtr	asFunction()	{ return u.func; }

-	VariableTableEntry*	asVarLV()		{ return u.vte; }

-};

-

-#endif

diff --git a/include/virtualdub/VBitmap.h b/include/virtualdub/VBitmap.h
deleted file mode 100644
index c18e553dc..000000000
--- a/include/virtualdub/VBitmap.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef f_VIRTUALDUB_VBITMAP_H

-#define f_VIRTUALDUB_VBITMAP_H

-

-#include <windows.h>

-

-typedef unsigned long	Pixel;

-typedef unsigned long	Pixel32;

-typedef unsigned char	Pixel8;

-typedef long			PixCoord;

-typedef	long			PixDim;

-typedef	long			PixOffset;

-

-#ifdef VDEXT_VIDEO_FILTER

-#define NOVTABLE __declspec(novtable)

-#else

-#define NOVTABLE

-#endif

-

-class NOVTABLE VBitmap {

-public:

-	Pixel *			data;

-	Pixel *			palette;

-	int				depth;

-	PixCoord		w, h;

-	PixOffset		pitch;

-	PixOffset		modulo;

-	PixOffset		size;

-	PixOffset		offset;

-

-	Pixel *Address(PixCoord x, PixCoord y) const {

-		return Addressi(x, h-y-1);

-	}

-

-	Pixel *Addressi(PixCoord x, PixCoord y) const {

-		return (Pixel *)((char *)data + y*pitch + x*(depth>>3));

-	}

-

-	Pixel *Address32(PixCoord x, PixCoord y) const {

-		return Address32i(x, h-y-1);

-	}

-

-	Pixel *Address32i(PixCoord x, PixCoord y) const {

-		return (Pixel *)((char *)data + y*pitch + x*sizeof(Pixel));

-	}

-

-	PixOffset PitchAlign4() {

-		return ((w * depth + 31)/32)*4;

-	}

-

-	PixOffset PitchAlign8() {

-		return ((w * depth + 63)/64)*8;

-	}

-

-	PixOffset Modulo() {

-		return pitch - (w*depth+7)/8;

-	}

-

-	PixOffset Size() {

-		return pitch*h;

-	}

-

-	//////

-

-	VBitmap() throw() {

-#ifdef VDEXT_VIDEO_FILTER

-		init();

-#endif

-	}

-	VBitmap(void *data, PixDim w, PixDim h, int depth) throw();

-	VBitmap(void *data, BITMAPINFOHEADER *) throw();

-

-#ifdef VDEXT_VIDEO_FILTER

-	void init() throw() { *(void **)this = g_vtbls.pvtblVBitmap; }

-#endif

-

-	virtual VBitmap& init(void *data, PixDim w, PixDim h, int depth) throw();

-	virtual VBitmap& init(void *data, BITMAPINFOHEADER *) throw();

-

-	virtual void MakeBitmapHeader(BITMAPINFOHEADER *bih) const throw();

-

-	virtual void AlignTo4() throw();

-	virtual void AlignTo8() throw();

-

-	virtual void BitBlt(PixCoord x2, PixCoord y2, const VBitmap *src, PixCoord x1, PixCoord y1, PixDim dx, PixDim dy) const throw();

-	virtual void BitBltDither(PixCoord x2, PixCoord y2, const VBitmap *src, PixDim x1, PixDim y1, PixDim dx, PixDim dy, bool to565) const throw();

-	virtual void BitBlt565(PixCoord x2, PixCoord y2, const VBitmap *src, PixDim x1, PixDim y1, PixDim dx, PixDim dy) const throw();

-

-	virtual bool BitBltXlat1(PixCoord x2, PixCoord y2, const VBitmap *src, PixCoord x1, PixCoord y1, PixDim dx, PixDim dy, const Pixel8 *tbl) const throw();

-	virtual bool BitBltXlat3(PixCoord x2, PixCoord y2, const VBitmap *src, PixCoord x1, PixCoord y1, PixDim dx, PixDim dy, const Pixel32 *tbl) const throw();

-

-	virtual bool StretchBltNearestFast(PixCoord x1, PixCoord y1, PixDim dx, PixDim dy, const VBitmap *src, double x2, double y2, double dx1, double dy1) const throw();

-

-	virtual bool StretchBltBilinearFast(PixCoord x1, PixCoord y1, PixDim dx, PixDim dy, const VBitmap *src, double x2, double y2, double dx1, double dy1) const throw();

-

-	virtual bool RectFill(PixCoord x1, PixCoord y1, PixDim dx, PixDim dy, Pixel32 c) const throw();

-

-	enum {

-		HISTO_LUMA,

-		HISTO_GRAY,

-		HISTO_RED,

-		HISTO_GREEN,

-		HISTO_BLUE,

-	};

-

-	virtual bool Histogram(PixCoord x, PixCoord y, PixCoord dx, PixCoord dy, long *pHisto, int iHistoType) const throw();

-

-private:

-	bool dualrectclip(PixCoord& x2, PixCoord& y2, const VBitmap *src, PixCoord& x1, PixCoord& y1, PixDim& dx, PixDim& dy) const throw();

-};

-

-#undef NOVTABLE

-

-#endif

diff --git a/include/virtualdub/VirtualDub.h b/include/virtualdub/VirtualDub.h
deleted file mode 100644
index 25e5fd475..000000000
--- a/include/virtualdub/VirtualDub.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once

-

-#include "Filter.h"

-#include "ScriptInterpreter.h"

-#include "ScriptError.h"

-#include "ScriptValue.h"

-#include "VBitmap.h"