Parent Directory
| 
Revision Log
Revision 1.2 - (view) (download)
| 1 : | edgomez | 1.2 | diff -burN /c/DX90SDK-orig/Include/DShow.h ./Include/DShow.h |
| 2 : | --- /c/DX90SDK-orig/Include/DShow.h Mon Aug 18 21:22:52 2003 | ||
| 3 : | +++ ./Include/DShow.h Tue Jul 27 20:43:16 2004 | ||
| 4 : | @@ -44,7 +44,7 @@ | ||
| 5 : | // Include DirectShow include files | ||
| 6 : | /////////////////////////////////////////////////////////////////////////// | ||
| 7 : | #include <strmif.h> // Generated IDL header file for streams interfaces | ||
| 8 : | -#include <amvideo.h> // ActiveMovie video interfaces and definitions | ||
| 9 : | +#include <Amvideo.h> // ActiveMovie video interfaces and definitions | ||
| 10 : | #include <amaudio.h> // ActiveMovie audio interfaces and definitions | ||
| 11 : | #include <control.h> // generated from control.odl | ||
| 12 : | #include <evcode.h> // event code definitions | ||
| 13 : | diff -burN /c/DX90SDK-orig/Include/errors.h ./Include/errors.h | ||
| 14 : | --- /c/DX90SDK-orig/Include/errors.h Mon Aug 18 21:22:52 2003 | ||
| 15 : | +++ ./Include/errors.h Tue Jul 27 20:44:04 2004 | ||
| 16 : | @@ -24,7 +24,7 @@ | ||
| 17 : | #define VFW_FIRST_CODE 0x200 | ||
| 18 : | #define MAX_ERROR_TEXT_LEN 160 | ||
| 19 : | |||
| 20 : | -#include <VFWMSGS.H> // includes all message definitions | ||
| 21 : | +#include <vfwmsgs.h> // includes all message definitions | ||
| 22 : | |||
| 23 : | typedef BOOL (WINAPI* AMGETERRORTEXTPROCA)(HRESULT, char *, DWORD); | ||
| 24 : | typedef BOOL (WINAPI* AMGETERRORTEXTPROCW)(HRESULT, WCHAR *, DWORD); | ||
| 25 : | diff -burN /c/DX90SDK-orig/Include/strmif.h ./Include/strmif.h | ||
| 26 : | suxen_drol | 1.1 | --- /c/DX90SDK-orig/Include/strmif.h Mon Aug 18 21:22:54 2003 |
| 27 : | edgomez | 1.2 | +++ ./Include/strmif.h Tue Jul 27 20:45:07 2004 |
| 28 : | suxen_drol | 1.1 | @@ -5604,7 +5604,7 @@ |
| 29 : | { | ||
| 30 : | DWORD dwVersion; | ||
| 31 : | DWORD dwMerit; | ||
| 32 : | - /* [switch_type][switch_is] */ union | ||
| 33 : | + /* [switch_type][switch_is] */ struct | ||
| 34 : | { | ||
| 35 : | /* [case()] */ struct | ||
| 36 : | { | ||
| 37 : | @@ -28732,8 +28732,8 @@ | ||
| 38 : | |||
| 39 : | typedef struct tagVMRGUID | ||
| 40 : | { | ||
| 41 : | - GUID *pGUID; | ||
| 42 : | - GUID GUID; | ||
| 43 : | edgomez | 1.2 | + struct _GUID *pGUID; |
| 44 : | + struct _GUID GUID; | ||
| 45 : | suxen_drol | 1.1 | } VMRGUID; |
| 46 : | |||
| 47 : | typedef struct tagVMRMONITORINFO | ||
| 48 : | edgomez | 1.2 | diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/Makefile ./Samples/C++/DirectShow/BaseClasses/Makefile |
| 49 : | suxen_drol | 1.1 | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/Makefile Thu Jan 1 10:00:00 1970 |
| 50 : | edgomez | 1.2 | +++ ./Samples/C++/DirectShow/BaseClasses/Makefile Tue Jul 27 20:47:27 2004 |
| 51 : | @@ -0,0 +1,27 @@ | ||
| 52 : | suxen_drol | 1.1 | +SRC=amextra.cpp amfilter.cpp amvideo.cpp combase.cpp cprop.cpp ctlutil.cpp ddmm.cpp dllentry.cpp dllsetup.cpp mtype.cpp outputq.cpp pstream.cpp pullpin.cpp refclock.cpp renbase.cpp schedule.cpp seekpt.cpp source.cpp strmctl.cpp sysclock.cpp transfrm.cpp transip.cpp videoctl.cpp vtrans.cpp winctrl.cpp winutil.cpp wxdebug.cpp wxlist.cpp wxutil.cpp |
| 53 : | + | ||
| 54 : | +DXTREE=../../../.. | ||
| 55 : | +DXBASECLASSES=$(DXTREE)/Samples/C++/DirectShow/BaseClasses | ||
| 56 : | +OBJ=$(SRC:.cpp=.o) | ||
| 57 : | +LIB=strmbase.lib | ||
| 58 : | edgomez | 1.2 | +RANLIB=ranlib |
| 59 : | suxen_drol | 1.1 | + |
| 60 : | +CXX=g++ | ||
| 61 : | +CXXFLAGS=-O2 -fno-for-scope -mthreads | ||
| 62 : | + | ||
| 63 : | +all: $(LIB) | ||
| 64 : | + | ||
| 65 : | +$(LIB): $(OBJ) | ||
| 66 : | + $(AR) $(ARFLAGS) $@ $^ | ||
| 67 : | edgomez | 1.2 | + $(RANLIB) $@ |
| 68 : | suxen_drol | 1.1 | + |
| 69 : | +.cpp.o: | ||
| 70 : | + $(CXX) $(CXXFLAGS) \ | ||
| 71 : | + -DRELEASE \ | ||
| 72 : | + -I$(DXTREE)/Include \ | ||
| 73 : | + -I$(DXBASECLASSES) \ | ||
| 74 : | + -include $(DXTREE)/mingw_dshow_port.h \ | ||
| 75 : | + -c $(CXXFLAGS) $< -o $@ | ||
| 76 : | + | ||
| 77 : | +clean: | ||
| 78 : | + rm $(OBJ) | ||
| 79 : | edgomez | 1.2 | diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/amfilter.cpp ./Samples/C++/DirectShow/BaseClasses/amfilter.cpp |
| 80 : | suxen_drol | 1.1 | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/amfilter.cpp Mon Aug 18 16:03:32 2003 |
| 81 : | edgomez | 1.2 | +++ ./Samples/C++/DirectShow/BaseClasses/amfilter.cpp Tue Jul 27 20:42:25 2004 |
| 82 : | suxen_drol | 1.1 | @@ -1363,7 +1363,7 @@ |
| 83 : | |||
| 84 : | /* Make sure the destructor doesn't free these */ | ||
| 85 : | cmt.pbFormat = NULL; | ||
| 86 : | - cmt.cbFormat = NULL; | ||
| 87 : | + cmt.cbFormat = 0; | ||
| 88 : | cmt.pUnk = NULL; | ||
| 89 : | |||
| 90 : | |||
| 91 : | edgomez | 1.2 | diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.cpp ./Samples/C++/DirectShow/BaseClasses/ctlutil.cpp |
| 92 : | suxen_drol | 1.1 | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.cpp Mon Aug 18 16:03:32 2003 |
| 93 : | edgomez | 1.2 | +++ ./Samples/C++/DirectShow/BaseClasses/ctlutil.cpp Tue Jul 27 20:42:25 2004 |
| 94 : | suxen_drol | 1.1 | @@ -709,7 +709,7 @@ |
| 95 : | |||
| 96 : | HRESULT | ||
| 97 : | CPosPassThru::GetSeekingLongLong | ||
| 98 : | -( HRESULT (__stdcall IMediaSeeking::*pMethod)( LONGLONG * ) | ||
| 99 : | +( HRESULT ( GETSEEKINGLONGLONG_CALL IMediaSeeking::*pMethod)( LONGLONG * ) | ||
| 100 : | , LONGLONG * pll | ||
| 101 : | ) | ||
| 102 : | { | ||
| 103 : | edgomez | 1.2 | diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.h ./Samples/C++/DirectShow/BaseClasses/ctlutil.h |
| 104 : | suxen_drol | 1.1 | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.h Mon Aug 18 16:03:32 2003 |
| 105 : | edgomez | 1.2 | +++ ./Samples/C++/DirectShow/BaseClasses/ctlutil.h Tue Jul 27 20:42:25 2004 |
| 106 : | suxen_drol | 1.1 | @@ -275,7 +275,7 @@ |
| 107 : | // Prevent bugs from constructing from LONG (which gets | ||
| 108 : | // converted to double and then multiplied by 10000000 | ||
| 109 : | COARefTime(LONG); | ||
| 110 : | - operator=(LONG); | ||
| 111 : | + COARefTime& operator=(LONG); | ||
| 112 : | }; | ||
| 113 : | |||
| 114 : | |||
| 115 : | @@ -355,7 +355,12 @@ | ||
| 116 : | STDMETHODIMP CanSeekBackward(LONG *pCanSeekBackward); | ||
| 117 : | |||
| 118 : | private: | ||
| 119 : | - HRESULT GetSeekingLongLong( HRESULT (__stdcall IMediaSeeking::*pMethod)( LONGLONG * ), | ||
| 120 : | +#if !defined(__GNUC__) | ||
| 121 : | +#define GETSEEKINGLONGLONG_CALL __stdcall | ||
| 122 : | +#else | ||
| 123 : | +#define GETSEEKINGLONGLONG_CALL | ||
| 124 : | +#endif | ||
| 125 : | + HRESULT GetSeekingLongLong( HRESULT ( GETSEEKINGLONGLONG_CALL IMediaSeeking::*pMethod)( LONGLONG * ), | ||
| 126 : | LONGLONG * pll ); | ||
| 127 : | }; | ||
| 128 : | |||
| 129 : | edgomez | 1.2 | diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ddmm.cpp ./Samples/C++/DirectShow/BaseClasses/ddmm.cpp |
| 130 : | suxen_drol | 1.1 | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ddmm.cpp Mon Aug 18 16:03:32 2003 |
| 131 : | edgomez | 1.2 | +++ ./Samples/C++/DirectShow/BaseClasses/ddmm.cpp Tue Jul 27 20:45:21 2004 |
| 132 : | suxen_drol | 1.1 | @@ -17,8 +17,8 @@ |
| 133 : | */ | ||
| 134 : | typedef struct { | ||
| 135 : | LPSTR szDevice; | ||
| 136 : | - GUID* lpGUID; | ||
| 137 : | - GUID GUID; | ||
| 138 : | edgomez | 1.2 | + struct _GUID* lpGUID; |
| 139 : | + struct _GUID GUID; | ||
| 140 : | suxen_drol | 1.1 | BOOL fFound; |
| 141 : | } FindDeviceData; | ||
| 142 : | |||
| 143 : | edgomez | 1.2 | diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/mtype.cpp ./Samples/C++/DirectShow/BaseClasses/mtype.cpp |
| 144 : | suxen_drol | 1.1 | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/mtype.cpp Mon Aug 18 16:03:32 2003 |
| 145 : | edgomez | 1.2 | +++ ./Samples/C++/DirectShow/BaseClasses/mtype.cpp Tue Jul 27 20:42:25 2004 |
| 146 : | suxen_drol | 1.1 | @@ -13,7 +13,6 @@ |
| 147 : | // in the streams IDL file, but also has (non-virtual) functions | ||
| 148 : | |||
| 149 : | #include <streams.h> | ||
| 150 : | -#include <mmreg.h> | ||
| 151 : | |||
| 152 : | CMediaType::~CMediaType(){ | ||
| 153 : | FreeMediaType(*this); | ||
| 154 : | edgomez | 1.2 | diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/refclock.h ./Samples/C++/DirectShow/BaseClasses/refclock.h |
| 155 : | suxen_drol | 1.1 | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/refclock.h Mon Aug 18 16:03:32 2003 |
| 156 : | edgomez | 1.2 | +++ ./Samples/C++/DirectShow/BaseClasses/refclock.h Tue Jul 27 20:42:25 2004 |
| 157 : | suxen_drol | 1.1 | @@ -14,7 +14,11 @@ |
| 158 : | |||
| 159 : | const UINT RESOLUTION = 1; /* High resolution timer */ | ||
| 160 : | const INT ADVISE_CACHE = 4; /* Default cache size */ | ||
| 161 : | +#if !defined(__GNUC__) | ||
| 162 : | const LONGLONG MAX_TIME = 0x7FFFFFFFFFFFFFFF; /* Maximum LONGLONG value */ | ||
| 163 : | +#else | ||
| 164 : | +const LONGLONG MAX_TIME = 0x7FFFFFFFFFFFFFFFLL; /* Maximum LONGLONG value */ | ||
| 165 : | +#endif | ||
| 166 : | |||
| 167 : | inline LONGLONG WINAPI ConvertToMilliseconds(const REFERENCE_TIME& RT) | ||
| 168 : | { | ||
| 169 : | edgomez | 1.2 | diff -ur /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/streams.h.orig ./Samples/C++/DirectShow/BaseClasses/streams.h |
| 170 : | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/streams.h 2004-07-27 23:04:18.000000000 +0200 | ||
| 171 : | +++ ./Samples/C++/DirectShow/BaseClasses/streams.h 2004-07-27 23:03:57.000000000 +0200 | ||
| 172 : | @@ -135,7 +135,7 @@ | ||
| 173 : | |||
| 174 : | #include <reftime.h> // Helper class for REFERENCE_TIME management | ||
| 175 : | #include <wxdebug.h> // Debug support for logging and ASSERTs | ||
| 176 : | -#include <amvideo.h> // ActiveMovie video interfaces and definitions | ||
| 177 : | +#include <Amvideo.h> // ActiveMovie video interfaces and definitions | ||
| 178 : | //include amaudio.h explicitly if you need it. it requires the DirectX SDK. | ||
| 179 : | //#include <amaudio.h> // ActiveMovie audio interfaces and definitions | ||
| 180 : | #include <wxutil.h> // General helper classes for threads etc | ||
| 181 : | diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxdebug.cpp ./Samples/C++/DirectShow/BaseClasses/wxdebug.cpp | ||
| 182 : | suxen_drol | 1.1 | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxdebug.cpp Mon Aug 18 16:03:32 2003 |
| 183 : | edgomez | 1.2 | +++ ./Samples/C++/DirectShow/BaseClasses/wxdebug.cpp Tue Jul 27 20:42:25 2004 |
| 184 : | suxen_drol | 1.1 | @@ -564,7 +564,7 @@ |
| 185 : | { | ||
| 186 : | // re-read the registry every second. We cannot use RegNotify() to | ||
| 187 : | // notice registry changes because it's not available on win9x. | ||
| 188 : | - static g_dwLastRefresh = 0; | ||
| 189 : | + static DWORD g_dwLastRefresh = 0; | ||
| 190 : | DWORD dwTime = timeGetTime(); | ||
| 191 : | if(dwTime - g_dwLastRefresh > 1000) { | ||
| 192 : | g_dwLastRefresh = dwTime; | ||
| 193 : | @@ -1143,7 +1143,33 @@ | ||
| 194 : | hr = pUnk->QueryInterface(IID_IPin, (void **)&pp); | ||
| 195 : | if(SUCCEEDED(hr)) | ||
| 196 : | { | ||
| 197 : | - CDisp::CDisp(pp); | ||
| 198 : | +/* --- copy from CDisp::CDisp(IPin*) --- */ | ||
| 199 : | + PIN_INFO pi; | ||
| 200 : | + TCHAR str[MAX_PIN_NAME]; | ||
| 201 : | + CLSID clsid; | ||
| 202 : | + | ||
| 203 : | + if (pp) { | ||
| 204 : | + pp->QueryPinInfo(&pi); | ||
| 205 : | + pi.pFilter->GetClassID(&clsid); | ||
| 206 : | + QueryPinInfoReleaseFilter(pi); | ||
| 207 : | + #ifndef UNICODE | ||
| 208 : | + WideCharToMultiByte(GetACP(), 0, pi.achName, lstrlenW(pi.achName) + 1, | ||
| 209 : | + str, MAX_PIN_NAME, NULL, NULL); | ||
| 210 : | + #else | ||
| 211 : | + lstrcpy(str, pi.achName); | ||
| 212 : | + #endif | ||
| 213 : | + } else { | ||
| 214 : | + lstrcpy(str, TEXT("NULL IPin")); | ||
| 215 : | + } | ||
| 216 : | + | ||
| 217 : | + m_pString = (PTCHAR) new TCHAR[lstrlen(str)+64]; | ||
| 218 : | + if (!m_pString) { | ||
| 219 : | + pp->Release(); | ||
| 220 : | + return; | ||
| 221 : | + } | ||
| 222 : | + | ||
| 223 : | + wsprintf(m_pString, TEXT("%hs(%s)"), GuidNames[clsid], str); | ||
| 224 : | +/* --- copy from CDisp::CDisp(IPin*) --- */ | ||
| 225 : | pp->Release(); | ||
| 226 : | return; | ||
| 227 : | } | ||
| 228 : | edgomez | 1.2 | diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxutil.cpp ./Samples/C++/DirectShow/BaseClasses/wxutil.cpp |
| 229 : | suxen_drol | 1.1 | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxutil.cpp Mon Aug 18 16:03:32 2003 |
| 230 : | edgomez | 1.2 | +++ ./Samples/C++/DirectShow/BaseClasses/wxutil.cpp Tue Jul 27 20:42:25 2004 |
| 231 : | suxen_drol | 1.1 | @@ -742,8 +742,13 @@ |
| 232 : | |||
| 233 : | /* This will catch c == 0 and overflow */ | ||
| 234 : | if (uc <= p[1].QuadPart) { | ||
| 235 : | +#if !defined(__GNUC__) | ||
| 236 : | return bSign ? (LONGLONG)0x8000000000000000 : | ||
| 237 : | (LONGLONG)0x7FFFFFFFFFFFFFFF; | ||
| 238 : | +#else | ||
| 239 : | + return bSign ? (LONGLONG)0x8000000000000000LL : | ||
| 240 : | + (LONGLONG)0x7FFFFFFFFFFFFFFFLL; | ||
| 241 : | +#endif | ||
| 242 : | } | ||
| 243 : | |||
| 244 : | DWORDLONG ullResult; | ||
| 245 : | @@ -903,8 +908,13 @@ | ||
| 246 : | |||
| 247 : | /* This will catch c == 0 and overflow */ | ||
| 248 : | if (uc <= p1) { | ||
| 249 : | +#if !defined(__GNUC__) | ||
| 250 : | return bSign ? (LONGLONG)0x8000000000000000 : | ||
| 251 : | (LONGLONG)0x7FFFFFFFFFFFFFFF; | ||
| 252 : | +#else | ||
| 253 : | + return bSign ? (LONGLONG)0x8000000000000000LL : | ||
| 254 : | + (LONGLONG)0x7FFFFFFFFFFFFFFFLL; | ||
| 255 : | +#endif | ||
| 256 : | } | ||
| 257 : | |||
| 258 : | /* Do the division */ | ||
| 259 : | edgomez | 1.2 | diff -burN /c/DX90SDK-orig/mingw_dshow_port.h ./mingw_dshow_port.h |
| 260 : | suxen_drol | 1.1 | --- /c/DX90SDK-orig/mingw_dshow_port.h Thu Jan 1 10:00:00 1970 |
| 261 : | edgomez | 1.2 | +++ ./mingw_dshow_port.h Tue Jul 27 20:42:25 2004 |
| 262 : | suxen_drol | 1.1 | @@ -0,0 +1,12 @@ |
| 263 : | +#include <wtypes.h> | ||
| 264 : | +#include <unknwn.h> | ||
| 265 : | +#include <ole2.h> | ||
| 266 : | +#include <limits.h> | ||
| 267 : | + | ||
| 268 : | +#define _WINGDI_ 1 | ||
| 269 : | +#define AM_NOVTABLE | ||
| 270 : | +#define _OBJBASE_H_ | ||
| 271 : | +#undef _X86_ | ||
| 272 : | +#define _I64_MAX LONG_LONG_MAX | ||
| 273 : | +#define EXTERN_GUID(itf,l1,s1,s2,c1,c2,c3,c4,c5,c6,c7,c8) \ | ||
| 274 : | + EXTERN_C static const IID itf = {l1,s1,s2,{c1,c2,c3,c4,c5,c6,c7,c8} } |
| No admin address has been configured | ViewVC Help |
| Powered by ViewVC 1.0.4 |