Skip to content

Commit 95a315c

Browse files
hanker-luhanker-lu
committed
(v1.0.1)edit the file nametello_video_with_pose_recognitionand modify the install.bat
1 parent 779cdc5 commit 95a315c

32 files changed

+2345
-1373
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This toolkit contains three sample programs based on tello sdk and python2.7,inc
1818

1919
- **Tello_Video(With_Pose_Recognition)**
2020

21-
Tello_Video(With_Pose_Recognition) is an application version modified from Tello_Video.It uses the decoded video data，and everytime extract a single frame image for pose recognition operation , and binds the specific posture and aircraft control commands to realize the pose control of Tello.This code is mainly used as an application case for utilizing the decoded video data of tello for image processing.
21+
Tello_Video_With_Pose_Recognition is an application version modified from Tello_Video.It uses the decoded video data，and everytime extract a single frame image for pose recognition operation , and binds the specific posture and aircraft control commands to realize the pose control of Tello.This code is mainly used as an application case for utilizing the decoded video data of tello for image processing.
2222

2323
- **Tello_state.py**
2424

‎Tello_Video/install/Windows/install.bat‎

Lines changed: 10 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,13 @@ set pythonLib="C:\Python27\Lib\site-packages\"
1212
set /a maxRetry=3
1313
set /a retryCount=0
1414
echo ------------------------------------------------------
15-
::08.27 改变ffmpeg 从develop版本变为share版本
16-
::08.27 改变libboost 从ffmpeg包含变为独立版本
17-
::08.27 暂时不需要libopencv-dev python-opencv opencv-python dlib python-imaging-tk
18-
::08.27 h264库为现有工程
19-
::08.27 拷贝h264的dll、libboost的dll以及ffmpeg的dll进c:\python27\lib\site-packages
20-
::08.27 libboost-all-dev 变为预编译库版本
21-
::08.28 增加了本地提权功能
22-
::08.28 增加了与提权后配套的目录切换功能
23-
::08.28 增加了MD5校验功能
24-
::08.29 增加了MD5重试3次就跳过的功能
25-
::08.29 增加了MD5检查工具不存在就跳过检查的功能
26-
::08.31 增加了当前目录下如果有符合的MD5值的文件，就跳过下载
27-
::08.31 FAQ 奇怪的dll缺失问题 api-ms-win-downlevel-shlwapi-l1-1-0.dll
28-
29-
::TODO: 增加安装包自动获取名字的功能
30-
::TODO: 判断是否已有python2.7
31-
::TODO: 其他版本已有环境变量问题 使用find命令
32-
::TODO: Jscript中增加判断参数格式功能
33-
::TODO: 自动检测后缀名并去除
34-
::TODO: MD5检查可以放进down里调用
35-
::TODO: 如果文件夹下已有正确MD5的文件 那么就使用现有文件
36-
::TODO: 自动判断并创建download目录，将下载的文件全部放入download目录中
37-
::TODO: 加入探测失败系统类型后，手动选择功能
38-
39-
::done: 获取windows版本
40-
::done: 完善win32版本的地址
41-
::done: 校验MD5值
42-
::done: Jscript中增加函数传参
43-
::done: 判断是否已有python2.7环境变量
4415

4516
::-------------------down python2.7 and install-------------------
4617
echo ------------------------------------------------------
4718
echo Downloading python2.7
4819
echo ------------------------------------------------------
4920
::此条注册表项用于开启ssl、tls多个版本的支持，用于解决python官网拒绝访问的问题
50-
REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v SecureProtocols /t REG_DWORD /d 2728 /f
21+
REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v SecureProtocols /t REG_DWORD /d 2728 /f >nul
5122
set /a retryCount=0
5223
for %%# in (certutil.exe) do (
5324
if not exist "%%~f$PATH:#" (
@@ -109,12 +80,6 @@ if "%MD5pass%" == "NO" (
10980
python %pipPackage%
11081
python -m pip install -U pip
11182
:downpipend
112-
::-------------------Cygwin g++的安装-------------------
113-
rem call :down %CygwinDown% %CygwinPackage%
114-
rem runas /user:administrator %CygwinPackage% -q -D -N -n -d -O -S %CygwinSource%
115-
rem runas /user:administrator %CygwinPackage% -q -P %CygwinPackagegpp% -S %CygwinSource%
116-
::-------------------cmake的安装-------------------
117-
rem python -m pip install cmake
11883
::-------------------libboost-all-dev 的安装-------------------
11984
echo ------------------------------------------------------
12085
echo Downloading libboost
@@ -191,7 +156,7 @@ if "%MD5pass%" == "NO" (
191156
goto downvs2013
192157
)
193158
)
194-
call %vs2013package% /SILENT /NORESTART
159+
call %vs2013package% /passive /NORESTART
195160
:downvs2013end
196161
::-------------------python-numpy python-matplotlib opencv-python的安装（pip方式）-------------------
197162
echo ------------------------------------------------------
@@ -205,24 +170,22 @@ python -m pip install matplotlib
205170
echo ------------------------------------------------------
206171
echo Downloading opencv-python
207172
echo ------------------------------------------------------
208-
python -m pip install opencv-python
173+
python -m pip install -v opencv-python==3.4.2.17
209174
echo ------------------------------------------------------
210175
echo Downloading pillow
211176
echo ------------------------------------------------------
212177
python -m pip install pillow
213-
::h264库安装
214-
::call :h264install
215-
178+
:copydependencies
216179
::-------------------放置所有依赖库中的dll去c:\python27\lib\site-packages-------------------
217180
echo ------------------------------------------------------
218181
echo Copying dependencies
219182
echo ------------------------------------------------------
220183
echo %extract%\%ffmpegPackage:~0,-4%\bin\
221184
echo %libboostPackageCopy%
222185
echo %libh264%
223-
xcopy /Y /E /I %extract%\%ffmpegPackage:~0,-4%\bin %pythonLib%
186+
xcopy /Y /E /I %extract%\%ffmpegPackage:~0,-4%\bin\*.dll %pythonLib%
224187
xcopy /Y /E /I %libboostPackageCopy% %pythonLib%
225-
xcopy /Y /E /I %libh264% %pythonLib%
188+
xcopy /Y /E /I %libh264%\*.pyd %pythonLib%
226189
endlocal
227190
echo ------------------------------------------------------
228191
echo Installation done.
@@ -315,10 +278,10 @@ if %versionFlag%==win64 (
315278

316279
set libboostDown="https://nchc.dl.sourceforge.net/project/boost/boost-binaries/1.68.0/boost_1_68_0-msvc-12.0-64.exe"
317280
set libboostPackage="boost_1_68_0-msvc-12.0-64.exe"
318-
set libboostPackageCopy="c:\local\boost_1_68_0\lib64-msvc-12.0"
281+
set libboostPackageCopy="c:\local\boost_1_68_0\lib64-msvc-12.0\boost_python27-vc120-mt-x64-1_68.dll"
319282
set libboostMD5="4e6b11a971502639ba5cc564c7f2d568"
320283

321-
set libh264=h264decoder\libs\x64
284+
set libh264=..\..\h264decoder\windows\x64
322285

323286
set vs2013depend="https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe"
324287
set vs2013package=vcredist_x64.exe
@@ -339,20 +302,15 @@ if %versionFlag%==win64 (
339302

340303
set libboostDown="https://excellmedia.dl.sourceforge.net/project/boost/boost-binaries/1.68.0/boost_1_68_0-msvc-12.0-32.exe"
341304
set libboostPackage="boost_1_68_0-msvc-12.0-32.exe"
342-
set libboostPackageCopy="c:\local\boost_1_68_0\lib32-msvc-12.0"
305+
set libboostPackageCopy="c:\local\boost_1_68_0\lib32-msvc-12.0\boost_python27-vc120-mt-x32-1_68.dll"
343306
set libboostMD5="d5d5ee205c87078245eb7df72789f407"
344307

345-
set libh264=h264decoder\libs\x86
308+
set libh264=..\..\h264decoder\windows\x86
346309

347310
set vs2013depend="https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe"
348311
set vs2013package=vcredist_x86.exe
349312
set vs2013MD5="0fc525b6b7b96a87523daa7a0013c69d"
350313
)
351-
:: set CygwinDown="https://cygwin.com/setup-x86_64.exe"
352-
:: set CygwinPackage=setup-x86_64.exe
353-
:: set CygwinSource=http://mirrors.163.com/cygwin/x86_64/
354-
:: set CygwinPackagegpp="mingw64-x86_64-gcc-g++-5.4.0-3"
355-
356314

357315
goto :eof
358316

0 commit comments

Comments
 (0)