[Deinterlace-checkins] CVS: DScaler/DScaler BT848Card.cpp, 1.51, 1.52 D3D9Output.cpp, 1.11, 1.12 DS
Brought to you by:
adcockj,
dschmelzer
Menu
▾
▴
[Deinterlace-checkins] CVS: DScaler/DScaler BT848Card.cpp, 1.51, 1.52 D3D9Output.cpp, 1.11, 1.12 DScaler.cpp, 1.399, 1.400 DScaler2005.vcproj, 1.16, 1.17 OverlayOutput.cpp, 1.9, 1.10 PaintingHDC.cpp, 1.7, 1.8 ScheduledRecording.cpp, 1.3, 1.4 ScheduledRecording.h, 1.3, 1.4 StdAfx.cpp, 1.4, 1.5
|
From: John A. <ad...@us...> - 2007-12-14 19:31:54
|
Update of /cvsroot/deinterlace/DScaler/DScaler In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv9175/DScaler Modified Files: BT848Card.cpp D3D9Output.cpp DScaler.cpp DScaler2005.vcproj OverlayOutput.cpp PaintingHDC.cpp ScheduledRecording.cpp ScheduledRecording.h StdAfx.cpp Log Message: Fixes for Vista crashing Consistent exception handling as references Index: BT848Card.cpp =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/BT848Card.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -r1.51 -r1.52 *** BT848Card.cpp 18 Feb 2007 21:15:31 -0000 1.51 --- BT848Card.cpp 14 Dec 2007 19:31:47 -0000 1.52 *************** *** 19,22 **** --- 19,26 ---- // // $Log$ + // Revision 1.52 2007/12/14 19:31:47 adcockj + // Fixes for Vista crashing + // Consistent exception handling as references + // // Revision 1.51 2007/02/18 21:15:31 robmuller // Added option to not compile BT8x8 code. *************** *** 389,397 **** { SetDMA(FALSE); WriteByte(BT848_SRESET, 0); ::Sleep(100); - WriteDword(BT848_RISC_STRT_ADD, RiscBasePhysical); WriteByte(BT848_CAP_CTL, 0x00); WriteByte(BT848_VBI_PACK_SIZE, (VBI_SPL / 4) & 0xff); WriteByte(BT848_VBI_PACK_DEL, (VBI_SPL / 4) >> 8); --- 393,403 ---- { SetDMA(FALSE); + WriteByte(BT848_CAP_CTL, 0x00); + WriteByte(BT848_SRESET, 0); ::Sleep(100); WriteByte(BT848_CAP_CTL, 0x00); + WriteDword(BT848_RISC_STRT_ADD, RiscBasePhysical); WriteByte(BT848_VBI_PACK_SIZE, (VBI_SPL / 4) & 0xff); WriteByte(BT848_VBI_PACK_DEL, (VBI_SPL / 4) >> 8); Index: D3D9Output.cpp =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/D3D9Output.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** D3D9Output.cpp 20 Feb 2007 19:06:44 -0000 1.11 --- D3D9Output.cpp 14 Dec 2007 19:31:47 -0000 1.12 *************** *** 19,22 **** --- 19,26 ---- // // $Log$ + // Revision 1.12 2007/12/14 19:31:47 adcockj + // Fixes for Vista crashing + // Consistent exception handling as references + // // Revision 1.11 2007/02/20 19:06:44 robmuller // Release surface. *************** *** 318,321 **** --- 322,330 ---- { HRESULT ddrval; + + if(lpDDOverlay == NULL) + { + return FALSE; + } if(bUseExtraBuffer && lpExtraMemoryForFilters != NULL) Index: DScaler.cpp =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/DScaler.cpp,v retrieving revision 1.399 retrieving revision 1.400 diff -C2 -r1.399 -r1.400 *** DScaler.cpp 4 Oct 2007 20:04:47 -0000 1.399 --- DScaler.cpp 14 Dec 2007 19:31:47 -0000 1.400 *************** *** 68,71 **** --- 68,75 ---- // // $Log$ + // Revision 1.400 2007/12/14 19:31:47 adcockj + // Fixes for Vista crashing + // Consistent exception handling as references + // // Revision 1.399 2007/10/04 20:04:47 to_see // Fixed crash in ScheduledRecordingDlg when StartTime changed too fast *************** *** 6259,6262 **** --- 6263,6267 ---- void CleanUpMemory() { + CScheduleDlg::OnDscalerExit(); Mixer_Exit(); VBI_Exit(); Index: DScaler2005.vcproj =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/DScaler2005.vcproj,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** DScaler2005.vcproj 19 Feb 2007 00:28:04 -0000 1.16 --- DScaler2005.vcproj 14 Dec 2007 19:31:47 -0000 1.17 *************** *** 6849,6853 **** </File> <File ! RelativePath="StdAfx.cpp" > <FileConfiguration --- 6849,6853 ---- </File> <File ! RelativePath=".\StdAfx.cpp" > <FileConfiguration *************** *** 6856,6864 **** <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" UsePrecompiledHeader="1" - BrowseInformation="1" /> </FileConfiguration> --- 6856,6860 ---- *************** *** 6868,6900 **** <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - UsePrecompiledHeader="1" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Express|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - UsePrecompiledHeader="1" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Express|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" UsePrecompiledHeader="1" - BrowseInformation="1" /> </FileConfiguration> --- 6864,6868 ---- Index: OverlayOutput.cpp =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/OverlayOutput.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** OverlayOutput.cpp 27 Jul 2007 00:49:03 -0000 1.9 --- OverlayOutput.cpp 14 Dec 2007 19:31:47 -0000 1.10 *************** *** 19,22 **** --- 19,26 ---- // // $Log$ + // Revision 1.10 2007/12/14 19:31:47 adcockj + // Fixes for Vista crashing + // Consistent exception handling as references + // // Revision 1.9 2007/07/27 00:49:03 robmuller // Reduce cpu usage (and hopefully dropped frames) when waiting for the vsync. *************** *** 1328,1331 **** --- 1332,1341 ---- pInfo->OverlayPitch = SurfaceDesc.lPitch; // Set new pitch, may change pInfo->Overlay = (BYTE*)SurfaceDesc.lpSurface; + if(pInfo->Overlay == NULL) + { + LeaveCriticalSection(&hDDCritSect); + return FALSE; + } + // stay in critical section return TRUE; *************** *** 1384,1387 **** --- 1394,1402 ---- pInfo->OverlayPitch = SurfaceDesc.lPitch; // Set new pitch, may change pInfo->Overlay = (BYTE*)SurfaceDesc.lpSurface; + if(pInfo->Overlay == NULL) + { + LeaveCriticalSection(&hDDCritSect); + return FALSE; + } Index: PaintingHDC.cpp =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/PaintingHDC.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** PaintingHDC.cpp 19 Feb 2007 14:48:50 -0000 1.7 --- PaintingHDC.cpp 14 Dec 2007 19:31:47 -0000 1.8 *************** *** 19,22 **** --- 19,26 ---- // // $Log$ + // Revision 1.8 2007/12/14 19:31:47 adcockj + // Fixes for Vista crashing + // Consistent exception handling as references + // // Revision 1.7 2007/02/19 14:48:50 adcockj // Fixed various issues with d3d9 code and settings *************** *** 96,100 **** void CPaintingHDC::CreateD3DBuffer() { ! if(m_ddsurface==NULL && GetActiveOutput()->Type() == IOutput::OUT_D3D) { RECT src=((CD3D9Output *)GetActiveOutput())->Overlay_GetCurrentSrcRect(); --- 100,104 ---- void CPaintingHDC::CreateD3DBuffer() { ! if(m_ddsurface==NULL && GetActiveOutput()->Type() == IOutput::OUT_D3D && ((CD3D9Output *)GetActiveOutput())->pDevice != NULL) { RECT src=((CD3D9Output *)GetActiveOutput())->Overlay_GetCurrentSrcRect(); *************** *** 230,234 **** void CPaintingHDC::BitBltRectsD3D(LPRECT pRectList, LONG nRectCount, LPDIRECT3DSURFACE9 target, HDC hDstDC) { ! if (m_hBufferDC == NULL) { return; --- 234,238 ---- void CPaintingHDC::BitBltRectsD3D(LPRECT pRectList, LONG nRectCount, LPDIRECT3DSURFACE9 target, HDC hDstDC) { ! if (m_hBufferDC == NULL || target == NULL) { return; Index: ScheduledRecording.cpp =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/ScheduledRecording.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** ScheduledRecording.cpp 4 Oct 2007 20:04:47 -0000 1.3 --- ScheduledRecording.cpp 14 Dec 2007 19:31:47 -0000 1.4 *************** *** 19,22 **** --- 19,26 ---- // // $Log$ + // Revision 1.4 2007/12/14 19:31:47 adcockj + // Fixes for Vista crashing + // Consistent exception handling as references + // // Revision 1.3 2007/10/04 20:04:47 to_see // Fixed crash in ScheduledRecordingDlg when StartTime changed too fast *************** *** 96,100 **** ON_BN_CLICKED(IDC_SCHEDULE_OK, OnOkClicked) ON_EN_UPDATE(IDC_SCHEDULE_EDIT_DURATION, OnDurationUpdate) - ON_MESSAGE(WM_QUIT, OnDscalerExit) ON_NOTIFY(DTN_DATETIMECHANGE, IDC_SCHEDULE_TIMEPICKER, OnTimePickerChanged) ON_NOTIFY(DTN_DATETIMECHANGE, IDC_SCHEDULE_ENDTIMEPICKER, OnEndTimePickerChanged) --- 100,103 ---- *************** *** 102,110 **** END_MESSAGE_MAP() ! LRESULT CScheduleDlg::OnDscalerExit(WPARAM wParam, LPARAM lParam) { pSchRec->exitScheduledRecording(); - - return 0; } --- 105,111 ---- END_MESSAGE_MAP() ! void CScheduleDlg::OnDscalerExit() { pSchRec->exitScheduledRecording(); } Index: ScheduledRecording.h =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/ScheduledRecording.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** ScheduledRecording.h 4 Oct 2007 20:04:47 -0000 1.3 --- ScheduledRecording.h 14 Dec 2007 19:31:47 -0000 1.4 *************** *** 19,22 **** --- 19,26 ---- // // $Log$ + // Revision 1.4 2007/12/14 19:31:47 adcockj + // Fixes for Vista crashing + // Consistent exception handling as references + // // Revision 1.3 2007/10/04 20:04:47 to_see // Fixed crash in ScheduledRecordingDlg when StartTime changed too fast *************** *** 36,39 **** --- 40,44 ---- CScheduleDlg(CWnd *pParent = NULL); // standard constructor ~CScheduleDlg(); + static void OnDscalerExit(); protected: *************** *** 46,50 **** afx_msg void OnTimePickerChanged(NMHDR* nmhdr, LRESULT* lResult); afx_msg void OnEndTimePickerChanged(NMHDR* nmhdr, LRESULT* lResult); - afx_msg LRESULT OnDscalerExit(WPARAM wParam, LPARAM lParam); //}}AFX_MSG DECLARE_MESSAGE_MAP() --- 51,54 ---- Index: StdAfx.cpp =================================================================== RCS file: /cvsroot/deinterlace/DScaler/DScaler/StdAfx.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** StdAfx.cpp 27 Oct 2003 10:39:54 -0000 1.4 --- StdAfx.cpp 14 Dec 2007 19:31:47 -0000 1.5 *************** *** 25,26 **** --- 25,28 ---- #include "stdafx.h" + + int test; \ No newline at end of file |