diff --git a/Delphi-FFMPEG b/Delphi-FFMPEG index 1c13d3c..0ce4148 160000 --- a/Delphi-FFMPEG +++ b/Delphi-FFMPEG @@ -1 +1 @@ -Subproject commit 1c13d3c4087b4abab65a90d119a5168fe914257d +Subproject commit 0ce4148739c00fff33c77188c3c167e944e0e9ab diff --git a/InitDelphiFFMPEG.cmd b/InitDelphiFFMPEG.cmd index a8c5624..51c550f 100644 --- a/InitDelphiFFMPEG.cmd +++ b/InitDelphiFFMPEG.cmd @@ -1,2 +1,19 @@ +@echo off +rem Get the submodule initially @git submodule update --init -@git submodule update \ No newline at end of file +@git submodule update + +rem Time passes, submodule upstream is updated +rem and you now want to update + +rem Change to the submodule directory +cd Delphi-FFMPEG + +rem Checkout desired branch +git checkout master + +rem Update +git pull + +rem Get back to your project root +cd .. \ No newline at end of file diff --git a/packages/Delphi 10.3 Rio/rclFMXOpenCV.dpk b/packages/Delphi 10.3 Rio/rclFMXOpenCV.dpk index 45967d6..d724cae 100644 --- a/packages/Delphi 10.3 Rio/rclFMXOpenCV.dpk +++ b/packages/Delphi 10.3 Rio/rclFMXOpenCV.dpk @@ -27,6 +27,7 @@ package rclFMXOpenCV; {$ENDIF IMPLICITBUILDING} {$RUNONLY} {$IMPLICITBUILD ON} +{$DESCRIPTION 'OpenCV FMX runtime library'} requires rtl, diff --git a/packages/Delphi 10.3 Rio/rclVCLOpenCV.dproj b/packages/Delphi 10.3 Rio/rclVCLOpenCV.dproj index f1e2bab..f799c3f 100644 --- a/packages/Delphi 10.3 Rio/rclVCLOpenCV.dproj +++ b/packages/Delphi 10.3 Rio/rclVCLOpenCV.dproj @@ -212,8 +212,6 @@ Microsoft Office 2000 Sample Automation Server Wrapper Components Microsoft Office XP Sample Automation Server Wrapper Components - TeeChart Lite FMX Components - TeeChart Standard VCL Components diff --git a/packages/FMXOpenCV.res b/packages/FMXOpenCV.res new file mode 100644 index 0000000..770f0bd Binary files /dev/null and b/packages/FMXOpenCV.res differ diff --git a/packages/VCLOpenCV.res b/packages/VCLOpenCV.res new file mode 100644 index 0000000..472e50b Binary files /dev/null and b/packages/VCLOpenCV.res differ diff --git a/packages/dclFMXOpenCV.res b/packages/dclFMXOpenCV.res new file mode 100644 index 0000000..d6960b4 Binary files /dev/null and b/packages/dclFMXOpenCV.res differ diff --git a/packages/dclVCLOpenCV.res b/packages/dclVCLOpenCV.res new file mode 100644 index 0000000..8765853 Binary files /dev/null and b/packages/dclVCLOpenCV.res differ diff --git a/packages/haarcascade.res b/packages/haarcascade.res new file mode 100644 index 0000000..d8498b1 Binary files /dev/null and b/packages/haarcascade.res differ diff --git a/packages/rclFMXOpenCV.res b/packages/rclFMXOpenCV.res new file mode 100644 index 0000000..e54289a Binary files /dev/null and b/packages/rclFMXOpenCV.res differ diff --git a/packages/rclVCLOpenCV.res b/packages/rclVCLOpenCV.res new file mode 100644 index 0000000..d666e70 Binary files /dev/null and b/packages/rclVCLOpenCV.res differ diff --git a/packages/rtpFFMPEG.res b/packages/rtpFFMPEG.res new file mode 100644 index 0000000..11e98a9 Binary files /dev/null and b/packages/rtpFFMPEG.res differ diff --git a/samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.dproj b/samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.dproj index f0510f0..f8d450f 100644 --- a/samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.dproj +++ b/samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.dproj @@ -1,7 +1,7 @@  {08BFF34B-6FF9-468C-9AB2-3F76BBC9E351} - 18.7 + 18.8 VCL cFFmpegIPCamSource.dpr True @@ -164,12 +164,20 @@ classes 1 + + classes + 1 + res\xml 1 + + res\xml + 1 + @@ -182,12 +190,26 @@ library\lib\armeabi 1 + + library\lib\armeabi + 1 + + + + + library\lib\armeabi-v7a + 1 + library\lib\mips 1 + + library\lib\mips + 1 + @@ -195,126 +217,216 @@ library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + + + + + library\lib\armeabi-v7a + 1 + res\drawable 1 + + res\drawable + 1 + res\values 1 + + res\values + 1 + res\values-v21 1 + + res\values-v21 + 1 + res\values 1 + + res\values + 1 + res\drawable 1 + + res\drawable + 1 + res\drawable-xxhdpi 1 + + res\drawable-xxhdpi + 1 + res\drawable-ldpi 1 + + res\drawable-ldpi + 1 + res\drawable-mdpi 1 + + res\drawable-mdpi + 1 + res\drawable-hdpi 1 + + res\drawable-hdpi + 1 + res\drawable-xhdpi 1 + + res\drawable-xhdpi + 1 + res\drawable-mdpi 1 + + res\drawable-mdpi + 1 + res\drawable-hdpi 1 + + res\drawable-hdpi + 1 + res\drawable-xhdpi 1 + + res\drawable-xhdpi + 1 + res\drawable-xxhdpi 1 + + res\drawable-xxhdpi + 1 + res\drawable-xxxhdpi 1 + + res\drawable-xxxhdpi + 1 + res\drawable-small 1 + + res\drawable-small + 1 + res\drawable-normal 1 + + res\drawable-normal + 1 + res\drawable-large 1 + + res\drawable-large + 1 + res\drawable-xlarge 1 + + res\drawable-xlarge + 1 + res\values 1 + + res\values + 1 + @@ -403,6 +515,9 @@ 0 + + 0 + 0 @@ -736,6 +851,9 @@ 1 + + 1 + @@ -828,6 +946,10 @@ library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + 1 @@ -852,6 +974,12 @@ 0 + + + library\lib\armeabi-v7a + 1 + + 1 @@ -889,6 +1017,7 @@ + True diff --git a/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.dproj b/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.dproj index de8a436..7388b8f 100644 --- a/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.dproj +++ b/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.dproj @@ -1,7 +1,7 @@  {AFAC16AE-8CE1-43E4-9A25-DC1ED8B0A497} - 18.2 + 18.8 VCL vclOCVaOGL.dpr True @@ -127,10 +127,12 @@ true 1033 + Debug true 1033 + Debug @@ -216,7 +218,6 @@ 1 - Contents\MacOS 0 @@ -225,6 +226,20 @@ classes 1 + + classes + 1 + + + + + res\xml + 1 + + + res\xml + 1 + @@ -237,12 +252,26 @@ library\lib\armeabi 1 + + library\lib\armeabi + 1 + + + + + library\lib\armeabi-v7a + 1 + library\lib\mips 1 + + library\lib\mips + 1 + @@ -250,78 +279,216 @@ library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + + + + + library\lib\armeabi-v7a + 1 + res\drawable 1 + + res\drawable + 1 + res\values 1 + + res\values + 1 + + + + + res\values-v21 + 1 + + + res\values-v21 + 1 + + + + + res\values + 1 + + + res\values + 1 + res\drawable 1 + + res\drawable + 1 + res\drawable-xxhdpi 1 + + res\drawable-xxhdpi + 1 + res\drawable-ldpi 1 + + res\drawable-ldpi + 1 + res\drawable-mdpi 1 + + res\drawable-mdpi + 1 + res\drawable-hdpi 1 + + res\drawable-hdpi + 1 + res\drawable-xhdpi 1 + + res\drawable-xhdpi + 1 + + + + + res\drawable-mdpi + 1 + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + res\drawable-xhdpi + 1 + + + + + res\drawable-xxhdpi + 1 + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + res\drawable-small 1 + + res\drawable-small + 1 + res\drawable-normal 1 + + res\drawable-normal + 1 + res\drawable-large 1 + + res\drawable-large + 1 + res\drawable-xlarge 1 + + res\drawable-xlarge + 1 + + + + + res\values + 1 + + + res\values + 1 + @@ -341,6 +508,11 @@ 1 .framework + + Contents\MacOS + 1 + .framework + 0 @@ -363,6 +535,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .dll;.bpl @@ -386,6 +563,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .bpl @@ -395,6 +577,9 @@ 0 + + 0 + 0 @@ -408,6 +593,10 @@ Contents\Resources\StartUp\ 0 + + Contents\Resources\StartUp\ + 0 + 0 @@ -423,6 +612,17 @@ 1 + + + 1 + + + 1 + + + 1 + + 1 @@ -434,6 +634,39 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 @@ -445,6 +678,61 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 @@ -456,6 +744,116 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 @@ -489,10 +887,35 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 + + 1 + @@ -544,29 +967,51 @@ 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + ..\ 1 + + ..\ + 1 + Contents 1 + + Contents + 1 + Contents\Resources 1 + + Contents\Resources + 1 + library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + 1 @@ -583,10 +1028,20 @@ Contents\MacOS 1 + + Contents\MacOS + 1 + 0 + + + library\lib\armeabi-v7a + 1 + + 1 @@ -622,7 +1077,9 @@ + + True diff --git a/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.res b/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.res index 4ffb292..b60b859 100644 Binary files a/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.res and b/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.res differ