[Deinterlace-checkins] CVS: DScaler/DScaler/dshowsource DSFileSource.h,NONE,1.1 DSSourceBase.cpp,NON
Brought to you by:
adcockj,
dschmelzer
From: Torbj?rn J. <to...@us...> - 2002-08-20 16:21:32
|
Update of /cvsroot/deinterlace/DScaler/DScaler/dshowsource In directory usw-pr-cvs1:/tmp/cvs-serv27053 Modified Files: DSSource.cpp DSSource.h Added Files: DSFileSource.h DSSourceBase.cpp DSSourceBase.h Log Message: split CDSSource into 3 different classes ***** Error reading new file: [Errno 2] No such file or directory: 'DSFileSource.h' ***** Error reading new file: [Errno 2] No such file or directory: 'DSSourceBase.cpp' ***** Error reading new file: [Errno 2] No such file or directory: 'DSSourceBase.h' Index: DSSource.cpp =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/dshowsource/DSSource.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** DSSource.cpp 16 Aug 2002 09:38:30 -0000 1.31 --- DSSource.cpp 20 Aug 2002 16:21:28 -0000 1.32 *************** *** 25,28 **** --- 25,31 ---- // // $Log$ + // Revision 1.32 2002/08/20 16:21:28 tobbej + // split CDSSource into 3 different classes + // // Revision 1.31 2002/08/16 09:38:30 kooiman // Tuner fixes. *************** *** 139,143 **** [...1459 lines suppressed...] ! } ! catch(CDShowException &e) ! { ! ErrorBox(e.getErrorText()); ! } } ! void CDSCaptureSource::Stop() { ! CDSSourceBase::Stop(); ! ! //need to remove the graph since we dont want to risk having both ! //dscalers own drivers and directshow drivers active at the same time ! if(m_pDSGraph!=NULL) ! { ! delete m_pDSGraph; ! m_pDSGraph=NULL; ! } } #endif Index: DSSource.h =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/dshowsource/DSSource.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** DSSource.h 15 Aug 2002 14:20:11 -0000 1.20 --- DSSource.h 20 Aug 2002 16:21:28 -0000 1.21 *************** *** 25,28 **** --- 25,31 ---- // // $Log$ + // Revision 1.21 2002/08/20 16:21:28 tobbej + // split CDSSource into 3 different classes + // // Revision 1.20 2002/08/15 14:20:11 kooiman // Improved tuner support. Added setting for video input. *************** *** 103,107 **** /** ! * @file DSSource.h interface for the CDSSource class. */ --- 106,110 ---- /** ! * @file DSSource.h interface for the CDSCaptureSource class. */ *************** *** 113,140 **** #endif // _MSC_VER > 1000 ! #include "Source.h" ! #include "DSGraph.h" /** ! * This source controls a Direct show filter graph. * @see CDSProvider * @see CDShowGraph */ ! class CDSSource : public CSource { public: ! CDSSource(string device,string deviceName); ! CDSSource(); ! virtual ~CDSSource(); //from CSettingsHolder void CreateSettings(LPCSTR IniSection); - //from CSource - void Start(); - void Stop(); - void Reset(); - - void GetNextField(TDeinterlaceInfo* pInfo, BOOL AccurateTiming); BOOL HandleWindowsCommands(HWND hWnd, UINT wParam, LONG lParam); void HandleTimerMessages(int TimerId); --- 116,136 ---- #endif // _MSC_VER > 1000 ! #include "DSSourceBase.h" /** ! * This source controls a DirectShow capture graph. * @see CDSProvider * @see CDShowGraph + * @see CDSSourceBase */ ! class CDSCaptureSource : public CDSSourceBase { public: ! CDSCaptureSource(string device,string deviceName); ! virtual ~CDSCaptureSource(); //from CSettingsHolder void CreateSettings(LPCSTR IniSection); BOOL HandleWindowsCommands(HWND hWnd, UINT wParam, LONG lParam); void HandleTimerMessages(int TimerId); *************** *** 142,150 **** LPCSTR GetStatus(); - void Mute(){}; - void UnMute(){}; - ISetting* GetVolume() {return NULL;}; - ISetting* GetBalance() {return NULL;}; - ISetting* GetBrightness(); ISetting* GetContrast(); --- 138,141 ---- *************** *** 158,163 **** eVideoFormat GetFormat(); BOOL IsInTunerMode(); - int GetWidth(); - int GetHeight(); eTunerId GetTunerId() {return TUNER_ABSENT;} --- 149,152 ---- *************** *** 175,221 **** BOOL OpenMediaFile(LPCSTR FileName, BOOL NewPlayList); void DecodeVBI(TDeinterlaceInfo* pInfo){}; ! BOOL HasSquarePixels() {return TRUE;}; void ChangeSettingsBasedOnHW(int ProcessorSpeed, int TradeOff) {;}; - LPCSTR IDString() { return m_IDString.c_str(); } - void SettingsPerChannelSetup(int Start); void TunerChannelChange(int PreChange, int OldChannel, int NewChannel); ! private: ! void updateDroppedFields(); ! CDShowGraph *m_pDSGraph; string m_device; string m_deviceName; - - bool m_bIsFileSource; - string m_filename; - - long m_currentX; - long m_currentY; - - std::string m_IDString; - - ///Array for picture history, implemented as a circular queue - TPicture m_PictureHistory[MAX_PICTURE_HISTORY]; - - ///number of frames dropped at last call of updateDroppedFields() - int m_lastNumDroppedFrames; - - CRITICAL_SECTION m_hOutThreadSync; - - ///used for measuring how long it takes for dscaler to render a field - DWORD m_dwRendStartTime; - - DEFINE_SLIDER_CALLBACK_SETTING(CDSSource, Brightness); - DEFINE_SLIDER_CALLBACK_SETTING(CDSSource, Contrast); - DEFINE_SLIDER_CALLBACK_SETTING(CDSSource, Hue); - DEFINE_SLIDER_CALLBACK_SETTING(CDSSource, Saturation); - DEFINE_SLIDER_CALLBACK_SETTING(CDSSource, Overscan); ! DEFINE_SLIDER_CALLBACK_SETTING(CDSSource, VideoInput); ! DEFINE_SLIDER_CALLBACK_SETTING(CDSSource, LastTunerChannel); }; --- 164,195 ---- BOOL OpenMediaFile(LPCSTR FileName, BOOL NewPlayList); void DecodeVBI(TDeinterlaceInfo* pInfo){}; ! ! ///@todo this probably have to be changed BOOL HasSquarePixels() {return TRUE;}; void ChangeSettingsBasedOnHW(int ProcessorSpeed, int TradeOff) {;}; void SettingsPerChannelSetup(int Start); void TunerChannelChange(int PreChange, int OldChannel, int NewChannel); ! ! static void ChannelChange(void *pThis,int PreChange,int OldChannel,int NewChannel); ! static void OnSetup(void *pThis, int Start); ! ! void Start(); ! void Stop(); ! private: string m_device; string m_deviceName; ! DEFINE_SLIDER_CALLBACK_SETTING(CDSCaptureSource, Brightness); ! DEFINE_SLIDER_CALLBACK_SETTING(CDSCaptureSource, Contrast); ! DEFINE_SLIDER_CALLBACK_SETTING(CDSCaptureSource, Hue); ! DEFINE_SLIDER_CALLBACK_SETTING(CDSCaptureSource, Saturation); ! DEFINE_SLIDER_CALLBACK_SETTING(CDSCaptureSource, Overscan); ! ! DEFINE_SLIDER_CALLBACK_SETTING(CDSCaptureSource, VideoInput); ! DEFINE_SLIDER_CALLBACK_SETTING(CDSCaptureSource, AudioInput); ! DEFINE_SLIDER_CALLBACK_SETTING(CDSCaptureSource, LastTunerChannel); }; |