Browse files

Merge branch 'FEAT-4158-Allow_DirectShow_filters_to_be_build_as_unicode'

  • Loading branch information...
2 parents f823e40 + 35635e2 commit d612aa514bcef7fd8de0561de93b3a5009411592 @tourettes tourettes committed Mar 24, 2013
Showing with 22,123 additions and 3,970 deletions.
  1. +3 −0 .gitmodules
  2. +0 −3 Build/BuildInit.bat
  3. +5 −1 Build/MSBUILD_Rebuild_All_MediaPortal_Debug.bat
  4. +7 −3 Build/MSBUILD_Rebuild_All_MediaPortal_Release.bat
  5. +1 −1 Build/MSBUILD_Rebuild_Release_MediaPortal.bat
  6. +2 −2 Build/MSBUILD_Rebuild_Release_TVServer_Client.bat
  7. +3 −0 Build/VS_Build_Debug_DirectShowFilters.bat
  8. +3 −0 Build/VS_Build_Release_DirectShowFilters.bat
  9. +0 −3 Build/VS_Rebuild_Debug_AudioRenderer.bat
  10. +0 −3 Build/VS_Rebuild_Debug_Corecpp.bat
  11. +1 −1 Build/VS_Rebuild_Debug_DirectShowFilters.bat
  12. +0 −3 Build/VS_Rebuild_Debug_MPC_HC_subs.bat
  13. +0 −3 Build/VS_Rebuild_Debug_Win7RefreshRateHelper.bat
  14. +0 −10 Build/VS_Rebuild_Release_AudioRenderer.bat
  15. +0 −10 Build/VS_Rebuild_Release_Corecpp.bat
  16. +2 −9 Build/VS_Rebuild_Release_DirectShowFilters.bat
  17. +0 −10 Build/VS_Rebuild_Release_MPC_HC_subs.bat
  18. +0 −10 Build/VS_Rebuild_Release_Win7RefreshRateHelper.bat
  19. +42 −0 Build/VS_build_DirectShowFilters.bat
  20. +8 −0 DirectShowFilters/.gitignore
  21. +7 −10 DirectShowFilters/BDReader/BDReader.vcxproj
  22. BIN DirectShowFilters/BDReader/libbluray/bluray.dll
  23. +0 −716 DirectShowFilters/BDReader/libbluray/bluray.h
  24. +0 −59 DirectShowFilters/BDReader/libbluray/keys.h
  25. +0 −1 DirectShowFilters/BDReader/libbluray/license.txt
  26. +0 −69 DirectShowFilters/BDReader/libbluray/overlay.h
  27. +0 −247 DirectShowFilters/BDReader/libbluray/stdint.h
  28. +3 −3 DirectShowFilters/BDReader/source/BDReader.cpp
  29. +3 −2 DirectShowFilters/BDReader/source/DeMultiplexer.cpp
  30. +8 −6 DirectShowFilters/BDReader/source/LibBlurayWrapper.cpp
  31. +2 −0 DirectShowFilters/BDReader/source/LibBlurayWrapper.h
  32. +10 −8 DirectShowFilters/BDReader/source/utils.cpp
  33. +6 −6 DirectShowFilters/DVBSubtitle3/DVBSubtitle3.vcxproj
  34. +1 −1 DirectShowFilters/DVBSubtitle3/Source/DVBSub.cpp
  35. +7 −6 DirectShowFilters/DVBSubtitle3/Source/dllmain.cpp
  36. +4 −4 DirectShowFilters/DXErr9/dxerr9.vcxproj
  37. +6 −6 {mediaportal/Core.cpp → DirectShowFilters}/DXUtil/DXUtil.vcxproj
  38. 0 {mediaportal/Core.cpp → DirectShowFilters}/DXUtil/source/DXUtil.cpp
  39. 0 {mediaportal/Core.cpp → DirectShowFilters}/DXUtil/source/stdafx.cpp
  40. 0 {mediaportal/Core.cpp → DirectShowFilters}/DXUtil/source/stdafx.h
  41. +1 −1 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/dshowhelper.sln
  42. +8 −8 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/dshowhelper.vcxproj
  43. +431 −431 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/DX9AllocatorPresenter.cpp
  44. +139 −139 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/DX9AllocatorPresenter.h
  45. +1 −1 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/EVRCustomPresenter.cpp
  46. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/EVRCustomPresenter.h
  47. +400 −400 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/GrabBitmaps.cpp
  48. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/IAVSyncClock.h
  49. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/MyQueue.h
  50. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/OuterEVR.cpp
  51. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/OuterEVR.h
  52. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/Scheduler.cpp
  53. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/Scheduler.h
  54. +10 −10 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/StatsRenderer.cpp
  55. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/StatsRenderer.h
  56. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/StdAfx.h
  57. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/TimeSource.cpp
  58. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/TimeSource.h
  59. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/autoint.h
  60. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/callback.h
  61. +1 −1 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/debugallocs.h
  62. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/dllmodul.cpp
  63. +1,326 −1,326 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/dshowhelper.cpp
  64. +24 −24 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/dshowhelper.def
  65. +77 −77 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/dshowhelper.h
  66. 0 {mediaportal/Core.cpp → DirectShowFilters}/DirectShowHelper/source/qedit.h
  67. +2 −2 DirectShowFilters/DvbCoreUtils/DvbCoreUtils.vcxproj
  68. +144 −65 DirectShowFilters/Filters.sln
  69. +4 −4 DirectShowFilters/LiveMedia555/LiveMedia555.vcxproj
  70. +1 −1 DirectShowFilters/MPAudioRenderer/AE_mixer/StdString.h
  71. +6 −6 DirectShowFilters/MPAudioRenderer/AudioRenderer.vcxproj
  72. +26 −18 DirectShowFilters/MPAudioRenderer/source/Settings.cpp
  73. +15 −15 DirectShowFilters/MPAudioRenderer/source/SettingsProp.cpp
  74. +1 −1 DirectShowFilters/MPAudioRenderer/source/WASAPIRenderFilter.cpp
  75. +18 −14 DirectShowFilters/MPAudioRenderer/source/dllmain.cpp
  76. +13 −116 DirectShowFilters/MPAudioswitcher/MPAudioSwitcher.vcxproj
  77. +6 −6 DirectShowFilters/MPIPTVSource/MPIPTVSource.vcxproj
  78. +17 −10 DirectShowFilters/MPIPTVSource/source/mpiptvsource.cpp
  79. +3 −3 DirectShowFilters/MPIPTVSource/source/mpiptvsource.h
  80. +2 −1 DirectShowFilters/MPIPTVSource/source/setup.cpp
  81. +6 −6 DirectShowFilters/MPWriter/MPWriter.vcxproj
  82. +4 −2 DirectShowFilters/MPWriter/source/MPFileWriter.cpp
  83. +2 −1 DirectShowFilters/MPWriter/source/MemoryBuffer.cpp
  84. +7 −7 DirectShowFilters/MPWriter/source/MultiFileWriter.cpp
  85. +6 −6 DirectShowFilters/StreamingServer/StreamingServer.vcxproj
  86. +6 −6 DirectShowFilters/TsMuxer/TsMuxer.vcxproj
  87. +2 −1 DirectShowFilters/TsMuxer/source/MemoryBuffer.cpp
  88. +6 −4 DirectShowFilters/TsMuxer/source/TsMuxer.cpp
  89. +8 −8 DirectShowFilters/TsReader/TsReader.vcxproj
  90. +10 −10 DirectShowFilters/TsReader/source/TsReader.cpp
  91. +6 −6 DirectShowFilters/TsWriter/MPTSWriter.vcxproj
  92. +6 −2 DirectShowFilters/TsWriter/source/MHWDecoder.cpp
  93. +1 −1 DirectShowFilters/TsWriter/source/MultiFileWriter.cpp
  94. +2 −1 DirectShowFilters/TsWriter/source/TsWriter.cpp
  95. +1 −1 {mediaportal/Core.cpp → DirectShowFilters}/Win7RefreshRateHelper/Win7RefreshRateHelper.sln
  96. +10 −10 {mediaportal/Core.cpp → DirectShowFilters}/Win7RefreshRateHelper/Win7RefreshRateHelper.vcxproj
  97. +1 −1 {mediaportal/Core.cpp → DirectShowFilters}/Win7RefreshRateHelper/source/Win7RefreshRateHelper.cpp
  98. 0 {mediaportal/Core.cpp → DirectShowFilters}/Win7RefreshRateHelper/source/Win7RefreshRateHelper.def
  99. +1 −1 {mediaportal/Core.cpp → DirectShowFilters}/Win7RefreshRateHelper/source/Win7RefreshRateHelper.h
  100. +165 −0 DirectShowFilters/baseclasses/BaseClasses.vcxproj
  101. +222 −0 DirectShowFilters/baseclasses/BaseClasses.vcxproj.filters
  102. +3 −0 DirectShowFilters/baseclasses/BaseClasses.vcxproj.user
  103. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/amextra.cpp
  104. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/amextra.h
  105. +5,358 −0 DirectShowFilters/baseclasses/amfilter.cpp
  106. +1,587 −0 DirectShowFilters/baseclasses/amfilter.h
  107. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/amvideo.cpp
  108. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/arithutil.cpp
  109. +20 −0 DirectShowFilters/baseclasses/baseclasses.sln
  110. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/cache.h
  111. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/checkbmi.h
  112. +265 −0 DirectShowFilters/baseclasses/combase.cpp
  113. +306 −0 DirectShowFilters/baseclasses/combase.h
  114. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/cprop.cpp
  115. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/cprop.h
  116. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/ctlutil.cpp
  117. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/ctlutil.h
  118. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/ddmm.cpp
  119. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/ddmm.h
  120. +367 −0 DirectShowFilters/baseclasses/dllentry.cpp
  121. +695 −0 DirectShowFilters/baseclasses/dllsetup.cpp
  122. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/dllsetup.h
  123. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/dxmperf.h
  124. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/fourcc.h
  125. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/measure.h
  126. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/msgthrd.h
  127. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/mtype.cpp
  128. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/mtype.h
  129. +801 −0 DirectShowFilters/baseclasses/outputq.cpp
  130. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/outputq.h
  131. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/perflog.cpp
  132. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/perflog.h
  133. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/perfstruct.h
  134. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/pstream.cpp
  135. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/pstream.h
  136. +588 −0 DirectShowFilters/baseclasses/pullpin.cpp
  137. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/pullpin.h
  138. +402 −0 DirectShowFilters/baseclasses/refclock.cpp
  139. +184 −0 DirectShowFilters/baseclasses/refclock.h
  140. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/reftime.h
  141. +2,858 −0 DirectShowFilters/baseclasses/renbase.cpp
  142. +478 −0 DirectShowFilters/baseclasses/renbase.h
  143. +284 −0 DirectShowFilters/baseclasses/schedule.cpp
  144. +128 −0 DirectShowFilters/baseclasses/schedule.h
  145. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/seekpt.cpp
  146. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/seekpt.h
  147. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/source.cpp
  148. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/source.h
  149. +206 −0 DirectShowFilters/baseclasses/streams.h
  150. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/strmctl.cpp
  151. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/strmctl.h
  152. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/sysclock.cpp
  153. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/sysclock.h
  154. +1,016 −0 DirectShowFilters/baseclasses/transfrm.cpp
  155. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/transfrm.h
  156. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/transip.cpp
  157. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/transip.h
  158. +746 −0 DirectShowFilters/baseclasses/videoctl.cpp
  159. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/videoctl.h
  160. +468 −0 DirectShowFilters/baseclasses/vtrans.cpp
  161. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/vtrans.h
  162. +2,081 −0 DirectShowFilters/baseclasses/winctrl.cpp
  163. 0 {mediaportal/Core.cpp/mpc-hc_subs/src/BaseClasses → DirectShowFilters/baseclasses}/winctrl.h
Sorry, we could not display the entire diff because too many files (688) changed.
View
3 .gitmodules
@@ -0,0 +1,3 @@
+[submodule "libbluray"]
+ path = libbluray
+ url = git://git.1f0.de/libbluray.git
View
3 Build/BuildInit.bat
@@ -15,7 +15,6 @@ set progpath=%ProgramFiles%
if not "%ProgramFiles(x86)%".=="". set progpath=%ProgramFiles(x86)%
REM Select Visual Studio version
-set vsver=10.0
REM set other MP related paths
set GIT_ROOT=..
@@ -43,7 +42,5 @@ echo. >> %log%
echo. >> %log%
echo Using following environment variables: >> %log%
-echo DSHOW_BASE = %DSHOW_BASE% >> %log%
echo DXSDK_DIR = %DXSDK_DIR% >> %log%
-echo WINDOWS_SDK = %WINDOWS_SDK% >> %log%
echo. >> %log%
View
6 Build/MSBUILD_Rebuild_All_MediaPortal_Debug.bat
@@ -11,8 +11,12 @@ rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%MediaPortal%" >> %log%
%DeployVersionGIT% /git="%GIT_ROOT%" /path="%CommonMPTV%" >> %log%
echo.
+echo Building native components...
+call VS_Rebuild_Debug_DirectShowFilters.bat
+
+echo.
echo Building MediaPortal...
-"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
echo.
echo Reverting assemblies...
View
10 Build/MSBUILD_Rebuild_All_MediaPortal_Release.bat
@@ -11,8 +11,12 @@ rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%MediaPortal%" >> %log%
%DeployVersionGIT% /git="%GIT_ROOT%" /path="%CommonMPTV%" >> %log%
echo.
+echo Building native components...
+call VS_Rebuild_Release_DirectShowFilters.bat
+
+echo.
echo Building MediaPortal...
-"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
echo.
echo Reverting assemblies...
@@ -44,10 +48,10 @@ rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%TVLibrary%" >> %log%
echo.
echo Building TV Server...
-"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
echo.
echo Building TV Client plugin...
-"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
echo.
echo Reverting assemblies...
View
2 Build/MSBUILD_Rebuild_Release_MediaPortal.bat
@@ -12,7 +12,7 @@ rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%MediaPortal%" >> %log%
echo.
echo Building MediaPortal...
-"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
echo.
echo Reverting assemblies...
View
4 Build/MSBUILD_Rebuild_Release_TVServer_Client.bat
@@ -12,10 +12,10 @@ rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%TVLibrary%" >> %log%
echo.
echo Building TV Server...
-"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
echo.
echo Building TV Client plugin...
-"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
echo.
echo Reverting assemblies...
View
3 Build/VS_Build_Debug_DirectShowFilters.bat
@@ -0,0 +1,3 @@
+@echo off
+
+call "VS_build_DirectShowFilters.bat" debug build
View
3 Build/VS_Build_Release_DirectShowFilters.bat
@@ -0,0 +1,3 @@
+@echo off
+
+call "VS_build_DirectShowFilters.bat" release build
View
3 Build/VS_Rebuild_Debug_AudioRenderer.bat
@@ -1,3 +0,0 @@
-@ECHO OFF
-
-call "VS_Rebuild_Release_AudioRenderer.bat" Debug
View
3 Build/VS_Rebuild_Debug_Corecpp.bat
@@ -1,3 +0,0 @@
-@echo off
-
-call "VS_Rebuild_Release_Corecpp.bat" Debug
View
2 Build/VS_Rebuild_Debug_DirectShowFilters.bat
@@ -1,3 +1,3 @@
@echo off
-call "VS_Rebuild_Release_DirectShowFilters.bat" Debug
+call "VS_build_DirectShowFilters.bat" debug rebuild
View
3 Build/VS_Rebuild_Debug_MPC_HC_subs.bat
@@ -1,3 +0,0 @@
-@echo off
-
-call "VS_Rebuild_Release_MPC_HC_subs.bat" Debug
View
3 Build/VS_Rebuild_Debug_Win7RefreshRateHelper.bat
@@ -1,3 +0,0 @@
-@echo off
-
-call "VS_Rebuild_Release_Win7RefreshRateHelper.bat" Debug
View
10 Build/VS_Rebuild_Release_AudioRenderer.bat
@@ -1,10 +0,0 @@
-@ECHO OFF
-
-rem build init
-set project=AudioRenderer
-call BuildInit.bat %1
-
-rem build
-echo.
-echo Building MPAudioRenderer...
-"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\DirectShowFilters\MPAudioRenderer\AudioRenderer.sln" /ReBuild "%BUILD_TYPE% unicode" >> %log%
View
10 Build/VS_Rebuild_Release_Corecpp.bat
@@ -1,10 +0,0 @@
-@ECHO OFF
-
-rem build init
-set project=Corecpp
-call BuildInit.bat %1
-
-rem build
-echo.
-echo Building %project%
-"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\Core.cpp.sln" /Rebuild "%BUILD_TYPE%" >> %log%
View
11 Build/VS_Rebuild_Release_DirectShowFilters.bat
@@ -1,10 +1,3 @@
-@ECHO OFF
+@echo off
-rem build init
-set project=DirectShowFilters
-call BuildInit.bat %1
-
-rem build
-echo.
-echo Building %project%
-"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\DirectShowFilters\Filters.sln" /Rebuild "%BUILD_TYPE%" >> %log%
+call "VS_build_DirectShowFilters.bat" release rebuild
View
10 Build/VS_Rebuild_Release_MPC_HC_subs.bat
@@ -1,10 +0,0 @@
-@ECHO OFF
-
-rem build init
-set project=MPC_HC_subs
-call BuildInit.bat %1
-
-rem build
-echo.
-echo Building %project%
-"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\mpc-hc_subs.sln" /Rebuild "%BUILD_TYPE%" >> %log%
View
10 Build/VS_Rebuild_Release_Win7RefreshRateHelper.bat
@@ -1,10 +0,0 @@
-@ECHO OFF
-
-rem build init
-set project=Win7RefreshRateHelper
-call BuildInit.bat %1
-
-rem build
-echo.
-echo Building %project%
-"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\Win7RefreshRateHelper\Win7RefreshRateHelper.sln" /Rebuild "%BUILD_TYPE%" >> %log%
View
42 Build/VS_build_DirectShowFilters.bat
@@ -0,0 +1,42 @@
+@ECHO OFF
+REM check parameters
+
+if /I not %1==debug if /I not %1==rebuild if /I not %1==release if /I not %1==build goto ERROR_IN_PARAMETERS
+if /I not %2==debug if /I not %2==rebuild if /I not %2==release if /I not %2==build goto ERROR_IN_PARAMETERS
+
+set BUILD_TYPE=Release
+set BUILD_MODE=build
+
+if %1==debug set BUILD_TYPE=Debug
+if %2==debug set BUILD_TYPE=Debug
+
+if %1==rebuild set BUILD_MODE=rebuild
+if %2==rebuild set BUILD_MODE=rebuild
+
+if not [%3]==[] set PRJ=/project %3
+
+REM build init
+set project=DirectShowFilters
+call BuildInit.bat %BUILD_TYPE%
+
+REM build
+echo.
+echo Building %project%
+
+if not [%3]==[] goto BUILD_PRJ
+goto BUILD rem full build
+
+:BUILD_PRJ
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /target:%BUILD_MODE% /property:Configuration=%BUILD_TYPE% "..\DirectShowFilters\Filters.sln" %PRJ% >> %log%
+goto DONE
+
+:BUILD
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /target:%BUILD_MODE% /property:Configuration=%BUILD_TYPE% "..\DirectShowFilters\Filters.sln" >> %log%
+goto DONE
+
+:ERROR_IN_PARAMETERS
+echo.
+echo "Error in given parameters. Valid options [build|rebuild] [release|debug] and optional [project name]. For example to rebuild release mode binaries use 'rebuild release' or to build only TsReader in debug mode 'build debug TsReader'"
+echo.
+
+:DONE
View
8 DirectShowFilters/.gitignore
@@ -0,0 +1,8 @@
+Debug/
+Release/
+bin_Win32/
+bin_Win32d/
+ipch/
+*.sdf
+*.opensdf
+*.lib
View
17 DirectShowFilters/BDReader/BDReader.vcxproj
@@ -19,13 +19,14 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Static</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -71,7 +72,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>$(DSHOW_BASE);$(WINDOWS_SDK)Include\;$(DXSDK_DIR)Include;..\LiveMedia555\BasicUsageEnvironment/include;..\LiveMedia555\groupsock/include;..\LiveMedia555\liveMedia;..\LiveMedia555\liveMedia/include;..\LiveMedia555\UsageEnvironment/include;../LiveMedia555/MediaPortal;..\shared;..\streamingserver\Source;..\dxerr; .\libbluray;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\libbluray\includes;$(SolutionDir)\..\libbluray\src\libbluray\decoders;$(SolutionDir)\..\libbluray\src\libbluray;$(SolutionDir)baseclasses;$(WINDOWS_SDK)Include\;$(DXSDK_DIR)Include;..\shared;.\libbluray;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32; _WIN32; NDEBUG; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -101,7 +102,7 @@
<ShowProgress>NotSet</ShowProgress>
<OutputFile>bin\Release/BDReader.ax</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(DSHOW_BASE)Release_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib; ..\shared;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)baseclasses\release; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib; ..\shared;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\source\BDReader.def</ModuleDefinitionFile>
@@ -130,7 +131,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(DSHOW_BASE);$(WINDOWS_SDK)Include\;$(DXSDK_DIR)Include;..\LiveMedia555\BasicUsageEnvironment/include;..\LiveMedia555\groupsock/include;../LiveMedia555/liveMedia;..\LiveMedia555\liveMedia/include;..\LiveMedia555\UsageEnvironment/include;../LiveMedia555/MediaPortal;..\shared;..\streamingserver\Source; .\libbluray;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\libbluray\includes;$(SolutionDir)\..\libbluray\src\libbluray\decoders;$(SolutionDir)\..\libbluray\src\libbluray;$(SolutionDir)baseclasses;$(WINDOWS_SDK)Include\;$(DXSDK_DIR)Include;..\shared;.\libbluray;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DBG=1;DEBUG;_DEBUG;INC_OLE2;STRICT;_MT;_DLL;_X86_=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -152,7 +153,7 @@
<AdditionalDependencies>DvbCoreUtilsD.lib;strmbasd.lib;quartz.lib;winmm.lib;msvcrtd.lib;ws2_32.lib;mfuuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\Debug/BDReader.ax</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(DSHOW_BASE)Debug_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;..\shared;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)baseclasses\debug; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;..\shared;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\source\BDReader.def</ModuleDefinitionFile>
@@ -214,10 +215,6 @@
<ClInclude Include="source\SubtitlePin.h" />
<ClInclude Include="source\VideoPin.h" />
<ClInclude Include="..\shared\DebugSettings.h" />
- <ClInclude Include="libbluray\bluray.h" />
- <ClInclude Include="libbluray\keys.h" />
- <ClInclude Include="libbluray\overlay.h" />
- <ClInclude Include="libbluray\stdint.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DvbCoreUtils\DvbCoreUtils.vcxproj">
View
BIN DirectShowFilters/BDReader/libbluray/bluray.dll
Binary file not shown.
View
716 DirectShowFilters/BDReader/libbluray/bluray.h
@@ -1,716 +0,0 @@
-/*
- * This file is part of libbluray
- * Copyright (C) 2009-2010 Obliter0n
- * Copyright (C) 2009-2010 John Stebbins
- * Copyright (C) 2010 hpi1
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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 Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#ifndef BLURAY_H_
-#define BLURAY_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @file libbluray/bluray.h
- * external API header
- */
-
-#include <stdint.h>
-
-#define TITLES_ALL 0 /**< all titles. */
-#define TITLES_FILTER_DUP_TITLE 0x01 /**< remove duplicate titles. */
-#define TITLES_FILTER_DUP_CLIP 0x02 /**< remove titles that have duplicate
- clips. */
-#define TITLES_RELEVANT \
- (TITLES_FILTER_DUP_TITLE | TITLES_FILTER_DUP_CLIP) /**< remove duplicate
- titles and clips */
-
-typedef struct bluray BLURAY;
-
-typedef enum {
- BLURAY_STREAM_TYPE_VIDEO_MPEG1 = 0x01,
- BLURAY_STREAM_TYPE_VIDEO_MPEG2 = 0x02,
- BLURAY_STREAM_TYPE_AUDIO_MPEG1 = 0x03,
- BLURAY_STREAM_TYPE_AUDIO_MPEG2 = 0x04,
- BLURAY_STREAM_TYPE_AUDIO_LPCM = 0x80,
- BLURAY_STREAM_TYPE_AUDIO_AC3 = 0x81,
- BLURAY_STREAM_TYPE_AUDIO_DTS = 0x82,
- BLURAY_STREAM_TYPE_AUDIO_TRUHD = 0x83,
- BLURAY_STREAM_TYPE_AUDIO_AC3PLUS = 0x84,
- BLURAY_STREAM_TYPE_AUDIO_DTSHD = 0x85,
- BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER = 0x86,
- BLURAY_STREAM_TYPE_VIDEO_VC1 = 0xea,
- BLURAY_STREAM_TYPE_VIDEO_H264 = 0x1b,
- BLURAY_STREAM_TYPE_SUB_PG = 0x90,
- BLURAY_STREAM_TYPE_SUB_IG = 0x91,
- BLURAY_STREAM_TYPE_SUB_TEXT = 0x92,
- BLURAY_STREAM_TYPE_AUDIO_AC3PLUS_SECONDARY = 0xa1,
- BLURAY_STREAM_TYPE_AUDIO_DTSHD_SECONDARY = 0xa2
-} bd_stream_type_e;
-
-typedef enum {
- BLURAY_VIDEO_FORMAT_480I = 1, // ITU-R BT.601-5
- BLURAY_VIDEO_FORMAT_576I = 2, // ITU-R BT.601-4
- BLURAY_VIDEO_FORMAT_480P = 3, // SMPTE 293M
- BLURAY_VIDEO_FORMAT_1080I = 4, // SMPTE 274M
- BLURAY_VIDEO_FORMAT_720P = 5, // SMPTE 296M
- BLURAY_VIDEO_FORMAT_1080P = 6, // SMPTE 274M
- BLURAY_VIDEO_FORMAT_576P = 7 // ITU-R BT.1358
-} bd_video_format_e;
-
-typedef enum {
- BLURAY_VIDEO_RATE_24000_1001 = 1, // 23.976
- BLURAY_VIDEO_RATE_24 = 2,
- BLURAY_VIDEO_RATE_25 = 3,
- BLURAY_VIDEO_RATE_30000_1001 = 4, // 29.97
- BLURAY_VIDEO_RATE_50 = 6,
- BLURAY_VIDEO_RATE_60000_1001 = 7 // 59.94
-} bd_video_rate_e;
-
-typedef enum {
- BLURAY_ASPECT_RATIO_4_3 = 2,
- BLURAY_ASPECT_RATIO_16_9 = 3
-} bd_video_aspect_e;
-
-typedef enum {
- BLURAY_AUDIO_FORMAT_MONO = 1,
- BLURAY_AUDIO_FORMAT_STEREO = 3,
- BLURAY_AUDIO_FORMAT_MULTI_CHAN = 6,
- BLURAY_AUDIO_FORMAT_COMBO = 12 // Stereo ac3/dts,
-} bd_audio_format_e;
- // multi mlp/dts-hd
-
-typedef enum {
- BLURAY_AUDIO_RATE_48 = 1,
- BLURAY_AUDIO_RATE_96 = 4,
- BLURAY_AUDIO_RATE_192 = 5,
- BLURAY_AUDIO_RATE_192_COMBO = 12, // 48 or 96 ac3/dts
- // 192 mpl/dts-hd
- BLURAY_AUDIO_RATE_96_COMBO = 14 // 48 ac3/dts
- // 96 mpl/dts-hd
-} bd_audio_rate_e;
-
-typedef enum {
- BLURAY_TEXT_CHAR_CODE_UTF8 = 0x01,
- BLURAY_TEXT_CHAR_CODE_UTF16BE = 0x02,
- BLURAY_TEXT_CHAR_CODE_SHIFT_JIS = 0x03,
- BLURAY_TEXT_CHAR_CODE_EUC_KR = 0x04,
- BLURAY_TEXT_CHAR_CODE_GB18030_20001 = 0x05,
- BLURAY_TEXT_CHAR_CODE_CN_GB = 0x06,
- BLURAY_TEXT_CHAR_CODE_BIG5 = 0x07
-} bd_char_code_e;
-
-typedef enum {
- BLURAY_STILL_NONE = 0x00,
- BLURAY_STILL_TIME = 0x01,
- BLURAY_STILL_INFINITE = 0x02,
-} bd_still_mode_e;
-
-typedef struct bd_stream_info {
- uint8_t coding_type;
- uint8_t format;
- uint8_t rate;
- uint8_t char_code;
- uint8_t lang[4];
- uint16_t pid;
- uint8_t aspect;
-} BLURAY_STREAM_INFO;
-
-typedef struct bd_clip {
- uint32_t pkt_count;
- uint8_t still_mode;
- uint16_t still_time; /* seconds */
- uint8_t video_stream_count;
- uint8_t audio_stream_count;
- uint8_t pg_stream_count;
- uint8_t ig_stream_count;
- uint8_t sec_audio_stream_count;
- uint8_t sec_video_stream_count;
- uint8_t raw_stream_count;
- BLURAY_STREAM_INFO *video_streams;
- BLURAY_STREAM_INFO *audio_streams;
- BLURAY_STREAM_INFO *pg_streams;
- BLURAY_STREAM_INFO *ig_streams;
- BLURAY_STREAM_INFO *sec_audio_streams;
- BLURAY_STREAM_INFO *sec_video_streams;
- BLURAY_STREAM_INFO *raw_streams; /* custom extension */
-} BLURAY_CLIP_INFO;
-
-typedef struct bd_chapter {
- uint32_t idx;
- uint64_t start;
- uint64_t duration;
- uint64_t offset;
-} BLURAY_TITLE_CHAPTER;
-
-typedef struct bd_title_info {
- uint32_t idx;
- uint32_t playlist;
- uint64_t duration;
- uint32_t clip_count;
- uint8_t angle_count;
- uint32_t chapter_count;
- BLURAY_CLIP_INFO *clips;
- BLURAY_TITLE_CHAPTER *chapters;
-} BLURAY_TITLE_INFO;
-
-typedef struct bd_sound_effect {
- uint8_t num_channels; /* 1 - mono, 2 - stereo */
- uint32_t num_frames;
- const int16_t *samples; /* 48000 Hz, 16 bit LPCM. interleaved if stereo */
-} BLURAY_SOUND_EFFECT;
-
-/**
- * Get library version
- *
- */
-void bd_get_version(int *major, int *minor, int *micro);
-
-/**
- *
- * This must be called after bd_open() and before bd_select_title().
- * Populates the title list in BLURAY.
- * Filtering of the returned list is controled through title flags
- *
- * @param bd BLURAY object
- * @param flags title flags
- * @param min_title_length filter out titles shorter than min_title_length seconds
- * @return number of titles found
- */
-uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length);
-
-/**
- *
- * Get information about a title
- *
- * @param bd BLURAY object
- * @param title_idx title index number
- * @param angle angle number (chapter offsets and clip size depend on selected angle)
- * @return allocated BLURAY_TITLE_INFO object, NULL on error
- */
-BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle);
-
-/**
- *
- * Get information about a playlist
- *
- * @param bd BLURAY object
- * @param playlist playlist number
- * @param angle angle number (chapter offsets and clip size depend on selected angle)
- * @return allocated BLURAY_TITLE_INFO object, NULL on error
- */
-BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle);
-
-/**
- *
- * Free BLURAY_TITLE_INFO object
- *
- * @param title_info BLURAY_TITLE_INFO object
- */
-void bd_free_title_info(BLURAY_TITLE_INFO *title_info);
-
-/**
- * Initializes libbluray objects
- *
- * @param device_path path to mounted Blu-ray disc
- * @param keyfile_path path to KEYDB.cfg (may be NULL)
- * @return allocated BLURAY object, NULL if error
- */
-BLURAY *bd_open(const char* device_path, const char* keyfile_path);
-
-/**
- * Free libbluray objects
- *
- * @param bd BLURAY object
- */
-void bd_close(BLURAY *bd);
-
-/**
- * Seek to pos in corrently selected title
- *
- * @param bd BLURAY object
- * @param pos position to seek to
- * @return current seek position
- */
-int64_t bd_seek(BLURAY *bd, uint64_t pos);
-
-/**
- *
- * Seek to specific time in 90Khz ticks
- *
- * @param bd BLURAY ojbect
- * @param tick tick count
- * @return current seek position
- */
-int64_t bd_seek_time(BLURAY *bd, uint64_t tick);
-
-/**
- *
- * Find the byte position to specific time in 90Khz ticks
- *
- * @param bd BLURAY ojbect
- * @param tick tick count
- * @return byte position
- */
-int64_t bd_find_seek_point(BLURAY *bd, uint64_t tick);
-
-/**
- *
- * Read from currently selected title file, decrypt if possible
- *
- * @param bd BLURAY object
- * @param buf buffer to read data into
- * @param len size of data to be read
- * @return size of data read, -1 if error, 0 if EOF
- */
-int bd_read(BLURAY *bd, unsigned char *buf, int len);
-
-/**
- *
- * Continue reading after still mode clip
- *
- * @param bd BLURAY object
- * @return 0 on error
- */
-int bd_read_skip_still(BLURAY *bd);
-
-/**
- *
- * Seek to a chapter. First chapter is 0
- *
- * @param bd BLURAY object
- * @param chapter chapter to seek to
- * @return current seek position
- */
-int64_t bd_seek_chapter(BLURAY *bd, unsigned chapter);
-
-/**
- *
- * Find the byte position of a chapter
- *
- * @param bd BLURAY object
- * @param chapter chapter to find position of
- * @return seek position of chapter start
- */
-int64_t bd_chapter_pos(BLURAY *bd, unsigned chapter);
-
-/**
- *
- * Get the current chapter
- *
- * @param bd BLURAY object
- * @return current chapter
- */
-uint32_t bd_get_current_chapter(BLURAY *bd);
-
-/**
- *
- * Seek to a playmark. First mark is 0
- *
- * @param bd BLURAY object
- * @param mark playmark to seek to
- * @return current seek position
- */
-int64_t bd_seek_mark(BLURAY *bd, unsigned mark);
-
-/**
- *
- * Select a playlist
- *
- * @param bd BLURAY object
- * @param playlist playlist to select
- * @return 1 on success, 0 if error
- */
-int bd_select_playlist(BLURAY *bd, uint32_t playlist);
-
-/**
- *
- * Select the title from the list created by bd_get_titles()
- *
- * @param bd BLURAY object
- * @param title title to select
- * @return 1 on success, 0 if error
- */
-int bd_select_title(BLURAY *bd, uint32_t title);
-
-/**
- *
- * Set the angle to play
- *
- * @param bd BLURAY object
- * @param angle angle to play
- * @return 1 on success, 0 if error
- */
-int bd_select_angle(BLURAY *bd, unsigned angle);
-
-/**
- *
- * Initiate seamless angle change
- *
- * @param bd BLURAY object
- * @param angle angle to change to
- */
-void bd_seamless_angle_change(BLURAY *bd, unsigned angle);
-
-/**
- *
- * Returns file size in bytes of currently selected title, 0 in no title
- * selected
- *
- * @param bd BLURAY object
- * @return file size in bytes of currently selected title, 0 if no title
- * selected
- */
-uint64_t bd_get_title_size(BLURAY *bd);
-
-/**
- *
- * Returns the current title index
- *
- * @param bd BLURAY object
- * @return current title index
- */
-uint32_t bd_get_current_title(BLURAY *bd);
-
-/**
- *
- * Return the current angle
- *
- * @param bd BLURAY object
- * @return current angle
- */
-unsigned bd_get_current_angle(BLURAY *bd);
-
-/**
- *
- * Return current pos
- *
- * @param bd BLURAY object
- * @return current seek position
- */
-uint64_t bd_tell(BLURAY *bd);
-
-/**
- *
- * Return current time
- *
- * @param bd BLURAY object
- * @return current time
- */
-uint64_t bd_tell_time(BLURAY *bd);
-
-/*
- * Disc info
- */
-
-typedef struct {
- uint8_t bluray_detected;
-
- uint8_t first_play_supported;
- uint8_t top_menu_supported;
-
- uint32_t num_hdmv_titles;
- uint32_t num_bdj_titles;
- uint32_t num_unsupported_titles;
-
- uint8_t aacs_detected;
- uint8_t libaacs_detected;
- uint8_t aacs_handled;
-
- uint8_t bdplus_detected;
- uint8_t libbdplus_detected;
- uint8_t bdplus_handled;
-
-} BLURAY_DISC_INFO;
-
-/**
- *
- * Get information about current BluRay disc
- *
- * @param bd BLURAY object
- * @return pointer to BLURAY_DISC_INFO object, NULL on error
- */
-const BLURAY_DISC_INFO *bd_get_disc_info(BLURAY*);
-
-/*
- * player settings
- */
-
-typedef enum {
- BLURAY_PLAYER_SETTING_PARENTAL = 13, /* Age for parental control (years) */
- BLURAY_PLAYER_SETTING_AUDIO_CAP = 15, /* Player capability for audio (bit mask) */
- BLURAY_PLAYER_SETTING_AUDIO_LANG = 16, /* Initial audio language: ISO 639-2 string, ex. "eng" */
- BLURAY_PLAYER_SETTING_PG_LANG = 17, /* Initial PG/SPU language: ISO 639-2 string, ex. "eng" */
- BLURAY_PLAYER_SETTING_MENU_LANG = 18, /* Initial menu language: ISO 639-2 string, ex. "eng" */
- BLURAY_PLAYER_SETTING_COUNTRY_CODE = 19, /* Player country code: ISO 3166-1 string, ex. "de" */
- BLURAY_PLAYER_SETTING_REGION_CODE = 20, /* Player region code: 1 - region A, 2 - B, 4 - C */
- BLURAY_PLAYER_SETTING_VIDEO_CAP = 29, /* Player capability for video (bit mask) */
- BLURAY_PLAYER_SETTING_TEXT_CAP = 30, /* Player capability for text subtitle (bit mask) */
- BLURAY_PLAYER_SETTING_PLAYER_PROFILE = 31, /* Profile1: 0, Profile1+: 1, Profile2: 3, Profile3: 8 */
-} bd_player_setting;
-
-/**
- *
- * Update player setting registers
- *
- * @param bd BLURAY object
- * @param idx Player setting register
- * @param value New value for player setting register
- * @return 1 on success, 0 on error (invalid setting)
- */
-
-int bd_set_player_setting(BLURAY *bd, uint32_t idx, uint32_t value);
-int bd_set_player_setting_str(BLURAY *bd, uint32_t idx, const char *s);
-
-/*
- * Java
- */
-int bd_start_bdj(BLURAY *bd, const char* start_object); // start BD-J from the specified BD-J object (should be a 5 character string)
-void bd_stop_bdj(BLURAY *bd); // shutdown BD-J and clean up resources
-
-/*
- * events
- */
-
-typedef enum {
- BD_EVENT_NONE = 0,
- BD_EVENT_ERROR, /* Fatal error. Playback can't be continued. */
- BD_EVENT_READ_ERROR, /* Reading of .m2ts aligned unit failed. Next call to read will try next block. */
- BD_EVENT_ENCRYPTED, /* .m2ts file is encrypted and can't be played */
-
- /* current playback position */
- BD_EVENT_ANGLE, /* current angle, 1...N */
- BD_EVENT_TITLE, /* current title, 1...N (0 = top menu) */
- BD_EVENT_PLAYLIST, /* current playlist (xxxxx.mpls) */
- BD_EVENT_PLAYITEM, /* current play item, 0...N-1 */
- BD_EVENT_CHAPTER, /* current chapter, 1...N */
- BD_EVENT_END_OF_TITLE,
-
- /* stream selection */
- BD_EVENT_AUDIO_STREAM, /* 1..32, 0xff = none */
- BD_EVENT_IG_STREAM, /* 1..32 */
- BD_EVENT_PG_TEXTST_STREAM, /* 1..255, 0xfff = none */
- BD_EVENT_PIP_PG_TEXTST_STREAM, /* 1..255, 0xfff = none */
- BD_EVENT_SECONDARY_AUDIO_STREAM, /* 1..32, 0xff = none */
- BD_EVENT_SECONDARY_VIDEO_STREAM, /* 1..32, 0xff = none */
-
- BD_EVENT_PG_TEXTST, /* 0 - disable, 1 - enable */
- BD_EVENT_PIP_PG_TEXTST, /* 0 - disable, 1 - enable */
- BD_EVENT_SECONDARY_AUDIO, /* 0 - disable, 1 - enable */
- BD_EVENT_SECONDARY_VIDEO, /* 0 - disable, 1 - enable */
- BD_EVENT_SECONDARY_VIDEO_SIZE, /* 0 - PIP, 0xf - fullscreen */
-
- /* HDMV VM or JVM seeked the stream. Next read() will return data from new position. */
- BD_EVENT_SEEK,
-
- /* still playback (pause) */
- BD_EVENT_STILL, /* 0 - off, 1 - on */
-
- /* Still playback for n seconds (reached end of still mode play item) */
- BD_EVENT_STILL_TIME, /* 0 = infinite ; 1...300 = seconds */
-
- /* Play sound effect */
- BD_EVENT_SOUND_EFFECT, /* effect ID */
-
- /* Pop-Up menu available */
- BD_EVENT_POPUP, /* 0 - no, 1 - yes */
-
- /* Interactive menu visible */
- BD_EVENT_MENU, /* 0 - no, 1 - yes */
-} bd_event_e;
-
-typedef struct {
- uint32_t event; /* bd_event_e */
- uint32_t param;
-} BD_EVENT;
-
-#define BLURAY_TITLE_CURRENT 0xffffffff // custom
-#define BLURAY_TITLE_FIRST_PLAY 0xffff
-#define BLURAY_TITLE_TOP_MENU 0
-/**
- *
- * Get event from libbluray event queue.
- *
- * @param bd BLURAY object
- * @param event next BD_EVENT from event queue, NULL to initialize event queue
- * @return 1 on success, 0 if no events
- */
-int bd_get_event(BLURAY *bd, BD_EVENT *event);
-
-/*
- * navigaton mode
- */
-
-/**
- *
- * Start playing disc in navigation mode (using on-disc menus).
- *
- * Playback is started from "First Play" title.
- *
- * @param bd BLURAY object
- * @return 1 on success, 0 if error
- */
-int bd_play(BLURAY *bd);
-
-/**
- *
- * Read from currently playing title.
- *
- * When playing disc in navigation mode this function must be used instead of bd_read().
- *
- * @param bd BLURAY object
- * @param buf buffer to read data into
- * @param len size of data to be read
- * @param event next BD_EVENT from event queue (BD_EVENT_NONE if no events)
- * @return size of data read, -1 if error, 0 if event needs to be handled first, 0 if end of title was reached
- */
-int bd_read_ext(BLURAY *bd, unsigned char *buf, int len, BD_EVENT *event);
-
-/**
- *
- * Play a title (from disc index).
- *
- * Title 0 = Top Menu
- * Title 0xffff = First Play title
- * Number of titles can be found from BLURAY_DISC_INFO.
- *
- * @param bd BLURAY object
- * @param title title number from disc index
- * @return 1 on success, 0 if error
- */
-int bd_play_title(BLURAY *bd, unsigned title);
-
-/**
- *
- * Open BluRay disc Top Menu.
- *
- * Current pts is needed for resuming playback when menu is closed.
- *
- * @param bd BLURAY object
- * @param pts current playback position (1/90000s) or -1
- * @return 1 on success, 0 if error
- */
-int bd_menu_call(BLURAY *bd, int64_t pts);
-
-/*
- * User interaction and On-screen display controller
- */
-
-struct bd_overlay_s; /* defined in overlay.h */
-typedef void (*bd_overlay_proc_f)(void *, const struct bd_overlay_s * const);
-
-/**
- *
- * Register overlay graphics handler function.
- *
- * @param bd BLURAY object
- * @param handle application-specific handle that will be passed to handler function
- * @param func handler function pointer
- * @return 1 on success, 0 if error
- */
-void bd_register_overlay_proc(BLURAY *bd, void *handle, bd_overlay_proc_f func);
-
-/**
- *
- * Pass user input to graphics controller.
- * Keys are defined in libbluray/keys.h.
- * Current pts can be updated by using BD_VK_NONE key. This is required for animated menus.
- *
- * @param bd BLURAY object
- * @param pts current playback position (1/90000s) or -1
- * @param key input key
- * @return <0 on error, 0 on success, >0 if selection/activation changed
- */
-int bd_user_input(BLURAY *bd, int64_t pts, uint32_t key);
-
-/**
- *
- * Select menu button at location (x,y).
- *
- * @param bd BLURAY object
- * @param pts current playback position (1/90000s) or -1
- * @param x mouse pointer x-position
- * @param y mouse pointer y-position
- * @return <0 on error, 0 when mouse is outside of buttons, 1 when mouse is inside button
- */
-int bd_mouse_select(BLURAY *bd, int64_t pts, uint16_t x, uint16_t y);
-
-/**
- *
- * Get sound effect
- *
- * @param bd BLURAY object
- * @param effect_id sound effect id (0...N)
- * @param effect sound effect data
- * @return <0 when no effects, 0 when id out of range, 1 on success
- */
-int bd_get_sound_effect(BLURAY *bd, unsigned sound_id, struct bd_sound_effect *effect);
-
-/*
- *
- */
-
-struct meta_dl;
-/**
- *
- * Get meta information about the bluray disc.
- *
- * @param bd BLURAY object
- * @return allocated META_DL (disclib) object, NULL on error
- */
-struct meta_dl *bd_get_meta(BLURAY *bd);
-
-
-struct clpi_cl;
-/**
- *
- * Get copy of clip information for requested playitem.
- *
- * @param bd BLURAY objects
- * @param clip_ref requested playitem number
- * @return pointer to allocated CLPI_CL object on success, NULL on error
- */
-struct clpi_cl *bd_get_clpi(BLURAY *bd, unsigned clip_ref);
-
-/**
- *
- * Free CLPI_CL object
- *
- * @param cl CLPI_CL objects
- */
-void bd_free_clpi(struct clpi_cl *cl);
-
-/**
- *
- * Get information about the clip
- *
- * @param bd BLURAY object
- * @param clip clip index
- * @param clip_start_time start of the clip (in the total title) (in 90khz)
- * @param stream_start_time first pts in the clip (in 90khz)
- * @param byte position of the clip (absolute)
- * @param duration duration of the clip (in 90khz)
- */
-int bd_get_clip_infos(BLURAY *bd, int clip, uint64_t *clip_start_time, uint64_t *stream_start_time, uint64_t *pos, uint64_t *duration);
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* BLURAY_H_ */
View
59 DirectShowFilters/BDReader/libbluray/keys.h
@@ -1,59 +0,0 @@
-/*
- * This file is part of libbluray
- * Copyright (C) 2010 hpi1
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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 Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#if !defined(_BD_KEYS_H_)
-#define _BD_KEYS_H_
-
-/*
- * User input
- */
-
-typedef enum {
- BD_VK_NONE = 0xffff,
-
- /* numeric key events */
- BD_VK_0 = 0,
- BD_VK_1 = 1,
- BD_VK_2 = 2,
- BD_VK_3 = 3,
- BD_VK_4 = 4,
- BD_VK_5 = 5,
- BD_VK_6 = 6,
- BD_VK_7 = 7,
- BD_VK_8 = 8,
- BD_VK_9 = 9,
-
- /* */
- BD_VK_ROOT_MENU = 10, /* open root menu */
- BD_VK_POPUP = 11, /* toggle popup menu */
-
- /* interactive key events */
- BD_VK_UP = 12,
- BD_VK_DOWN = 13,
- BD_VK_LEFT = 14,
- BD_VK_RIGHT = 15,
- BD_VK_ENTER = 16,
-
- /* Mouse click */
- /* Translated to BD_VK_ENTER if mouse is over valid button */
- BD_VK_MOUSE_ACTIVATE = 17,
-
-} bd_vk_key_e;
-
-#endif // _BD_KEYS_H_
View
1 DirectShowFilters/BDReader/libbluray/license.txt
@@ -1 +0,0 @@
-bluray.dll is based on libbluray (GPL) component. It has been build without any modifications from the LAV filter fork of libbluray (git://git.1f0.de/libbluray.git).
View
69 DirectShowFilters/BDReader/libbluray/overlay.h
@@ -1,69 +0,0 @@
-/*
- * This file is part of libbluray
- * Copyright (C) 2010 hpi1
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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 Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#ifndef BD_OVERLAY_H_
-#define BD_OVERLAY_H_
-
-#include <stdint.h>
-
-#define BD_OVERLAY_INTERFACE_VERSION 2
-
-typedef enum {
- BD_OVERLAY_PG = 0, /* Presentation Graphics plane */
- BD_OVERLAY_IG = 1, /* Interactive Graphics plane (on top of PG plane) */
-} bd_overlay_plane_e;
-
-typedef enum {
- BD_OVERLAY_INIT, /* init overlay plane. Size of full plane in x,y,w,h */
- BD_OVERLAY_CLEAR, /* clear plane */
- BD_OVERLAY_DRAW, /* draw bitmap (x,y,w,h,img,palette) */
- BD_OVERLAY_WIPE, /* clear area (x,y,w,h) */
- BD_OVERLAY_FLUSH, /* all changes have been done, flush overlay to display at given pts */
- BD_OVERLAY_CLOSE, /* close overlay */
-} bd_overlay_cmd_e;
-
-typedef struct bd_pg_palette_entry_s {
- uint8_t Y;
- uint8_t Cr;
- uint8_t Cb;
- uint8_t T;
-} BD_PG_PALETTE_ENTRY;
-
-typedef struct bd_pg_rle_elem_s {
- uint16_t len;
- uint16_t color;
-} BD_PG_RLE_ELEM;
-
-typedef struct bd_overlay_s {
- int64_t pts;
- uint8_t plane; /* bd_overlay_plane_e */
- uint8_t cmd; /* bd_overlay_cmd_e */
-
- uint16_t x;
- uint16_t y;
- uint16_t w;
- uint16_t h;
-
- const BD_PG_PALETTE_ENTRY * palette;
- const BD_PG_RLE_ELEM * img;
-
-} BD_OVERLAY;
-
-
-#endif // BD_OVERLAY_H_
View
247 DirectShowFilters/BDReader/libbluray/stdint.h
@@ -1,247 +0,0 @@
-// ISO C9x compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
-//
-// Copyright (c) 2006-2008 Alexander Chemeris
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. The name of the author may be used to endorse or promote products
-// derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
-// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler give many errors like this:
-// error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#ifdef __cplusplus
-extern "C" {
-#endif
-# include <wchar.h>
-#ifdef __cplusplus
-}
-#endif
-
-// Define _W64 macros to mark types changing their size, like intptr_t.
-#ifndef _W64
-# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-# define _W64 __w64
-# else
-# define _W64
-# endif
-#endif
-
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-
-// Visual Studio 6 and Embedded Visual C++ 4 doesn't
-// realize that, e.g. char has the same size as __int8
-// so we give up on __intX for them.
-#if (_MSC_VER < 1300)
- typedef signed char int8_t;
- typedef signed short int16_t;
- typedef signed int int32_t;
- typedef unsigned char uint8_t;
- typedef unsigned short uint16_t;
- typedef unsigned int uint32_t;
-#else
- typedef signed __int8 int8_t;
- typedef signed __int16 int16_t;
- typedef signed __int32 int32_t;
- typedef unsigned __int8 uint8_t;
- typedef unsigned __int16 uint16_t;
- typedef unsigned __int32 uint32_t;
-#endif
-typedef signed __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t int_least8_t;
-typedef int16_t int_least16_t;
-typedef int32_t int_least32_t;
-typedef int64_t int_least64_t;
-typedef uint8_t uint_least8_t;
-typedef uint16_t uint_least16_t;
-typedef uint32_t uint_least32_t;
-typedef uint64_t uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t int_fast8_t;
-typedef int16_t int_fast16_t;
-typedef int32_t int_fast32_t;
-typedef int64_t int_fast64_t;
-typedef uint8_t uint_fast8_t;
-typedef uint16_t uint_fast16_t;
-typedef uint32_t uint_fast32_t;
-typedef uint64_t uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
- typedef signed __int64 intptr_t;
- typedef unsigned __int64 uintptr_t;
-#else // _WIN64 ][
- typedef _W64 signed int intptr_t;
- typedef _W64 unsigned int uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t intmax_t;
-typedef uint64_t uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN ((int8_t)_I8_MIN)
-#define INT8_MAX _I8_MAX
-#define INT16_MIN ((int16_t)_I16_MIN)
-#define INT16_MAX _I16_MAX
-#define INT32_MIN ((int32_t)_I32_MIN)
-#define INT32_MAX _I32_MAX
-#define INT64_MIN ((int64_t)_I64_MIN)
-#define INT64_MAX _I64_MAX
-#define UINT8_MAX _UI8_MAX
-#define UINT16_MAX _UI16_MAX
-#define UINT32_MAX _UI32_MAX
-#define UINT64_MAX _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN INT8_MIN
-#define INT_LEAST8_MAX INT8_MAX
-#define INT_LEAST16_MIN INT16_MIN
-#define INT_LEAST16_MAX INT16_MAX
-#define INT_LEAST32_MIN INT32_MIN
-#define INT_LEAST32_MAX INT32_MAX
-#define INT_LEAST64_MIN INT64_MIN
-#define INT_LEAST64_MAX INT64_MAX
-#define UINT_LEAST8_MAX UINT8_MAX
-#define UINT_LEAST16_MAX UINT16_MAX
-#define UINT_LEAST32_MAX UINT32_MAX
-#define UINT_LEAST64_MAX UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN INT8_MIN
-#define INT_FAST8_MAX INT8_MAX
-#define INT_FAST16_MIN INT16_MIN
-#define INT_FAST16_MAX INT16_MAX
-#define INT_FAST32_MIN INT32_MIN
-#define INT_FAST32_MAX INT32_MAX
-#define INT_FAST64_MIN INT64_MIN
-#define INT_FAST64_MAX INT64_MAX
-#define UINT_FAST8_MAX UINT8_MAX
-#define UINT_FAST16_MAX UINT16_MAX
-#define UINT_FAST32_MAX UINT32_MAX
-#define UINT_FAST64_MAX UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-# define INTPTR_MIN INT64_MIN
-# define INTPTR_MAX INT64_MAX
-# define UINTPTR_MAX UINT64_MAX
-#else // _WIN64 ][
-# define INTPTR_MIN INT32_MIN
-# define INTPTR_MAX INT32_MAX
-# define UINTPTR_MAX UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN INT64_MIN
-#define INTMAX_MAX INT64_MAX
-#define UINTMAX_MAX UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-# define PTRDIFF_MIN _I64_MIN
-# define PTRDIFF_MAX _I64_MAX
-#else // _WIN64 ][
-# define PTRDIFF_MIN _I32_MIN
-# define PTRDIFF_MAX _I32_MAX
-#endif // _WIN64 ]
-
-#define SIG_ATOMIC_MIN INT_MIN
-#define SIG_ATOMIC_MAX INT_MAX
-
-#ifndef SIZE_MAX // [
-# ifdef _WIN64 // [
-# define SIZE_MAX _UI64_MAX
-# else // _WIN64 ][
-# define SIZE_MAX _UI32_MAX
-# endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-# define WCHAR_MIN 0
-#endif // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-# define WCHAR_MAX _UI16_MAX
-#endif // WCHAR_MAX ]
-
-#define WINT_MIN 0
-#define WINT_MAX _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val) val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val) val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-#define INTMAX_C INT64_C
-#define UINTMAX_C UINT64_C
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-
-#endif // _MSC_STDINT_H_ ]
View
6 DirectShowFilters/BDReader/source/BDReader.cpp
@@ -40,8 +40,8 @@
#include "..\..\alloctracing.h"
extern void SetThreadName(DWORD dwThreadID, char* threadName);
-extern void LogDebug(const char *fmt, ...);
-extern void GetLogFile(char *pLog);
+extern void LogDebug(const char* fmt, ...);
+extern void GetLogFile(TCHAR* pLog);
const AMOVIESETUP_MEDIATYPE acceptAudioPinTypes =
{
@@ -69,7 +69,7 @@ const AMOVIESETUP_PIN pins[] =
const AMOVIESETUP_FILTER BDReader =
{
- &CLSID_BDReader, L"MediaPortal BD Reader", MERIT_NORMAL + 1000, 3, pins
+ &CLSID_BDReader, L"MediaPortal BD Reader", MERIT_NORMAL + 1000, 3, pins, CLSID_LegacyAmFilterCategory
};
CFactoryTemplate g_Templates[] =
View
5 DirectShowFilters/BDReader/source/DeMultiplexer.cpp
@@ -774,9 +774,10 @@ bool CDeMultiplexer::AudioStreamsAvailable(BLURAY_CLIP_INFO* pClip)
{
bool hasAudio = false;
- for (int i = 0; i < pClip->raw_stream_count; i++)
+ // TODO check if we can always rely on the audio_stream_count > 0
+ for (int i = 0; i < pClip->audio_stream_count; i++)
{
- switch (pClip->raw_streams[i].coding_type)
+ switch (pClip->audio_streams[i].coding_type)
{
case BLURAY_STREAM_TYPE_AUDIO_MPEG1:
case BLURAY_STREAM_TYPE_AUDIO_MPEG2:
View
14 DirectShowFilters/BDReader/source/LibBlurayWrapper.cpp
@@ -122,21 +122,23 @@ void CLibBlurayWrapper::StaticOverlayProc(void *this_gen, const BD_OVERLAY * con
bool CLibBlurayWrapper::Initialize()
{
- TCHAR szDirectory[MAX_PATH] = "";
- TCHAR szPath[MAX_PATH] = "";
+ USES_CONVERSION;
+
+ TCHAR szDirectory[MAX_PATH] = _T("");
+ TCHAR szPath[MAX_PATH] = _T("");
GetModuleFileName(NULL, szPath, sizeof(szPath) - 1);
- strncpy(szDirectory, szPath, strrchr(szPath, '\\') - szPath);
- szDirectory[strlen(szDirectory)] = '\0';
+ _tcsncpy(szDirectory, szPath, _tcsrchr(szPath, '\\') - szPath);
+ szDirectory[_tcslen(szDirectory)] = '\0';
- wsprintf(szDirectory,"%s\\bluray.dll", szDirectory);
+ _stprintf_s(szDirectory, _T("%s\\bluray.dll"), szDirectory);
LogDebug("CLibBlurayWrapper - Load bluray: %s", szDirectory);
m_hDLL = LoadLibrary(szDirectory);
if (!m_hDLL)
{
LogDebug("Failed to load the DLL from application exe path, trying c:\\");
- m_hDLL = LoadLibrary("c:\\bluray.dll");
+ m_hDLL = LoadLibrary(_T("c:\\bluray.dll"));
}
if (!m_hDLL)
View
2 DirectShowFilters/BDReader/source/LibBlurayWrapper.h
@@ -31,6 +31,8 @@
using namespace std;
+#define BLURAY_TITLE_CURRENT 0xffffffff // custom addition to the title
+
enum PLAYBACK_MODE
{
Navigation = 0,
View
18 DirectShowFilters/BDReader/source/utils.cpp
@@ -5,26 +5,28 @@
#include <streams.h>
#include <initguid.h>
#include <shlobj.h>
-#include <tchar.h>
// For more details for memory leak detection see the alloctracing.h header
#include "..\..\alloctracing.h"
-static char logFile[MAX_PATH];
+static TCHAR logFile[MAX_PATH];
static WORD logFileParsed = -1;
-void GetLogFile(char *pLog)
+void GetLogFile(TCHAR* pLog)
{
SYSTEMTIME systemTime;
GetLocalTime(&systemTime);
- if(logFileParsed != systemTime.wDay)
+ if (logFileParsed != systemTime.wDay)
{
TCHAR folder[MAX_PATH];
::SHGetSpecialFolderPath(NULL,folder,CSIDL_COMMON_APPDATA,FALSE);
- sprintf(logFile,"%s\\Team MediaPortal\\MediaPortal\\Log\\BDReader-%04.4d-%02.2d-%02.2d.Log",folder, systemTime.wYear, systemTime.wMonth, systemTime.wDay);
+
+ _stprintf_s(logFile, _T("%s\\Team MediaPortal\\MediaPortal\\Log\\BDReader-%04.4d-%02.2d-%02.2d.Log"),
+ folder, systemTime.wYear, systemTime.wMonth, systemTime.wDay);
+
logFileParsed=systemTime.wDay; // rec
}
- strcpy(pLog, &logFile[0]);
+ _tcscpy(pLog, &logFile[0]);
}
void LogDebug(const char *fmt, ...)
@@ -43,9 +45,9 @@ void LogDebug(const char *fmt, ...)
//#ifdef DONTLOG
TCHAR filename[1024];
GetLogFile(filename);
- FILE* fp = fopen(filename,"a+");
+ FILE* fp = _tfopen(filename, _T("a+"));
- if (fp != NULL)
+ if (fp)
{
fprintf(fp,"%02.2d-%02.2d-%04.4d %02.2d:%02.2d:%02.2d.%03.3d [%5x]%s\n",
systemTime.wDay, systemTime.wMonth, systemTime.wYear,
View
12 DirectShowFilters/DVBSubtitle3/DVBSubtitle3.vcxproj
@@ -24,13 +24,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Static</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>false</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -80,7 +80,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>$(DSHOW_BASE); $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)baseclasses; $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -107,7 +107,7 @@
<AdditionalDependencies>strmbase.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\Release/DVBSub3.ax</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(DSHOW_BASE)Release_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\libSource\Hdmv\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)baseclasses\release; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\libSource\Hdmv\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>uafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\source\DVBSub3.def</ModuleDefinitionFile>
@@ -134,7 +134,7 @@
<ClCompile>
<AdditionalOptions>/D "_WIN32_WINNT=0x0501" /D "WINVER=0x0501" /D "NTDDI_VERSION=NTDDI_WINXPSP2" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(DSHOW_BASE); $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)baseclasses; $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DBG=1;DEBUG;_DEBUG;INC_OLE2;STRICT;_WIN32_WINNT=0x0400;WIN32;_WIN32;_MT;_DLL;_X86_=1;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -159,7 +159,7 @@
<AdditionalDependencies>strmbasd.lib;winmm.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\Debug/DVBSub3.ax</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(DSHOW_BASE)Debug_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;Source\Hdmv\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)baseclasses\debug; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;Source\Hdmv\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>uafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\source\DVBSub3.def</ModuleDefinitionFile>
View
2 DirectShowFilters/DVBSubtitle3/Source/DVBSub.cpp
@@ -33,7 +33,7 @@
extern void LogDebug( const char *fmt, ... );
extern void LogDebugPTS( const char *fmt, uint64_t pts );
-extern void GetLogFile(char *pLog);
+extern void GetLogFile(TCHAR* pLog);
//
// Constructor
View
13 DirectShowFilters/DVBSubtitle3/Source/dllmain.cpp
@@ -61,7 +61,8 @@ const AMOVIESETUP_FILTER FilterInfo =
L"MediaPortal DVBSub3", // String name
MERIT_DO_NOT_USE, // Filter merit
1, // Number pins
- sudPins // Pin details
+ sudPins, // Pin details
+ CLSID_LegacyAmFilterCategory
};
@@ -106,12 +107,12 @@ BOOL APIENTRY DllMain(HANDLE hModule,
// Logging
//#ifdef DEBUG
-char *logbuffer=NULL;
-void GetLogFile(char *pLog)
+char* logbuffer = NULL;
+void GetLogFile(TCHAR* pLog)
{
TCHAR folder[MAX_PATH];
::SHGetSpecialFolderPath(NULL,folder,CSIDL_COMMON_APPDATA,FALSE);
- sprintf(pLog,"%s\\Team MediaPortal\\MediaPortal\\Log\\DVBSubs.log",folder);
+ _stprintf(pLog, _T("%s\\Team MediaPortal\\MediaPortal\\Log\\DVBSubs.log"), folder);
}
@@ -131,9 +132,9 @@ void LogDebug(const char *fmt, ...)
//#ifdef DONTLOG
TCHAR filename[1024];
GetLogFile(filename);
- FILE* fp = fopen(filename,"a+");
+ FILE* fp = _tfopen(filename, _T("a+"));
- if (fp!=NULL)
+ if (fp)
{
fprintf(fp,"%02.2d-%02.2d-%04.4d %02.2d:%02.2d:%02.2d.%03.3d [%x]%s\n",
systemTime.wDay, systemTime.wMonth, systemTime.wYear,
View
8 DirectShowFilters/DXErr9/dxerr9.vcxproj
@@ -46,7 +46,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(DSHOW_BASE);$(WINDOWS_SDK)Include\;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>(SolutionDir)baseclasses;$(WINDOWS_SDK)Include\;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DXERR9_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -63,7 +63,7 @@
<Link>
<AdditionalDependencies>dxerr.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\Debug/dxerr9.dll</OutputFile>
- <AdditionalLibraryDirectories>$(DSHOW_BASE)Debug_MBCS;$(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>(SolutionDir)baseclasses\debug_MBCS;$(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>bin\Debug/dxerr9.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -76,7 +76,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>$(DSHOW_BASE); $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>(SolutionDir)baseclasses; $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DXERR9_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -92,7 +92,7 @@
<Link>
<AdditionalDependencies>dxerr.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\Release/dxerr9.dll</OutputFile>
- <AdditionalLibraryDirectories>$(DSHOW_BASE)Release_MBCS;$(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>(SolutionDir)baseclasses\release_MBCS;$(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<ProgramDatabaseFile>bin\Release/dxerr9.pcb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
View
12 mediaportal/Core.cpp/DXUtil/DXUtil.vcxproj → DirectShowFilters/DXUtil/DXUtil.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -53,7 +53,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(DSHOW_BASE); $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>(SolutionDir)baseclasses; $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DXUTIL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -68,7 +68,7 @@
</ClCompile>
<Link>
<OutputFile>bin\Debug/dxutil.dll</OutputFile>
- <AdditionalLibraryDirectories>$(DSHOW_BASE)Debug_MBCS;$(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>(SolutionDir)baseclasses\debug;$(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>bin\Debug/dxutil.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -81,7 +81,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>$(DSHOW_BASE); $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>(SolutionDir)baseclasses; $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DXUTIL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -94,7 +94,7 @@
</ClCompile>
<Link>
<OutputFile>bin\Release/dxutil.dll</OutputFile>
- <AdditionalLibraryDirectories>$(DSHOW_BASE)Release_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>(SolutionDir)baseclasses\release; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<ProgramDatabaseFile>bin\Release/dxutil.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,4 +120,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
View
0 ...aportal/Core.cpp/DXUtil/source/DXUtil.cpp → DirectShowFilters/DXUtil/source/DXUtil.cpp
File renamed without changes.
View
0 ...aportal/Core.cpp/DXUtil/source/stdafx.cpp → DirectShowFilters/DXUtil/source/stdafx.cpp
File renamed without changes.
View
0 mediaportal/Core.cpp/DXUtil/source/stdafx.h → DirectShowFilters/DXUtil/source/stdafx.h
File renamed without changes.
View
2 ...Core.cpp/DirectShowHelper/dshowhelper.sln → ...wFilters/DirectShowHelper/dshowhelper.sln
@@ -1,4 +1,4 @@
-???
+
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectShowHelper", "dshowhelper.vcxproj", "{7C2419B3-501B-4B10-B3D4-E81BEB16843F}"
View
16 ....cpp/DirectShowHelper/dshowhelper.vcxproj → ...ters/DirectShowHelper/dshowhelper.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -21,12 +21,12 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>false</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -53,7 +53,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(DSHOW_BASE); $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)baseclasses; $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DSHOWHELPER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -70,7 +70,7 @@
<Link>
<AdditionalDependencies>strmbasd.lib;winmm.lib;comsupp.lib;dxguid.lib;d3d9.lib;d3dx9.lib;mfuuid.lib;dxva2.lib;evr.lib;mf.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\Debug/dshowhelper.dll</OutputFile>
- <AdditionalLibraryDirectories>$(DSHOW_BASE)Debug_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)baseclasses\debug; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>./source/dshowhelper.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -88,7 +88,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>$(DSHOW_BASE); $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)baseclasses; $(WINDOWS_SDK)Include; $(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DSHOWHELPER_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -103,7 +103,7 @@
<Link>
<AdditionalDependencies>strmbase.lib;winmm.lib;comsupp.lib;dxguid.lib;d3d9.lib;d3dx9.lib;mfuuid.lib;dxva2.lib;evr.lib;mf.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\Release/dshowhelper.dll</OutputFile>
- <AdditionalLibraryDirectories>$(DSHOW_BASE)Release_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)baseclasses\release; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>./source/dshowhelper.def</ModuleDefinitionFile>
@@ -152,4 +152,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
View
862 ...owHelper/source/DX9AllocatorPresenter.cpp → ...owHelper/source/DX9AllocatorPresenter.cpp
@@ -1,431 +1,431 @@
-// Copyright (C) 2005-2010 Team MediaPortal
-// http://www.team-mediaportal.com
-//
-// MediaPortal 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.
-//
-// MediaPortal 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.
-//
-// You should have received a copy of the GNU General Public License
-// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
-
-#pragma warning(disable: 4244)
-
-#include <streams.h>