Merge branch 'master' of github.com:Laex/Delphi-OpenCV

This commit is contained in:
Mikhail Grigorev 2014-05-23 13:22:49 +06:00
commit 1a6c7d053c
11 changed files with 22 additions and 17 deletions

View File

@ -5,7 +5,7 @@
<FrameworkType>VCL</FrameworkType> <FrameworkType>VCL</FrameworkType>
<MainSource>cCameraCapture.dpr</MainSource> <MainSource>cCameraCapture.dpr</MainSource>
<Base>True</Base> <Base>True</Base>
<Config Condition="'$(Config)'==''">Release</Config> <Config Condition="'$(Config)'==''">Debug</Config>
<Platform Condition="'$(Platform)'==''">Win32</Platform> <Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>3</TargetedPlatforms> <TargetedPlatforms>3</TargetedPlatforms>
<AppType>Application</AppType> <AppType>Application</AppType>
@ -93,6 +93,7 @@
<DCC_RemoteDebug>true</DCC_RemoteDebug> <DCC_RemoteDebug>true</DCC_RemoteDebug>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 10:59:06</VerInfo_Keys>
<VerInfo_Locale>1033</VerInfo_Locale> <VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<DCC_RemoteDebug>false</DCC_RemoteDebug> <DCC_RemoteDebug>false</DCC_RemoteDebug>
@ -108,7 +109,7 @@
<DCC_DebugInformation>0</DCC_DebugInformation> <DCC_DebugInformation>0</DCC_DebugInformation>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=22.05.2014 23:26:02</VerInfo_Keys> <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 10:54:28</VerInfo_Keys>
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe> <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Locale>1033</VerInfo_Locale> <VerInfo_Locale>1033</VerInfo_Locale>

View File

@ -59,7 +59,6 @@ object MainForm: TMainForm
Top = 28 Top = 28
Width = 300 Width = 300
Height = 300 Height = 300
VideoSource = ocvcmrsrc1
end end
object ocvw2: TocvView object ocvw2: TocvView
Left = 8 Left = 8
@ -103,7 +102,10 @@ object MainForm: TMainForm
end end
object ocvmgprtn1: TocvImageOperation object ocvmgprtn1: TocvImageOperation
VideoSource = ocvcmrsrc1 VideoSource = ocvcmrsrc1
OperationClassName = 'TocvNoneOperation' OperationClassName = 'TovcCannyOperation'
Operation.Threshold1 = 10.000000000000000000
Operation.Threshold2 = 100.000000000000000000
Operation.ApertureSize = 3
Operations = < Operations = <
item item
OperationClassName = 'TocvHaarCascade' OperationClassName = 'TocvHaarCascade'
@ -129,6 +131,7 @@ object MainForm: TMainForm
Operation.CropRect.Width = 0 Operation.CropRect.Width = 0
Operation.CropRect.Height = 0 Operation.CropRect.Height = 0
end> end>
OperationsEnabled = False
OnAfterEachOperation = ocvmgprtn1AfterEachOperation OnAfterEachOperation = ocvmgprtn1AfterEachOperation
Left = 36 Left = 36
Top = 392 Top = 392
@ -146,7 +149,6 @@ object MainForm: TMainForm
Top = 40 Top = 40
end end
object ocvpcmsrc1: TocvIPCamSource object ocvpcmsrc1: TocvIPCamSource
Enabled = True
UserName = 'admin' UserName = 'admin'
Password = 'admin' Password = 'admin'
IP = '10.1.1.202' IP = '10.1.1.202'

View File

@ -83,7 +83,7 @@
<DCC_RemoteDebug>true</DCC_RemoteDebug> <DCC_RemoteDebug>true</DCC_RemoteDebug>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 0:25:10</VerInfo_Keys> <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 10:58:12</VerInfo_Keys>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Locale>1033</VerInfo_Locale> <VerInfo_Locale>1033</VerInfo_Locale>
<DCC_RemoteDebug>false</DCC_RemoteDebug> <DCC_RemoteDebug>false</DCC_RemoteDebug>

View File

@ -2,8 +2,8 @@ object Form1: TForm1
Left = 0 Left = 0
Top = 0 Top = 0
Caption = 'FFMpeg IP Camera source' Caption = 'FFMpeg IP Camera source'
ClientHeight = 273 ClientHeight = 194
ClientWidth = 356 ClientWidth = 229
Color = clBtnFace Color = clBtnFace
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -13,21 +13,21 @@ object Form1: TForm1
OldCreateOrder = False OldCreateOrder = False
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
object ocvw1: TocvView object ocvView1: TocvView
Left = 0 Left = 0
Top = 0 Top = 0
Width = 356 Width = 229
Height = 273 Height = 194
VideoSource = ocvfmpgpcmsrc1 VideoSource = ocvFFMpegIPCamSource1
Align = alClient Align = alClient
end end
object ocvfmpgpcmsrc1: TocvFFMpegIPCamSource object ocvFFMpegIPCamSource1: TocvFFMpegIPCamSource
Enabled = True Enabled = True
UserName = 'admin' UserName = 'admin'
Password = 'admin' Password = 'admin'
IP = '10.1.1.202' IP = '10.1.1.202'
URI = '/cam/realmonitor?channel=1&subtype=0' URI = '/cam/realmonitor?channel=1&subtype=0'
Left = 76 Left = 104
Top = 40 Top = 96
end end
end end

View File

@ -10,6 +10,8 @@ type
TForm1 = class(TForm) TForm1 = class(TForm)
ocvfmpgpcmsrc1: TocvFFMpegIPCamSource; ocvfmpgpcmsrc1: TocvFFMpegIPCamSource;
ocvw1: TocvView; ocvw1: TocvView;
ocvFFMpegIPCamSource1: TocvFFMpegIPCamSource;
ocvView1: TocvView;
private private
{ Private declarations } { Private declarations }
public public

View File

@ -190,7 +190,7 @@
<DCC_UnitSearchPath>..;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> <DCC_UnitSearchPath>..;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Locale>1033</VerInfo_Locale> <VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_Keys>CompanyName=;FileDescription=OpenCV Component;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=OpenCV Component;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 0:24:38</VerInfo_Keys> <VerInfo_Keys>CompanyName=;FileDescription=OpenCV Component;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=OpenCV Component;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 10:55:14</VerInfo_Keys>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''"> <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput> <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>

View File

@ -123,7 +123,7 @@
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Locale>1033</VerInfo_Locale> <VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_Keys>CompanyName=;FileDescription=OpenCV Component;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=OpenCV Component;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 0:24:42</VerInfo_Keys> <VerInfo_Keys>CompanyName=;FileDescription=OpenCV Component;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=OpenCV Component;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 10:55:17</VerInfo_Keys>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''"> <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput> <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>