deinterlace-checkins Mailing List for DScaler Deinterlacer/Scaler
Brought to you by:
adcockj,
dschmelzer
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(31) |
Nov
(41) |
Dec
(15) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(138) |
Feb
(55) |
Mar
(130) |
Apr
(104) |
May
(194) |
Jun
(161) |
Jul
(169) |
Aug
(247) |
Sep
(126) |
Oct
(71) |
Nov
(196) |
Dec
(122) |
| 2002 |
Jan
(96) |
Feb
(195) |
Mar
(86) |
Apr
(71) |
May
(97) |
Jun
(155) |
Jul
(112) |
Aug
(213) |
Sep
(217) |
Oct
(362) |
Nov
(146) |
Dec
(80) |
| 2003 |
Jan
(242) |
Feb
(98) |
Mar
(79) |
Apr
(56) |
May
(93) |
Jun
(48) |
Jul
(52) |
Aug
(87) |
Sep
(52) |
Oct
(33) |
Nov
(22) |
Dec
(10) |
| 2004 |
Jan
(16) |
Feb
(146) |
Mar
(61) |
Apr
(121) |
May
(25) |
Jun
(12) |
Jul
(75) |
Aug
(68) |
Sep
(36) |
Oct
(61) |
Nov
(129) |
Dec
(89) |
| 2005 |
Jan
(14) |
Feb
(33) |
Mar
(139) |
Apr
(31) |
May
(7) |
Jun
(3) |
Jul
(91) |
Aug
(18) |
Sep
(15) |
Oct
(60) |
Nov
(16) |
Dec
(8) |
| 2006 |
Jan
(2) |
Feb
(12) |
Mar
(23) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(18) |
Oct
(89) |
Nov
(2) |
Dec
(124) |
| 2007 |
Jan
(147) |
Feb
(55) |
Mar
(4) |
Apr
(1) |
May
|
Jun
(9) |
Jul
(5) |
Aug
(3) |
Sep
(48) |
Oct
(6) |
Nov
(29) |
Dec
(23) |
| 2008 |
Jan
(14) |
Feb
(34) |
Mar
(68) |
Apr
(2) |
May
|
Jun
(1) |
Jul
(7) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
(35) |
Apr
(24) |
May
(26) |
Jun
(29) |
Jul
(54) |
Aug
(40) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(5) |
Apr
(15) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
(9) |
Feb
(9) |
Mar
(5) |
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ad...@us...> - 2019-04-26 07:14:38
|
Revision: 4790
http://sourceforge.net/p/deinterlace/code/4790
Author: adcockj
Date: 2019-04-26 07:14:36 +0000 (Fri, 26 Apr 2019)
Log Message:
-----------
fix directory traversal
Modified Paths:
--------------
trunk/htdocs/channels/download.php
Modified: trunk/htdocs/channels/download.php
===================================================================
--- trunk/htdocs/channels/download.php 2014-10-26 15:25:29 UTC (rev 4789)
+++ trunk/htdocs/channels/download.php 2019-04-26 07:14:36 UTC (rev 4790)
@@ -1,6 +1,6 @@
<?php
-$filename=$_GET["filename"];
+$filename=basename($_GET["filename"]);
$saveas=$_GET["saveas"];
header("Content-disposition: attachment; filename=$saveas");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2014-10-26 15:25:37
|
Revision: 4789
http://sourceforge.net/p/deinterlace/code/4789
Author: adcockj
Date: 2014-10-26 15:25:29 +0000 (Sun, 26 Oct 2014)
Log Message:
-----------
Remove link after request
Modified Paths:
--------------
trunk/htdocs/donate.htm
Modified: trunk/htdocs/donate.htm
===================================================================
--- trunk/htdocs/donate.htm 2013-06-23 16:31:37 UTC (rev 4788)
+++ trunk/htdocs/donate.htm 2014-10-26 15:25:29 UTC (rev 4789)
@@ -108,7 +108,6 @@
<p>Julie Kinnear from <a href="http://juliekinnear.com/">Toronto MLS Listings</a></p>
<p>David Tsegai from <a href="http://calgaryrealestate.ca/">Calgary Real Estate</a></p>
- <p>Lorne Marr from <a href="http://lsminsurance.ca/">Life Insurance Canada</a></p>
<p>Jay Banks from <a href="http://jaybanks.ca/">Vancouver Lofts</a></p>
<a name="time" id="time"></a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2013-06-23 16:31:41
|
Revision: 4788
http://sourceforge.net/p/deinterlace/code/4788
Author: adcockj
Date: 2013-06-23 16:31:37 +0000 (Sun, 23 Jun 2013)
Log Message:
-----------
Update externals after project move
Property Changed:
----------------
trunk/htdocs/
Index: trunk/htdocs
===================================================================
--- trunk/htdocs 2012-04-02 22:23:11 UTC (rev 4787)
+++ trunk/htdocs 2013-06-23 16:31:37 UTC (rev 4788)
Property changes on: trunk/htdocs
___________________________________________________________________
Modified: svn:externals
## -1,2 +1,2 ##
-Help https://deinterlace.svn.sourceforge.net/svnroot/deinterlace/trunk/DScaler/Help
-Help5 https://deinterlace.svn.sourceforge.net/svnroot/deinterlace/trunk/DScaler5/Help
+Help https://svn.code.sf.net/p/deinterlace/code/trunk/DScaler/Help
+Help5 https://svn.code.sf.net/p/deinterlace/code/trunk/DScaler5/Help
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-04-02 22:23:17
|
Revision: 4787
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4787&view=rev
Author: adcockj
Date: 2012-04-02 22:23:11 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Separate handling of volume and media keys to better match users expectations around disabling media keys
Modified Paths:
--------------
trunk/DScaler/DScaler/RemoteInput.cpp
Modified: trunk/DScaler/DScaler/RemoteInput.cpp
===================================================================
--- trunk/DScaler/DScaler/RemoteInput.cpp 2012-04-02 19:54:36 UTC (rev 4786)
+++ trunk/DScaler/DScaler/RemoteInput.cpp 2012-04-02 22:23:11 UTC (rev 4787)
@@ -40,6 +40,28 @@
#ifdef WM_APPCOMMAND
+// Cope with media commands relating to volume that we always grab
+LONG OnAppCommandVolume(HWND hWnd, WPARAM wParam, LPARAM lParam)
+{
+ LONG RetVal = TRUE;
+
+ switch(GET_APPCOMMAND_LPARAM(lParam))
+ {
+ case APPCOMMAND_VOLUME_DOWN:
+ PostMessage(hWnd, WM_COMMAND, IDM_VOLUMEMINUS, 0);
+ break;
+ case APPCOMMAND_VOLUME_UP:
+ PostMessage(hWnd, WM_COMMAND, IDM_VOLUMEPLUS, 0);
+ break;
+ case APPCOMMAND_VOLUME_MUTE:
+ PostMessage(hWnd, WM_COMMAND, IDM_MUTE, 0);
+ break;
+ default:
+ RetVal = FALSE;
+ break;
+ }
+ return RetVal;
+}
// Cope with new media commands
// MCE remote sends these for the basic keys
LONG OnAppCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
@@ -66,15 +88,6 @@
case APPCOMMAND_MEDIA_PLAY_PAUSE:
PostMessage(hWnd, WM_COMMAND, IDM_CAPTURE_PAUSE, 0);
break;
- case APPCOMMAND_VOLUME_DOWN:
- PostMessage(hWnd, WM_COMMAND, IDM_VOLUMEMINUS, 0);
- break;
- case APPCOMMAND_VOLUME_UP:
- PostMessage(hWnd, WM_COMMAND, IDM_VOLUMEPLUS, 0);
- break;
- case APPCOMMAND_VOLUME_MUTE:
- PostMessage(hWnd, WM_COMMAND, IDM_MUTE, 0);
- break;
default:
RetVal = FALSE;
break;
@@ -183,10 +196,21 @@
}
#endif
#ifdef WM_APPCOMMAND
- if(message == WM_APPCOMMAND && bHandleMediaKeys)
+ if(message == WM_APPCOMMAND)
{
*bDone = TRUE;
- return OnAppCommand(hWnd, wParam, lParam);
+ if(OnAppCommandVolume(hWnd, wParam, lParam))
+ {
+ return TRUE;
+ }
+ if(bHandleMediaKeys)
+ {
+ return OnAppCommand(hWnd, wParam, lParam);
+ }
+ else
+ {
+ return DefWindowProc(hWnd, message, wParam, lParam);
+ }
}
#endif
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-04-02 19:54:42
|
Revision: 4786
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4786&view=rev
Author: adcockj
Date: 2012-04-02 19:54:36 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Bump version
Modified Paths:
--------------
trunk/DScaler/Api/DScalerVersion.h
trunk/DScaler/Help/DScaler_Readme.htm
trunk/DScaler/Help/News.htm
Modified: trunk/DScaler/Api/DScalerVersion.h
===================================================================
--- trunk/DScaler/Api/DScalerVersion.h 2012-04-02 13:14:33 UTC (rev 4785)
+++ trunk/DScaler/Api/DScalerVersion.h 2012-04-02 19:54:36 UTC (rev 4786)
@@ -21,7 +21,7 @@
// should be updated before each release
#define DSCALERVERSION_MAJOR 4
#define DSCALERVERSION_MINOR 2
-#define DSCALERVERSION_REVISION 1
+#define DSCALERVERSION_REVISION 2
// need to have an extra macro for stingify otherwise we get the
// name of the definition not the value
Modified: trunk/DScaler/Help/DScaler_Readme.htm
===================================================================
--- trunk/DScaler/Help/DScaler_Readme.htm 2012-04-02 13:14:33 UTC (rev 4785)
+++ trunk/DScaler/Help/DScaler_Readme.htm 2012-04-02 19:54:36 UTC (rev 4786)
@@ -54,7 +54,7 @@
<tr>
<td colspan="3"><!-- #BeginEditable "Text" -->
-<h1>DScaler - version 4.2.1</h1>
+<h1>DScaler - version 4.2.2</h1>
<h2>What's New</h2>
Modified: trunk/DScaler/Help/News.htm
===================================================================
--- trunk/DScaler/Help/News.htm 2012-04-02 13:14:33 UTC (rev 4785)
+++ trunk/DScaler/Help/News.htm 2012-04-02 19:54:36 UTC (rev 4786)
@@ -54,14 +54,21 @@
<tr>
<td colspan="3"><!-- #BeginEditable "Text" -->
-<h1>DScaler - version 4.2.1</h1>
+<h1>DScaler - version 4.2.2</h1>
+<h2>What's new (since 4.2.1):</h2>
+
+<h3>General</h3>
+<p><ul>
+<li>Correct behaviour when ignoring media keys.</li>
+</ul></p>
+
<h2>What's new (since 4.2.0):</h2>
<h3>General</h3>
<p><ul>
<li>New setting to control if DScaler responds to media keys.</li>
-<li>POssible fix for overlay failing (also added improved logging to
+<li>Possible fix for overlay failing (also added improved logging to
help diagnose)</li>
</ul></p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-04-02 13:14:44
|
Revision: 4785
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4785&view=rev
Author: adcockj
Date: 2012-04-02 13:14:33 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Attempt to pass raw input messages up to other listeners if we are not handling them
Modified Paths:
--------------
trunk/DScaler/DScaler/DScaler.cpp
trunk/DScaler/DScaler/RemoteInput.cpp
Modified: trunk/DScaler/DScaler/DScaler.cpp
===================================================================
--- trunk/DScaler/DScaler/DScaler.cpp 2012-03-15 17:53:55 UTC (rev 4784)
+++ trunk/DScaler/DScaler/DScaler.cpp 2012-04-02 13:14:33 UTC (rev 4785)
@@ -3984,11 +3984,7 @@
default:
{
- LONG RetVal;
- if(bHandleMediaKeys)
- {
- RetVal = Remote_HandleMsgs(hWnd, message, wParam, lParam, &bDone);
- }
+ LONG RetVal = Remote_HandleMsgs(hWnd, message, wParam, lParam, &bDone);
if(!bDone && SettingsMaster.IsValid())
{
RetVal = SettingsMaster->HandleSettingMsgs(hWnd, message, wParam, lParam, &bDone);
Modified: trunk/DScaler/DScaler/RemoteInput.cpp
===================================================================
--- trunk/DScaler/DScaler/RemoteInput.cpp 2012-03-15 17:53:55 UTC (rev 4784)
+++ trunk/DScaler/DScaler/RemoteInput.cpp 2012-04-02 13:14:33 UTC (rev 4785)
@@ -12,6 +12,8 @@
#ifdef WM_INPUT
DynamicFunctionS3<BOOL, PCRAWINPUTDEVICE, UINT, UINT> lpRegisterRawInputDevices(_T("user32.dll"), "RegisterRawInputDevices");
DynamicFunctionS5<UINT, HRAWINPUT, UINT, LPVOID ,PUINT, UINT> lpGetRawInputData(_T("user32.dll"), "GetRawInputData");
+DynamicFunctionS3<LRESULT, PRAWINPUT* ,INT ,UINT> lpDefRawInputProc(_T("user32,dll"), "DefRawInputProc");
+extern BOOL bHandleMediaKeys;
#endif
@@ -98,7 +100,7 @@
{
RAWINPUT* raw = (RAWINPUT*)lpb;
- if (raw->header.dwType == RIM_TYPEHID)
+ if (raw->header.dwType == RIM_TYPEHID && bHandleMediaKeys)
{
if(raw->data.hid.dwSizeHid == 2 && raw->data.hid.dwCount == 1)
{
@@ -144,6 +146,10 @@
}
}
}
+ if(!bHandled)
+ {
+ lpDefRawInputProc(&raw, 1, sizeof(RAWINPUTHEADER));
+ }
}
delete[] lpb;
@@ -155,7 +161,6 @@
}
else
{
- DefWindowProc(hWnd, WM_INPUT, wParam, lParam);
return TRUE;
}
}
@@ -178,7 +183,7 @@
}
#endif
#ifdef WM_APPCOMMAND
- if(message == WM_APPCOMMAND)
+ if(message == WM_APPCOMMAND && bHandleMediaKeys)
{
*bDone = TRUE;
return OnAppCommand(hWnd, wParam, lParam);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-03-15 17:54:06
|
Revision: 4784
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4784&view=rev
Author: adcockj
Date: 2012-03-15 17:53:55 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Update website address
Modified Paths:
--------------
trunk/DScaler5/Install/DScaler5.iss
Modified: trunk/DScaler5/Install/DScaler5.iss
===================================================================
--- trunk/DScaler5/Install/DScaler5.iss 2012-03-15 17:00:31 UTC (rev 4783)
+++ trunk/DScaler5/Install/DScaler5.iss 2012-03-15 17:53:55 UTC (rev 4784)
@@ -35,9 +35,9 @@
[Setup]
AppName=DScaler 5 Mpeg Decoders
AppVerName=DScaler 5 Mpeg Decoders
-AppPublisherURL=http://www.dscaler.org
-AppSupportURL=http://www.dscaler.org/phpBB/
-AppUpdatesURL=http://www.dscaler.org
+AppPublisherURL=http://www.dscaler.net
+AppSupportURL=http://www.dscaler.net/phpBB/
+AppUpdatesURL=http://www.dscaler.net
DefaultDirName={pf}\DScaler5
DefaultGroupName=DScaler5
AllowNoIcons=yes
@@ -70,8 +70,8 @@
Source: "..\Release\DScaler5.chm"; DestDir: "{app}"; Flags:;
[INI]
-Filename: "{app}\DScaler.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.dscaler.org"
-Filename: "{app}\Support.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.dscaler.org/phpBB/"
+Filename: "{app}\DScaler.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.dscaler.net"
+Filename: "{app}\Support.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.dscaler.net/phpBB/"
[Icons]
Name: "{group}\DScaler on the Web"; Filename: "{app}\DScaler.url"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-03-15 17:00:37
|
Revision: 4783
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4783&view=rev
Author: adcockj
Date: 2012-03-15 17:00:31 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Ignore failure to register filter when in per user mode
Modified Paths:
--------------
trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp
trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp
trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp
Modified: trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp
===================================================================
--- trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp 2012-03-15 16:17:49 UTC (rev 4782)
+++ trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp 2012-03-15 17:00:31 UTC (rev 4783)
@@ -123,7 +123,10 @@
HRESULT hr = RegisterFilter(CLSID_CDivxDecoder, L"DScaler MPEG4 Video Decoder", &RegInfo);
- CHECK(hr);
+ if(hr != E_ACCESSDENIED && UsePerUserRegistration)
+ {
+ CHECK(hr);
+ }
for(size_t i(0); i < InputTypes.size(); ++i)
{
Modified: trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp 2012-03-15 16:17:49 UTC (rev 4782)
+++ trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp 2012-03-15 17:00:31 UTC (rev 4783)
@@ -127,7 +127,10 @@
HRESULT hr = RegisterFilter(CLSID_CAudioDecoder, L"DScaler Audio Decoder", &RegInfo);
- CHECK(hr);
+ if(hr != E_ACCESSDENIED && UsePerUserRegistration)
+ {
+ CHECK(hr);
+ }
return ClassTableUpdateRegistry(GetThisInstance(), Classes, 0, FALSE, TRUE);
}
Modified: trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp 2012-03-15 16:17:49 UTC (rev 4782)
+++ trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp 2012-03-15 17:00:31 UTC (rev 4783)
@@ -103,7 +103,7 @@
HRESULT hr = RegisterFilter(CLSID_CMpegDecoder, L"DScaler Mpeg2 Video Decoder", &RegInfo);
- if(hr != E_ACCESSDENIED)
+ if(hr != E_ACCESSDENIED && UsePerUserRegistration)
{
CHECK(hr);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-03-15 16:18:00
|
Revision: 4782
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4782&view=rev
Author: adcockj
Date: 2012-03-15 16:17:49 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Add support for per user registration to allow a clean build without elevated permissions
Modified Paths:
--------------
trunk/DScaler5/Common/yacl/include/regtable.cpp
trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp
trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.def
trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo2008.vcproj
trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp
trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.def
trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio2008.vcproj
trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp
trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.def
trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo2008.vcproj
trunk/DScaler5/GenDMOProp/GenDMOProp.cpp
trunk/DScaler5/GenDMOProp/GenDMOProp.def
trunk/DScaler5/GenDMOProp/GenDMOProp2008.vcproj
Modified: trunk/DScaler5/Common/yacl/include/regtable.cpp
===================================================================
--- trunk/DScaler5/Common/yacl/include/regtable.cpp 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/Common/yacl/include/regtable.cpp 2012-03-15 16:17:49 UTC (rev 4782)
@@ -49,6 +49,7 @@
return err;
}
+static BOOL UsePerUserRegistration = FALSE;
// the routine that inserts/deletes Registry keys based on the table
EXTERN_C HRESULT STDAPICALLTYPE
@@ -92,9 +93,20 @@
const char *pszValue = (pEntries->pszValue != REG_MODULE_NAME) ? pEntries->pszValue : szModuleName;
if (pEntries->hkeyRoot)
{
- hkeyRoot = pEntries->hkeyRoot;
- lstrcpyA(szKey, pEntries->pszKey);
- lstrcpyA(szFullKey, pEntries->pszKey);
+ if(UsePerUserRegistration && pEntries->hkeyRoot == HKEY_CLASSES_ROOT)
+ {
+ hkeyRoot = HKEY_CURRENT_USER;
+ lstrcpyA(szKey, "Software\\Classes\\");
+ lstrcpyA(szFullKey, "Software\\Classes\\");
+ lstrcatA(szKey, pEntries->pszKey);
+ lstrcatA(szFullKey, pEntries->pszKey);
+ }
+ else
+ {
+ hkeyRoot = pEntries->hkeyRoot;
+ lstrcpyA(szKey, pEntries->pszKey);
+ lstrcpyA(szFullKey, pEntries->pszKey);
+ }
}
else
{
Modified: trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp
===================================================================
--- trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.cpp 2012-03-15 16:17:49 UTC (rev 4782)
@@ -142,3 +142,35 @@
CHECK(hr);
return ClassTableUpdateRegistry(GetThisInstance(), Classes, 0, FALSE, FALSE);
}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// DllInstall - Adds support for per user registration
+
+STDAPI DllInstall(BOOL bInstall, LPCWSTR pszCmdLine)
+{
+ HRESULT hr = E_FAIL;
+ static const wchar_t szUserSwitch[] = L"user";
+
+ if (pszCmdLine != NULL)
+ {
+ if (_wcsnicmp(pszCmdLine, szUserSwitch, _countof(szUserSwitch)) == 0)
+ {
+ UsePerUserRegistration = true;
+ }
+ }
+
+ if (bInstall)
+ {
+ hr = DllRegisterServer();
+ if (FAILED(hr))
+ {
+ DllUnregisterServer();
+ }
+ }
+ else
+ {
+ hr = DllUnregisterServer();
+ }
+ return hr;
+}
Modified: trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.def
===================================================================
--- trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.def 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo.def 2012-03-15 16:17:49 UTC (rev 4782)
@@ -7,3 +7,4 @@
DllGetClassObject PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE
+ DllInstall PRIVATE
Modified: trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo2008.vcproj
===================================================================
--- trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo2008.vcproj 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo2008.vcproj 2012-03-15 16:17:49 UTC (rev 4782)
@@ -73,6 +73,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalOptions="/LTCG"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
@@ -160,6 +161,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalOptions="/LTCG"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
@@ -244,6 +246,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
ModuleDefinitionFile=".\DivxVideo.def"
@@ -328,6 +331,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
ModuleDefinitionFile=".\DivxVideo.def"
Modified: trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.cpp 2012-03-15 16:17:49 UTC (rev 4782)
@@ -141,4 +141,33 @@
return ClassTableUpdateRegistry(GetThisInstance(), Classes, 0, FALSE, FALSE);
}
+/////////////////////////////////////////////////////////////////////////////
+// DllInstall - Adds support for per user registration
+STDAPI DllInstall(BOOL bInstall, LPCWSTR pszCmdLine)
+{
+ HRESULT hr = E_FAIL;
+ static const wchar_t szUserSwitch[] = L"user";
+
+ if (pszCmdLine != NULL)
+ {
+ if (_wcsnicmp(pszCmdLine, szUserSwitch, _countof(szUserSwitch)) == 0)
+ {
+ UsePerUserRegistration = true;
+ }
+ }
+
+ if (bInstall)
+ {
+ hr = DllRegisterServer();
+ if (FAILED(hr))
+ {
+ DllUnregisterServer();
+ }
+ }
+ else
+ {
+ hr = DllUnregisterServer();
+ }
+ return hr;
+}
Modified: trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.def
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.def 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio.def 2012-03-15 16:17:49 UTC (rev 4782)
@@ -5,3 +5,4 @@
DllGetClassObject PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE
+ DllInstall PRIVATE
Modified: trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio2008.vcproj
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio2008.vcproj 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/Filters/Decoders/MpegAudio/MpegAudio2008.vcproj 2012-03-15 16:17:49 UTC (rev 4782)
@@ -72,6 +72,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
@@ -159,6 +160,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
@@ -243,6 +245,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
@@ -328,6 +331,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
@@ -410,6 +414,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
@@ -493,6 +498,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
@@ -577,6 +583,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
@@ -662,6 +669,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib avcodec-52.lib avutil-50.lib"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
@@ -698,21 +706,26 @@
<References>
<ProjectReference
ReferencedProjectIdentifier="{FB15DBB5-C9F1-4D23-B8C5-F8291DEA6826}"
+ RelativePathToProject=".\Filters\Decoders\MpegAudio\djbfft\djbfft2008.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{F4892194-4D03-4CAC-85C0-351DCE97B1A8}"
+ RelativePathToProject=".\Filters\Filter_Lib\Filter_Lib2008.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{0F39947C-180A-48C7-B5DE-454B968ADEB6}"
+ RelativePathToProject=".\GenDMOProp\GenDMOProp2008.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{DABBA817-B2FC-49AA-B872-2AAFAE560337}"
/>
<ProjectReference
ReferencedProjectIdentifier="{68876F9C-E66B-40CE-A590-58FDCE7B8CCB}"
+ RelativePathToProject=".\Filters\Decoders\MpegAudio\dtsdec\vc++\libdts2008.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{74462BDC-197C-4142-9AAB-64BD2DA9B257}"
+ RelativePathToProject=".\Filters\Decoders\MpegAudio\libmad\msvc++\libmad2008.vcproj"
/>
</References>
<Files>
Modified: trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.cpp 2012-03-15 16:17:49 UTC (rev 4782)
@@ -103,7 +103,10 @@
HRESULT hr = RegisterFilter(CLSID_CMpegDecoder, L"DScaler Mpeg2 Video Decoder", &RegInfo);
- CHECK(hr);
+ if(hr != E_ACCESSDENIED)
+ {
+ CHECK(hr);
+ }
return ClassTableUpdateRegistry(GetThisInstance(), Classes, 0, FALSE, TRUE);
}
@@ -117,4 +120,33 @@
return ClassTableUpdateRegistry(GetThisInstance(), Classes, 0, FALSE, FALSE);
}
+/////////////////////////////////////////////////////////////////////////////
+// DllInstall - Adds support for per user registration
+STDAPI DllInstall(BOOL bInstall, LPCWSTR pszCmdLine)
+{
+ HRESULT hr = E_FAIL;
+ static const wchar_t szUserSwitch[] = L"user";
+
+ if (pszCmdLine != NULL)
+ {
+ if (_wcsnicmp(pszCmdLine, szUserSwitch, _countof(szUserSwitch)) == 0)
+ {
+ UsePerUserRegistration = true;
+ }
+ }
+
+ if (bInstall)
+ {
+ hr = DllRegisterServer();
+ if (FAILED(hr))
+ {
+ DllUnregisterServer();
+ }
+ }
+ else
+ {
+ hr = DllUnregisterServer();
+ }
+ return hr;
+}
Modified: trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.def
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.def 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo.def 2012-03-15 16:17:49 UTC (rev 4782)
@@ -7,3 +7,4 @@
DllGetClassObject PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE
+ DllInstall PRIVATE
Modified: trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo2008.vcproj
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo2008.vcproj 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo2008.vcproj 2012-03-15 16:17:49 UTC (rev 4782)
@@ -73,6 +73,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib"
OutputFile="..\..\..\Release/MpegVideo.dll"
ModuleDefinitionFile=".\MpegVideo.def"
@@ -161,6 +162,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib"
ModuleDefinitionFile=".\MpegVideo.def"
GenerateDebugInformation="true"
@@ -248,6 +250,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib"
OutputFile="..\..\..\Debug/MpegVideo.dll"
ModuleDefinitionFile=".\MpegVideo.def"
@@ -338,6 +341,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib Rpcrt4.lib dmoguids.lib msdmo.lib strmiids.lib"
ModuleDefinitionFile=".\MpegVideo.def"
GenerateDebugInformation="true"
Modified: trunk/DScaler5/GenDMOProp/GenDMOProp.cpp
===================================================================
--- trunk/DScaler5/GenDMOProp/GenDMOProp.cpp 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/GenDMOProp/GenDMOProp.cpp 2012-03-15 16:17:49 UTC (rev 4782)
@@ -87,3 +87,35 @@
{
return ClassTableUpdateRegistry(GetThisInstance(), Classes, 0, FALSE, FALSE);
}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// DllInstall - Adds support for per user registration
+
+STDAPI DllInstall(BOOL bInstall, LPCWSTR pszCmdLine)
+{
+ HRESULT hr = E_FAIL;
+ static const wchar_t szUserSwitch[] = L"user";
+
+ if (pszCmdLine != NULL)
+ {
+ if (_wcsnicmp(pszCmdLine, szUserSwitch, _countof(szUserSwitch)) == 0)
+ {
+ UsePerUserRegistration = true;
+ }
+ }
+
+ if (bInstall)
+ {
+ hr = DllRegisterServer();
+ if (FAILED(hr))
+ {
+ DllUnregisterServer();
+ }
+ }
+ else
+ {
+ hr = DllUnregisterServer();
+ }
+ return hr;
+}
Modified: trunk/DScaler5/GenDMOProp/GenDMOProp.def
===================================================================
--- trunk/DScaler5/GenDMOProp/GenDMOProp.def 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/GenDMOProp/GenDMOProp.def 2012-03-15 16:17:49 UTC (rev 4782)
@@ -7,3 +7,4 @@
DllGetClassObject PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE
+ DllInstall PRIVATE
Modified: trunk/DScaler5/GenDMOProp/GenDMOProp2008.vcproj
===================================================================
--- trunk/DScaler5/GenDMOProp/GenDMOProp2008.vcproj 2012-03-13 18:08:19 UTC (rev 4781)
+++ trunk/DScaler5/GenDMOProp/GenDMOProp2008.vcproj 2012-03-15 16:17:49 UTC (rev 4782)
@@ -74,6 +74,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib gdi32.lib Dmoguids.lib"
ModuleDefinitionFile=".\GenDMOProp.def"
GenerateDebugInformation="true"
@@ -162,6 +163,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib gdi32.lib Dmoguids.lib"
ModuleDefinitionFile=".\GenDMOProp.def"
GenerateDebugInformation="true"
@@ -248,6 +250,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib gdi32.lib Dmoguids.lib"
IgnoreDefaultLibraryNames=""
ModuleDefinitionFile=".\GenDMOProp.def"
@@ -338,6 +341,7 @@
<Tool
Name="VCLinkerTool"
RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="user32.lib advapi32.lib ole32.lib oleaut32.lib gdi32.lib Dmoguids.lib"
IgnoreDefaultLibraryNames=""
ModuleDefinitionFile=".\GenDMOProp.def"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-03-13 18:08:29
|
Revision: 4781
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4781&view=rev
Author: adcockj
Date: 2012-03-13 18:08:19 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
Change the guid on the divx project to avoid clash with mpeg video
Modified Paths:
--------------
trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo2008.vcproj
Modified: trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo2008.vcproj
===================================================================
--- trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo2008.vcproj 2012-03-13 17:52:43 UTC (rev 4780)
+++ trunk/DScaler5/Filters/Decoders/DivxVideo/DivxVideo2008.vcproj 2012-03-13 18:08:19 UTC (rev 4781)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="9.00"
Name="DivxVideo"
- ProjectGUID="{514BBF2F-B9E5-4D01-94DE-563236588058}"
+ ProjectGUID="{8E42771A-E254-45D2-BF0F-30E5D0B6BC4F}"
RootNamespace="DivxVideo"
TargetFrameworkVersion="131072"
>
@@ -362,9 +362,11 @@
<References>
<ProjectReference
ReferencedProjectIdentifier="{F4892194-4D03-4CAC-85C0-351DCE97B1A8}"
+ RelativePathToProject=".\Filters\Filter_Lib\Filter_Lib2008.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{0F39947C-180A-48C7-B5DE-454B968ADEB6}"
+ RelativePathToProject=".\GenDMOProp\GenDMOProp2008.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{27FBB7F9-58EE-4362-9B6E-AE35785C5B2C}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-03-13 17:52:49
|
Revision: 4780
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4780&view=rev
Author: adcockj
Date: 2012-03-13 17:52:43 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
Start merging in kzeuh's IVTC mod code
Modified Paths:
--------------
trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo2008.vcproj
Added Paths:
-----------
trunk/DScaler5/Filters/Decoders/MpegVideo/MpegDecoder_IVTC.cpp
Added: trunk/DScaler5/Filters/Decoders/MpegVideo/MpegDecoder_IVTC.cpp
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegVideo/MpegDecoder_IVTC.cpp (rev 0)
+++ trunk/DScaler5/Filters/Decoders/MpegVideo/MpegDecoder_IVTC.cpp 2012-03-13 17:52:43 UTC (rev 4780)
@@ -0,0 +1,182 @@
+///////////////////////////////////////////////////////////////////////////////
+// $Id: MpegDecoder_UserData.cpp 4553 2009-03-26 17:07:03Z adcockj $
+///////////////////////////////////////////////////////////////////////////////
+// MpegVideo.dll - DirectShow filter for deinterlacing and video processing
+// Copyright (c) 2004 John Adcock
+///////////////////////////////////////////////////////////////////////////////
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+///////////////////////////////////////////////////////////////////////////////
+
+// this file is based on the DScaler 5 IVTC mod by kzeuh
+
+#include "stdafx.h"
+#include "resource.h"
+#include "MpegDecoder.h"
+
+// plan for IVTC
+//
+// allow support of interlaced fields in VideoData structure
+// move across detection loop
+// move across similar field detection
+// create history of similarity and only detect if pattern is there after no being there
+// so under movement only
+
+// so detection gives a IVTC state
+// if 1 skip
+// if 2 blend with previous
+
+// open questions
+// 720p removal of 3:2 judder requires 2 frame history
+
+// design of ivtc object
+// reset() start again
+// newField(field/frame, isTop)
+// newFrame(frame)
+// getVideoData
+
+// sequence of 3:2 is
+// AA AB BC CC DD
+// 0, 1, 2, 3, 4
+// where first is top second is bottom
+// number is index
+
+
+#ifdef NEVER
+// Inverse Telecine Processor on "hard" 3:2 film content added by Kzeuh
+DWORD CMpegDecoder::AreSameFields(CFrameBuffer *fr1, CFrameBuffer *fr2, bool bTop, signed long dwCycleNo)
+{
+ DWORD dwErrors = 0;
+ DWORD dwRowCount = 0;
+ DWORD dwSumErrors =0;
+ DWORD dwOverflow = 0;
+ DWORD dwSumPeaks = 0;
+ BYTE *prow1 = NULL;
+ BYTE *prow2 = NULL;
+ DWORD dwYStep = 0;
+ DWORD dwXStep = 0;
+ DWORD dwMaxPeaks =0;
+ DWORD dwPeak=0;
+ float RV_MUL = .40f;
+ float RH_MUL = .30f;
+
+
+
+ if(dwCycleNo < 0)
+ {
+ dwXStep = 1;
+ dwYStep = 2;
+
+ dwMaxPeaks = 250;
+ dwPeak = 30;
+ RV_MUL = .10f;
+ RH_MUL = .10f;
+ }
+ else
+ {
+ if(dwCycleNo == 0)
+ {
+ // as long as no sync has been established expect a very accurate match
+ dwXStep = 1;
+ dwYStep = 2;
+ dwMaxPeaks = (int)(100*(1-RV_MUL)*(1-RH_MUL)); // 500;
+ dwPeak = 30;
+ }
+ else
+ {
+ if(dwCycleNo <=12)
+ {
+ // during the next two seconds following the sync, expect still a high level
+ // of matching to ensure the sync was not made by mystake
+ // (eg. not established on non moving interlaced pictures)
+ dwXStep = 4;
+ dwYStep = 4;
+ dwMaxPeaks = (int)(500*(1-RV_MUL)*(1-RH_MUL)); //500
+ dwPeak = 30;
+ }
+ else
+ {
+ // after that be tolerant enough to ignore errors made by the encoder,
+ // but not too tolerant to be able to detect obvious video content
+
+ dwXStep = 4;
+ dwYStep = 16;
+ dwMaxPeaks = (int)(600*(1-RV_MUL)*(1-RH_MUL)); //600
+ dwPeak = 30;
+ }
+ }
+ if(m_OutputHeight!=1080 || m_InternalPitch!=1920)
+ {
+ dwMaxPeaks = (DWORD) ((double) dwMaxPeaks * ((double) m_OutputHeight * (double) m_InternalPitch)/ ((double) 1080 * (double) 1920));
+ }
+ }
+
+
+ int rw_v_start=2+((int)(m_OutputHeight*RV_MUL)/2)&0xfffffffe;
+ int rw_v_end=m_OutputHeight-rw_v_start;
+ int rw_h_start=((int)(m_InternalPitch*RH_MUL)/2)&0xfffffff0;
+ int rw_h_end=m_InternalPitch-rw_h_start;
+
+
+
+ //for (int i = 2; i < m_OutputHeight; i+= dwYStep)
+ for (int i = rw_v_start; i < rw_v_end; i+= dwYStep)
+ {
+
+ if(bTop)
+ {
+ prow1 = fr1->m_Buf[0] + i*m_InternalPitch;
+ prow2 = fr2->m_Buf[0] + i*m_InternalPitch;
+ }
+ else
+ {
+ prow1 = fr1->m_Buf[0] + (i+1)*m_InternalPitch;
+ prow2 = fr2->m_Buf[0] + (i+1)*m_InternalPitch;
+ }
+ if(dwXStep >=2)
+ {
+ if (i % (2 * dwYStep) == 0)
+ {
+ prow1 =prow1 + dwXStep/2;
+ prow2 =prow2 + dwXStep/2;
+ }
+ }
+
+
+ //for(int j = 0; j< m_InternalPitch; j+=dwXStep)
+ for(int j = rw_h_start; j<rw_h_end; j+=dwXStep)
+ {
+ dwErrors = abs(*(prow1+j) - *(prow2+j));
+ dwSumErrors += dwErrors;
+ if(dwErrors >dwPeak)
+ {
+ if(++dwOverflow>dwMaxPeaks) return 2;
+ dwSumPeaks+=dwErrors;
+ }
+ }
+ dwRowCount++;
+ }
+
+ if(( dwOverflow >10 && ( (dwSumPeaks / dwOverflow)>(dwPeak + 15) ) ) )
+ {
+ if(dwCycleNo < 0)
+ return 1;
+ }
+ if( ( (double) dwSumErrors / ((double) dwRowCount * (double) m_InternalPitch / (double) dwXStep)) > 10)
+ return 2;
+
+ return 0;
+}
+
+#endif
\ No newline at end of file
Modified: trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo2008.vcproj
===================================================================
--- trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo2008.vcproj 2012-02-25 16:42:15 UTC (rev 4779)
+++ trunk/DScaler5/Filters/Decoders/MpegVideo/MpegVideo2008.vcproj 2012-03-13 17:52:43 UTC (rev 4780)
@@ -385,6 +385,10 @@
>
</File>
<File
+ RelativePath=".\MpegDecoder_IVTC.cpp"
+ >
+ </File>
+ <File
RelativePath="MpegDecoder_Rate.cpp"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-02-25 16:42:21
|
Revision: 4779
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4779&view=rev
Author: adcockj
Date: 2012-02-25 16:42:15 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Update Version
Modified Paths:
--------------
trunk/DScaler/Api/DScalerVersion.h
trunk/DScaler/Help/DScaler_Readme.htm
trunk/DScaler/Help/News.htm
Modified: trunk/DScaler/Api/DScalerVersion.h
===================================================================
--- trunk/DScaler/Api/DScalerVersion.h 2012-02-25 16:37:14 UTC (rev 4778)
+++ trunk/DScaler/Api/DScalerVersion.h 2012-02-25 16:42:15 UTC (rev 4779)
@@ -21,7 +21,7 @@
// should be updated before each release
#define DSCALERVERSION_MAJOR 4
#define DSCALERVERSION_MINOR 2
-#define DSCALERVERSION_REVISION 0
+#define DSCALERVERSION_REVISION 1
// need to have an extra macro for stingify otherwise we get the
// name of the definition not the value
Modified: trunk/DScaler/Help/DScaler_Readme.htm
===================================================================
--- trunk/DScaler/Help/DScaler_Readme.htm 2012-02-25 16:37:14 UTC (rev 4778)
+++ trunk/DScaler/Help/DScaler_Readme.htm 2012-02-25 16:42:15 UTC (rev 4779)
@@ -54,7 +54,7 @@
<tr>
<td colspan="3"><!-- #BeginEditable "Text" -->
-<h1>DScaler - version 4.2.0</h1>
+<h1>DScaler - version 4.2.1</h1>
<h2>What's New</h2>
Modified: trunk/DScaler/Help/News.htm
===================================================================
--- trunk/DScaler/Help/News.htm 2012-02-25 16:37:14 UTC (rev 4778)
+++ trunk/DScaler/Help/News.htm 2012-02-25 16:42:15 UTC (rev 4779)
@@ -54,8 +54,17 @@
<tr>
<td colspan="3"><!-- #BeginEditable "Text" -->
-<h1>DScaler - version 4.2.0</h1>
+<h1>DScaler - version 4.2.1</h1>
+<h2>What's new (since 4.2.0):</h2>
+
+<h3>General</h3>
+<p><ul>
+<li>New setting to control if DScaler responds to media keys.</li>
+<li>POssible fix for overlay failing (also added improved logging to
+help diagnose)</li>
+</ul></p>
+
<h2>What's new (since 4.1.19):</h2>
<h3>General</h3>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-02-25 16:37:20
|
Revision: 4778
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4778&view=rev
Author: adcockj
Date: 2012-02-25 16:37:14 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
make new media key handling setting visible in UI
Modified Paths:
--------------
trunk/DScaler/DScaler/DScaler.cpp
Modified: trunk/DScaler/DScaler/DScaler.cpp
===================================================================
--- trunk/DScaler/DScaler/DScaler.cpp 2012-02-25 15:37:56 UTC (rev 4777)
+++ trunk/DScaler/DScaler/DScaler.cpp 2012-02-25 16:37:14 UTC (rev 4778)
@@ -6158,6 +6158,7 @@
Holder->AddSettings(&DScalerSettings[SCREENSAVEROFF], 1);
Holder->AddSettings(&DScalerSettings[SINGLEKEYTELETEXTTOGGLE], 1);
Holder->AddSettings(&DScalerSettings[MINIMIZEHANDLING], 1);
+ Holder->AddSettings(&DScalerSettings[HANDLEMEDIAKEYS], 1);
return Holder;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-02-25 15:38:02
|
Revision: 4777
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4777&view=rev
Author: adcockj
Date: 2012-02-25 15:37:56 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Add settings for enable/disabling handling of media keys (feature requested on forums)
Modified Paths:
--------------
trunk/DScaler/Api/DS_Control.h
trunk/DScaler/DScaler/DScaler.cpp
Modified: trunk/DScaler/Api/DS_Control.h
===================================================================
--- trunk/DScaler/Api/DS_Control.h 2012-02-25 15:32:39 UTC (rev 4776)
+++ trunk/DScaler/Api/DS_Control.h 2012-02-25 15:37:56 UTC (rev 4777)
@@ -392,6 +392,7 @@
CHANNELPREVIEWWNBCOLS,
CHANNELPREVIEWNBROWS,
OUTPUTMETHOD,
+ HANDLEMEDIAKEYS,
DSCALER_SETTING_LASTONE,
} DSCALER_SETTING;
Modified: trunk/DScaler/DScaler/DScaler.cpp
===================================================================
--- trunk/DScaler/DScaler/DScaler.cpp 2012-02-25 15:32:39 UTC (rev 4776)
+++ trunk/DScaler/DScaler/DScaler.cpp 2012-02-25 15:37:56 UTC (rev 4777)
@@ -148,6 +148,7 @@
BOOL bVTAntiAlias = FALSE;
BOOL bMinimized = FALSE;
BOOL bReverseChannelScroll = FALSE;
+BOOL bHandleMediaKeys = TRUE;
BOOL bMinToTray = FALSE;
BOOL bIconOn = FALSE;
@@ -3983,7 +3984,11 @@
default:
{
- LONG RetVal = Remote_HandleMsgs(hWnd, message, wParam, lParam, &bDone);
+ LONG RetVal;
+ if(bHandleMediaKeys)
+ {
+ RetVal = Remote_HandleMsgs(hWnd, message, wParam, lParam, &bDone);
+ }
if(!bDone && SettingsMaster.IsValid())
{
RetVal = SettingsMaster->HandleSettingMsgs(hWnd, message, wParam, lParam, &bDone);
@@ -6102,7 +6107,12 @@
OutputMethodNames,
"MainWindow", "OutputMethod", NULL,
},
-
+ {
+ "Process Media Keys", ONOFF, 0, (LONG_PTR*)&bHandleMediaKeys,
+ TRUE, 0, 1, 1, 1,
+ NULL,
+ "MainWindow", "HandleMediaKeys", NULL,
+ },
};
SETTING* DScaler_GetSetting(DSCALER_SETTING Setting)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-02-25 15:32:46
|
Revision: 4776
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4776&view=rev
Author: adcockj
Date: 2012-02-25 15:32:39 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Possible fixes for issues with overlay reported on forum by Julian
Modified Paths:
--------------
trunk/DScaler/DScaler/OverlayOutput.cpp
trunk/DScaler/DScaler/OverlayOutput.h
Modified: trunk/DScaler/DScaler/OverlayOutput.cpp
===================================================================
--- trunk/DScaler/DScaler/OverlayOutput.cpp 2012-02-18 16:00:29 UTC (rev 4775)
+++ trunk/DScaler/DScaler/OverlayOutput.cpp 2012-02-25 15:32:39 UTC (rev 4776)
@@ -47,7 +47,7 @@
MONITORINFO MonInfo;
LPDIRECTDRAW lpDD;
- if (NbMonitors == MAX_MONITORS)
+ if (NbMonitors == MAX_DSCALER_MONITORS)
return DDENUMRET_CANCEL;
// DirectDrawEnumerateEx returns hMonitor = NULL on single monitor configuration
@@ -58,7 +58,7 @@
{
hMonitor = OverlayOutputInstance.m_lpMonitorFromWindow(NULL, MONITOR_DEFAULTTOPRIMARY);
}
- LOG(2, _T("Monitor %d %s %s"), hMonitor, pszDesc, pszDriverName);
+ LOG(0, _T("Monitor %d %s %s"), hMonitor, pszDesc, pszDriverName);
// and therefore test if we found again the same monitor !
for (int i = 0; i < NbMonitors; i++)
@@ -91,13 +91,17 @@
static DynamicFunctionS3<HRESULT, LPDDENUMCALLBACKEX, LPVOID, DWORD> lpDDEnumEx(_T("ddraw.dll"), ADD_API_LETTER(DirectDrawEnumerateEx));
BOOL RetVal = TRUE;
+ NbMonitors = 0;
+
// Retrieve the function from the DirectDraw DLL
if (lpDDEnumEx)
{
// If the function is there, call it to enumerate all display
// devices attached to the desktop
- if(lpDDEnumEx(DDEnumCallbackEx, NULL, DDENUM_ATTACHEDSECONDARYDEVICES) != DD_OK)
+ HRESULT hr = lpDDEnumEx(DDEnumCallbackEx, NULL, DDENUM_ATTACHEDSECONDARYDEVICES);
+ if(hr != DD_OK)
{
+ LOG(0, _T("DDEnumEx failed %08x"), hr);
RetVal = FALSE;
}
}
@@ -117,7 +121,7 @@
if (FAILED(m_lpDirectDrawCreate(NULL, &lpDD, NULL)))
{
ErrorBox(_T("DirectDrawCreate failed"));
- return (FALSE);
+ return NULL;
}
return lpDD;
}
@@ -132,7 +136,16 @@
return Monitors[i].lpDD;
}
}
- return NULL;
+
+ LOG(0, _T("Couldn't find correct monitor"));
+
+ // fall back to standard DD create
+ if (FAILED(m_lpDirectDrawCreate(NULL, &lpDD, NULL)))
+ {
+ ErrorBox(_T("DirectDrawCreate failed"));
+ return NULL;
+ }
+ return lpDD;
}
//-----------------------------------------------------------------------------
Modified: trunk/DScaler/DScaler/OverlayOutput.h
===================================================================
--- trunk/DScaler/DScaler/OverlayOutput.h 2012-02-18 16:00:29 UTC (rev 4775)
+++ trunk/DScaler/DScaler/OverlayOutput.h 2012-02-25 15:32:39 UTC (rev 4776)
@@ -25,8 +25,8 @@
HMONITOR hMon;
LPDIRECTDRAW lpDD;
} TMonitor;
-#define MAX_MONITORS 4
-static TMonitor Monitors[MAX_MONITORS];
+#define MAX_DSCALER_MONITORS 16
+static TMonitor Monitors[MAX_DSCALER_MONITORS];
static int NbMonitors=0;
static HMONITOR hCurrentMon=0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-02-18 16:00:35
|
Revision: 4775
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4775&view=rev
Author: adcockj
Date: 2012-02-18 16:00:29 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
Update to allow building of driver without new memory code for nt4 comapatibity
Modified Paths:
--------------
trunk/DScaler/Driver/DSDrvNT/Ioclass.cpp
trunk/DScaler/Driver/DSDrvNT/sources
trunk/DScaler/Release/DSDrv4nt4.sys
Modified: trunk/DScaler/Driver/DSDrvNT/Ioclass.cpp
===================================================================
--- trunk/DScaler/Driver/DSDrvNT/Ioclass.cpp 2012-02-14 20:57:14 UTC (rev 4774)
+++ trunk/DScaler/Driver/DSDrvNT/Ioclass.cpp 2012-02-18 16:00:29 UTC (rev 4775)
@@ -768,8 +768,10 @@
}
else if(dwFlags & ALLOC_MEMORY_IN_DRIVER_LESS4GB)
{
+#ifndef NT4_BUILD
ntStatus = allocMemoryBelow4GB(ulLength, node, pMemStruct);
if(ntStatus != STATUS_SUCCESS && retryNextMode)
+#endif
{
pMemStruct->dwFlags = pMemStruct->dwFlags = ALLOC_MEMORY_CONTIG;
ntStatus = allocMemoryContig(ulLength, node, pMemStruct, above4G);
@@ -780,8 +782,10 @@
ntStatus = allocMemoryUserSupplied(ulLength, node, pUserAddress, pMemStruct, above4G);
if(ntStatus != STATUS_SUCCESS && retryNextMode)
{
+#ifndef NT4_BUILD
node->dwFlags = pMemStruct->dwFlags = ALLOC_MEMORY_IN_DRIVER_LESS4GB;
ntStatus = allocMemoryBelow4GB(ulLength, node, pMemStruct);
+#endif
if(ntStatus != STATUS_SUCCESS)
{
node->dwFlags = pMemStruct->dwFlags = ALLOC_MEMORY_CONTIG;
@@ -878,6 +882,7 @@
ntStatus = STATUS_SUCCESS;
+#ifndef NT4_BUILD
PHYSICAL_ADDRESS highestAcceptableAddress;
PHYSICAL_ADDRESS zero;
@@ -927,6 +932,7 @@
debugOut(dbTrace,"node->dwUserAddress 0x%IX", node->pUserAddress);
debugOut(dbTrace,"Pages %d", (node->pMdl->Size - sizeof(MDL))/4);
}
+#endif
return ntStatus;
}
Modified: trunk/DScaler/Driver/DSDrvNT/sources
===================================================================
--- trunk/DScaler/Driver/DSDrvNT/sources 2012-02-14 20:57:14 UTC (rev 4774)
+++ trunk/DScaler/Driver/DSDrvNT/sources 2012-02-18 16:00:29 UTC (rev 4775)
@@ -5,8 +5,13 @@
!elseif "$(_BUILDARCH)" == "IA64"
TARGETNAME=..\..\..\..\Release\DSDrv4IA64
!else
+!if "$(TARGET)" == "NT4"
+C_DEFINES=$(C_DEFINES) -DNT4_BUILD
+TARGETNAME=..\..\..\..\Release\DSDrv4nt4
+!else
TARGETNAME=..\..\..\..\Release\DSDrv4
!endif
+!endif
INCLUDES=..\..\Api
LINKER_FLAGS=-MAP
Modified: trunk/DScaler/Release/DSDrv4nt4.sys
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ds...@us...> - 2012-02-14 20:57:20
|
Revision: 4774
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4774&view=rev
Author: dscaler
Date: 2012-02-14 20:57:14 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
update webup.sh with new project web location
Modified Paths:
--------------
trunk/htdocs/scripts/webup.sh
Modified: trunk/htdocs/scripts/webup.sh
===================================================================
--- trunk/htdocs/scripts/webup.sh 2012-02-14 20:53:00 UTC (rev 4773)
+++ trunk/htdocs/scripts/webup.sh 2012-02-14 20:57:14 UTC (rev 4774)
@@ -28,5 +28,5 @@
#After the first run, merely have SVN update the already checked out directory
-cd /home/groups/d/de/deinterlace/htdocs
+cd /home/project-web/deinterlace/htdocs
svn update
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-02-14 20:53:08
|
Revision: 4773
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4773&view=rev
Author: adcockj
Date: 2012-02-14 20:53:00 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Update donation page after recent donation
Modified Paths:
--------------
trunk/htdocs/donate.htm
Modified: trunk/htdocs/donate.htm
===================================================================
--- trunk/htdocs/donate.htm 2012-02-04 13:32:07 UTC (rev 4772)
+++ trunk/htdocs/donate.htm 2012-02-14 20:53:00 UTC (rev 4773)
@@ -102,7 +102,10 @@
<p>The following have kindly contributed to the project:</p>
+ <p><a href="http://drugrehabflorida.co/">Drug Rehab Florida</a></p>
+
<p>Jamie Sarner a <a href="http://jamiesarner.com/">Toronto Realtor</a></p>
+
<p>Julie Kinnear from <a href="http://juliekinnear.com/">Toronto MLS Listings</a></p>
<p>David Tsegai from <a href="http://calgaryrealestate.ca/">Calgary Real Estate</a></p>
<p>Lorne Marr from <a href="http://lsminsurance.ca/">Life Insurance Canada</a></p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-02-04 13:32:13
|
Revision: 4772
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4772&view=rev
Author: adcockj
Date: 2012-02-04 13:32:07 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Add support for per user registration and disable registration a dsfilter to avoid needing to run as admin when compiling
Modified Paths:
--------------
trunk/DScaler/DSRend/DSRend.cpp
trunk/DScaler/DSRend/DSRend.def
trunk/DScaler/DSRend/DSRend2008.vcproj
Modified: trunk/DScaler/DSRend/DSRend.cpp
===================================================================
--- trunk/DScaler/DSRend/DSRend.cpp 2012-02-04 13:30:17 UTC (rev 4771)
+++ trunk/DScaler/DSRend/DSRend.cpp 2012-02-04 13:32:07 UTC (rev 4772)
@@ -114,8 +114,9 @@
if(FAILED(hr))
return hr;
- //register filter as a directshow filter
- hr=pMapper->RegisterFilter(CLSID_DSRendFilter,g_wszName,NULL,&CLSID_LegacyAmFilterCategory,NULL,®Filter2);
+ // no need to register as a filter
+ // register filter as a directshow filter
+ //hr=pMapper->RegisterFilter(CLSID_DSRendFilter,g_wszName,NULL,&CLSID_LegacyAmFilterCategory,NULL,®Filter2);
return hr;
}
@@ -134,3 +135,34 @@
return _Module.UnregisterServer(TRUE);
}
+
+// DllInstall - Adds/Removes entries to the system registry per user
+// per machine.
+STDAPI DllInstall(BOOL bInstall, LPCWSTR pszCmdLine)
+{
+ HRESULT hr = E_FAIL;
+ static const wchar_t szUserSwitch[] = _T("user");
+
+ if (pszCmdLine != NULL)
+ {
+ if (_wcsnicmp(pszCmdLine, szUserSwitch, _countof(szUserSwitch)) == 0)
+ {
+ AtlSetPerUserRegistration(true);
+ }
+ }
+
+ if (bInstall)
+ {
+ hr = DllRegisterServer();
+ if (FAILED(hr))
+ {
+ DllUnregisterServer();
+ }
+ }
+ else
+ {
+ hr = DllUnregisterServer();
+ }
+
+ return hr;
+}
Modified: trunk/DScaler/DSRend/DSRend.def
===================================================================
--- trunk/DScaler/DSRend/DSRend.def 2012-02-04 13:30:17 UTC (rev 4771)
+++ trunk/DScaler/DSRend/DSRend.def 2012-02-04 13:32:07 UTC (rev 4772)
@@ -7,3 +7,4 @@
DllGetClassObject PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE
+ DllInstall PRIVATE
Modified: trunk/DScaler/DSRend/DSRend2008.vcproj
===================================================================
--- trunk/DScaler/DSRend/DSRend2008.vcproj 2012-02-04 13:30:17 UTC (rev 4771)
+++ trunk/DScaler/DSRend/DSRend2008.vcproj 2012-02-04 13:32:07 UTC (rev 4772)
@@ -35,9 +35,9 @@
/>
<Tool
Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(OutDir)\regsvr32.trg"
+ Description=""
+ CommandLine=""
+ Outputs=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -75,6 +75,8 @@
/>
<Tool
Name="VCLinkerTool"
+ RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="UnicoWS.lib odbc32.lib odbccp32.lib strmiids.lib version.lib"
OutputFile="..\Release/DSRend.dll"
LinkIncremental="1"
@@ -128,9 +130,9 @@
/>
<Tool
Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(OutDir)\regsvr32.trg"
+ Description=""
+ CommandLine=""
+ Outputs=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -169,6 +171,8 @@
/>
<Tool
Name="VCLinkerTool"
+ RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="UnicoWS.lib odbc32.lib odbccp32.lib strmiids.lib version.lib"
OutputFile="..\Release/DSRend.dll"
LinkIncremental="1"
@@ -222,9 +226,9 @@
/>
<Tool
Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(OutDir)\regsvr32.trg"
+ Description=""
+ CommandLine=""
+ Outputs=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -262,6 +266,8 @@
/>
<Tool
Name="VCLinkerTool"
+ RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="Unicows.lib odbc32.lib odbccp32.lib strmiids.lib version.lib"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -312,9 +318,9 @@
/>
<Tool
Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(OutDir)\regsvr32.trg"
+ Description=""
+ CommandLine=""
+ Outputs=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -353,6 +359,8 @@
/>
<Tool
Name="VCLinkerTool"
+ RegisterOutput="true"
+ PerUserRedirection="true"
AdditionalDependencies="Unicows.lib odbc32.lib odbccp32.lib strmiids.lib version.lib"
OutputFile="..\Debug/DSRend.dll"
LinkIncremental="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-02-04 13:30:23
|
Revision: 4771
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4771&view=rev
Author: adcockj
Date: 2012-02-04 13:30:17 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Fix build - correct string type
Modified Paths:
--------------
trunk/DScaler/DScaler/HardwareDriver.cpp
Modified: trunk/DScaler/DScaler/HardwareDriver.cpp
===================================================================
--- trunk/DScaler/DScaler/HardwareDriver.cpp 2012-01-31 21:38:30 UTC (rev 4770)
+++ trunk/DScaler/DScaler/HardwareDriver.cpp 2012-02-04 13:30:17 UTC (rev 4771)
@@ -62,7 +62,7 @@
// use old driver if we're not at least xp
else if(!m_bWindows95 && ov.dwMajorVersion < 5)
{
- _tcscat(m_NTDriverName, "nt4");
+ _tcscat(m_NTDriverName, _T("nt4"));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-01-31 21:38:37
|
Revision: 4770
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4770&view=rev
Author: adcockj
Date: 2012-01-31 21:38:30 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Correct website and copyright details
Modified Paths:
--------------
trunk/DScaler/DScaler/Credits.cpp
trunk/DScaler/DScaler/DScaler.cpp
trunk/DScaler/DScaler/Dialogs.cpp
trunk/DScaler/DScalerRes/DScalerRes.rc
trunk/DScaler/PlugTest/PlugTest.cpp
Modified: trunk/DScaler/DScaler/Credits.cpp
===================================================================
--- trunk/DScaler/DScaler/Credits.cpp 2012-01-31 21:23:12 UTC (rev 4769)
+++ trunk/DScaler/DScaler/Credits.cpp 2012-01-31 21:38:30 UTC (rev 4770)
@@ -89,7 +89,7 @@
TCHAR* ArrCredits[] = { _T("DScaler\n"),
_T(""),
- _T("Copyright \xA9 2009\f"),
+ _T("Copyright \xA9 2012\f"),
_T("DScaler Team\f"),
_T("All Rights Reserved\f"),
_T(""),
Modified: trunk/DScaler/DScaler/DScaler.cpp
===================================================================
--- trunk/DScaler/DScaler/DScaler.cpp 2012-01-31 21:23:12 UTC (rev 4769)
+++ trunk/DScaler/DScaler/DScaler.cpp 2012-01-31 21:38:30 UTC (rev 4770)
@@ -3053,7 +3053,7 @@
break;
case IDM_HELP_HOMEPAGE:
- ShellExecute(hWnd, _T("open"), _T("http://www.dscalerproject.net/"), NULL, NULL, SW_SHOWNORMAL);
+ ShellExecute(hWnd, _T("open"), _T("http://www.dscalerproject.org/"), NULL, NULL, SW_SHOWNORMAL);
break;
case IDM_HELP_FAQ:
Modified: trunk/DScaler/DScaler/Dialogs.cpp
===================================================================
--- trunk/DScaler/DScaler/Dialogs.cpp 2012-01-31 21:23:12 UTC (rev 4769)
+++ trunk/DScaler/DScaler/Dialogs.cpp 2012-01-31 21:38:30 UTC (rev 4770)
@@ -61,7 +61,7 @@
EndDialog(hDlg, TRUE);
break;
case IDC_LINK:
- ShellExecute(hDlg, _T("open"), _T("http://www.dscalerproject.net/"), NULL, NULL, SW_SHOWNORMAL);
+ ShellExecute(hDlg, _T("open"), _T("http://www.dscalerproject.org/"), NULL, NULL, SW_SHOWNORMAL);
break;
default:
break;
Modified: trunk/DScaler/DScalerRes/DScalerRes.rc
===================================================================
--- trunk/DScaler/DScalerRes/DScalerRes.rc 2012-01-31 21:23:12 UTC (rev 4769)
+++ trunk/DScaler/DScalerRes/DScalerRes.rc 2012-01-31 21:38:30 UTC (rev 4770)
@@ -462,9 +462,9 @@
BEGIN
DEFPUSHBUTTON "OK",IDOK,105,127,58,13
CTEXT "DScaler Version 4.x",IDC_VERSION,0,3,277,9
- CTEXT "Copyright \xA9 2000-2010 John Adcock",IDC_STATIC,0,27,277,10
+ CTEXT "Copyright \xA9 2000-2012 John Adcock",IDC_STATIC,0,27,277,10
GROUPBOX "License Information",IDC_STATIC,0,39,277,82
- CTEXT "http://www.dscalerproject.net",IDC_LINK,0,15,277,9,SS_NOTIFY | SS_SUNKEN
+ CTEXT "http://www.dscalerproject.org",IDC_LINK,0,15,277,9,SS_NOTIFY | SS_SUNKEN
LTEXT "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.",IDC_STATIC,3,51,273,26
LTEXT "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.",IDC_STATIC,3,78,274,35
END
Modified: trunk/DScaler/PlugTest/PlugTest.cpp
===================================================================
--- trunk/DScaler/PlugTest/PlugTest.cpp 2012-01-31 21:23:12 UTC (rev 4769)
+++ trunk/DScaler/PlugTest/PlugTest.cpp 2012-01-31 21:38:30 UTC (rev 4770)
@@ -405,7 +405,7 @@
else
NbLines = pInfo->FrameHeight;
- FillTiffHeader(&head, description, "http://deinterlace.sourceforge.net/", "PlugTest", NbLines, pInfo);
+ FillTiffHeader(&head, description, "http://www.dscalerproject.org/", "PlugTest", NbLines, pInfo);
fwrite(&head, sizeof(head), 1, file);
for (i = 0; i < NbLines; i++)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-01-31 21:23:21
|
Revision: 4769
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4769&view=rev
Author: adcockj
Date: 2012-01-31 21:23:12 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Update version in help
Modified Paths:
--------------
trunk/DScaler/Help/DScaler_Readme.htm
trunk/DScaler/Help/News.htm
Modified: trunk/DScaler/Help/DScaler_Readme.htm
===================================================================
--- trunk/DScaler/Help/DScaler_Readme.htm 2012-01-31 21:18:51 UTC (rev 4768)
+++ trunk/DScaler/Help/DScaler_Readme.htm 2012-01-31 21:23:12 UTC (rev 4769)
@@ -54,7 +54,7 @@
<tr>
<td colspan="3"><!-- #BeginEditable "Text" -->
-<h1>DScaler - version 4.1.19</h1>
+<h1>DScaler - version 4.2.0</h1>
<h2>What's New</h2>
Modified: trunk/DScaler/Help/News.htm
===================================================================
--- trunk/DScaler/Help/News.htm 2012-01-31 21:18:51 UTC (rev 4768)
+++ trunk/DScaler/Help/News.htm 2012-01-31 21:23:12 UTC (rev 4769)
@@ -49,13 +49,20 @@
</tr>
<tr>
-<td colspan="3"> </td>
+<td colspan="3"></td>
</tr>
<tr>
<td colspan="3"><!-- #BeginEditable "Text" -->
-<h1>DScaler - version 4.1.19</h1>
+<h1>DScaler - version 4.2.0</h1>
+<h2>What's new (since 4.1.19):</h2>
+
+<h3>General</h3>
+<p><ul>
+<li>Proposed fix for Can't create display memory</li>
+</ul></p>
+
<h2>What's new (since 4.1.18):</h2>
<h3>General</h3>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-01-31 21:18:57
|
Revision: 4768
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4768&view=rev
Author: adcockj
Date: 2012-01-31 21:18:51 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Up copyright year and bump version
Modified Paths:
--------------
trunk/DScaler/Api/DScalerVersion.h
trunk/DScaler/DScaler/RES/STARTUP.BMP
Modified: trunk/DScaler/Api/DScalerVersion.h
===================================================================
--- trunk/DScaler/Api/DScalerVersion.h 2012-01-31 21:18:23 UTC (rev 4767)
+++ trunk/DScaler/Api/DScalerVersion.h 2012-01-31 21:18:51 UTC (rev 4768)
@@ -20,8 +20,8 @@
// primary version definitions
// should be updated before each release
#define DSCALERVERSION_MAJOR 4
-#define DSCALERVERSION_MINOR 1
-#define DSCALERVERSION_REVISION 20
+#define DSCALERVERSION_MINOR 2
+#define DSCALERVERSION_REVISION 0
// need to have an extra macro for stingify otherwise we get the
// name of the definition not the value
@@ -32,6 +32,6 @@
#define VERSTRING MAKEVERSTRING(DSCALERVERSION_MAJOR, DSCALERVERSION_MINOR, DSCALERVERSION_REVISION)
#define VERSTRING_ZT MAKEVERSTRING_ZT(DSCALERVERSION_MAJOR, DSCALERVERSION_MINOR, DSCALERVERSION_REVISION)
-#define COPYRIGHT_ZT "Copyright \xA9 2010\0"
+#define COPYRIGHT_ZT "Copyright \xA9 2012\0"
#endif
Modified: trunk/DScaler/DScaler/RES/STARTUP.BMP
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-01-31 21:18:29
|
Revision: 4767
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4767&view=rev
Author: adcockj
Date: 2012-01-31 21:18:23 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Add support for nt4 version of driver
Modified Paths:
--------------
trunk/DScaler/DScaler/HardwareDriver.cpp
trunk/DScaler/Install/dscaler.iss
Modified: trunk/DScaler/DScaler/HardwareDriver.cpp
===================================================================
--- trunk/DScaler/DScaler/HardwareDriver.cpp 2012-01-31 21:10:28 UTC (rev 4766)
+++ trunk/DScaler/DScaler/HardwareDriver.cpp 2012-01-31 21:18:23 UTC (rev 4767)
@@ -59,6 +59,11 @@
{
_tcscat(m_NTDriverName, arch64Bit);
}
+ // use old driver if we're not at least xp
+ else if(!m_bWindows95 && ov.dwMajorVersion < 5)
+ {
+ _tcscat(m_NTDriverName, "nt4");
+ }
}
CHardwareDriver::~CHardwareDriver()
Modified: trunk/DScaler/Install/dscaler.iss
===================================================================
--- trunk/DScaler/Install/dscaler.iss 2012-01-31 21:10:28 UTC (rev 4766)
+++ trunk/DScaler/Install/dscaler.iss 2012-01-31 21:18:23 UTC (rev 4767)
@@ -24,9 +24,9 @@
[Setup]
AppName=DScaler
AppVerName=DScaler {#MyAppVersion}
-AppPublisherURL=http://www.dscaler.org
-AppSupportURL=http://www.dscaler.org/phpBB/
-AppUpdatesURL=http://www.dscaler.org
+AppPublisherURL=http://www.dscalerproject.org
+AppSupportURL=http://www.dscalerproject.org/phpBB/
+AppUpdatesURL=http://www.dscalerproject.org
AppVersion={#MyAppVersion}
DefaultDirName={pf}\DScaler
DefaultGroupName=DScaler
@@ -37,7 +37,7 @@
;required for installing the driver on NT platforms
PrivilegesRequired=Admin
DisableStartupPrompt=yes
-AppCopyright=Copyright (C) 2010 DScaler Team
+AppCopyright=Copyright (C) 2012 DScaler Team
VersionInfoDescription=DScaler Setup
VersionInfoProductVersion={#MyAppVersion}
VersionInfoVersion={#MyAppVersion}
@@ -95,6 +95,7 @@
Source: "..\Release\DSDrv4.sys"; DestDir: "{app}"; Flags: ignoreversion; Components: main
Source: "..\Release\DSDrv4ia64.sys"; DestDir: "{app}"; Flags: ignoreversion; Components: main
Source: "..\Release\DSDrv4amd64.sys"; DestDir: "{app}"; Flags: ignoreversion; Components: main
+Source: "..\Release\DSDrv4nt4.sys"; DestDir: "{app}"; Flags: ignoreversion; Components: main
Source: "..\Release\DSDrv4.vxd"; DestDir: "{app}"; Flags: ignoreversion; Components: main
Source: "..\Release\channel.txt"; DestDir: "{app}"; Flags: ignoreversion; Components: main
Source: "..\Release\DScaler.chm"; DestDir: "{app}"; Flags: ignoreversion; Components: main
@@ -190,3 +191,6 @@
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ad...@us...> - 2012-01-31 21:10:34
|
Revision: 4766
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4766&view=rev
Author: adcockj
Date: 2012-01-31 21:10:28 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Update Drivers
Modified Paths:
--------------
trunk/DScaler/Release/DSDrv4.sys
trunk/DScaler/Release/DSDrv4AMD64.sys
trunk/DScaler/Release/DSDrv4IA64.sys
Added Paths:
-----------
trunk/DScaler/Release/DSDrv4nt4.sys
Modified: trunk/DScaler/Release/DSDrv4.sys
===================================================================
(Binary files differ)
Modified: trunk/DScaler/Release/DSDrv4AMD64.sys
===================================================================
(Binary files differ)
Modified: trunk/DScaler/Release/DSDrv4IA64.sys
===================================================================
(Binary files differ)
Added: trunk/DScaler/Release/DSDrv4nt4.sys
===================================================================
(Binary files differ)
Property changes on: trunk/DScaler/Release/DSDrv4nt4.sys
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|