ffmpeg bugfix and dldt 2020.1 changes

Author: banderlog

README.md

@@ -107,22 +107,17 @@ I compiled it on Ubuntu 18.04 Linux Container.
 sudo apt-get update
 sudo apt install build-essential cmake git pkg-config python3-dev nasm python3 virtualenv libusb-1.0-0-dev chrpath patchelf
 ```
-#### Optional ranger-fm installation
 
-```
-sudo apt install python3-pip
-pip3 install ranger-fm --user
-export PATH=~/.local/bin:$PATH
-```
 ### Preparing
 
+0. `git clone https://github.com/banderlog/opencv-python-inference-engine`
 1. Download releases of [dldt](https://github.com/opencv/dldt/releases), [opencv](https://github.com/opencv/opencv/releases) and [ffmpeg](https://github.com/FFmpeg/FFmpeg/releases) (or clone their repos)
-2. Unpack archives to `dldt`,`opencv` and `ffmpeg` folders.
+2. Unpack archives to `dldt`,`opencv` and `ffmpeg` folders (e.g.: `tar -xf 2020.1.tar.gz --strip-components=1 -C ./opencv-python-inference-engine/dldt/`).
 
 3. You'll need to get 3rd party `ade` and `ngraph` repos of certain commit for dldt ([#2](https://github.com/banderlog/opencv-python-inference-engine/issues/2)):
 
 ```bash
-cd dldt/inference-engine/thirdparty/ade
+cd ./opencv-python-inference-engine/dldt/inference-engine/thirdparty/ade
 git clone https://github.com/opencv/ade/ ./
 git reset --hard cbe2db6
 
@@ -135,7 +130,7 @@ git reset --hard b0bb801
 
 ```bash
 # return to "opencv-python-inference-engine" dir
-cd ../../../../
+cd ../../
 virtualenv --clear --always-copy -p /usr/bin/python3 ./venv
 ./venv/bin/pip3 install numpy
 ```
@@ -157,7 +152,6 @@ make install
 cd ../dldt
 ./dldt_setup.sh
 make -j8
-make ie_cpu_extension
 
 cd ../opencv
 ABS_PORTION=YOUR_ABSOLUTE_PATH_TO_opencv-python-inference-engine_dir ./opencv_setup.sh
@@ -171,9 +165,9 @@ make -j8
 cd ../../
 cp build/opencv/lib/python3/cv2.cpython*.so create_wheel/cv2/cv2.so
 
-cp dldt/inference-engine/bin/intel64/Release/lib/*.so create_wheel/cv2/
-cp dldt/inference-engine/bin/intel64/Release/lib/*.mvcmd create_wheel/cv2/
-cp dldt/inference-engine/bin/intel64/Release/lib/plugins.xml create_wheel/cv2/
+cp dldt/bin/intel64/Release/lib/*.so create_wheel/cv2/
+cp dldt/bin/intel64/Release/lib/*.mvcmd create_wheel/cv2/
+cp dldt/bin/intel64/Release/lib/plugins.xml create_wheel/cv2/
 cp dldt/inference-engine/temp/tbb/lib/libtbb.so.2 create_wheel/cv2/
 
 cp build/ffmpeg/binaries/lib/*.so create_wheel/cv2/

build/opencv/opencv_setup.sh

@@ -19,6 +19,7 @@ PY_LIB_PATH=`find $ABS_PORTION/venv/lib/ -iname libpython3.${PY_VER}m.so`
 # >=dldt-2019_R2 requires SSE4_2 (?)
 # for CPU_BASELINE and CPU_DISPATCH see https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options
 # they should match with ones for  dldt/inference-engine/src/extension/cmake/OptimizationFlags.cmake 
+
 cmake -D CMAKE_BUILD_TYPE=RELEASE \
     -D OPENCV_FORCE_3RDPARTY_BUILD=ON \
     -D OPENCV_SKIP_PYTHON_LOADER=ON \
@@ -35,14 +36,6 @@ cmake -D CMAKE_BUILD_TYPE=RELEASE \
     -D WITH_PNG=ON \
     -D WITH_FFMPEG=ON \
     -D FFMPEG_INCLUDE_DIRS=$FFMPEG_PATH/include \
-    -D FFMPEG_ABSOLUTE_avformat=$FFMPEG_PATH/lib/libavformat.so \
-    -D pkgcfg_lib_FFMPEG_avformat=$FFMPEG_PATH/lib/pkgconfig/libavformat.pc \
-    -D FFMPEG_ABSOLUTE_avcodec=$FFMPEG_PATH/lib/libavcodec.so \
-    -D pkgcfg_lib_FFMPEG_avcodec=$FFMPEG_PATH/lib/pkgconfig/libavcodec.pc \
-    -D FFMPEG_ABSOLUTE_avutil=$FFMPEG_PATH/lib/libavutil.so \
-    -D pkgcfg_lib_FFMPEG_avutil=$FFMPEG_PATH/lib/pkgconfig/libavutil.pc \
-    -D FFMPEG_ABSOLUTE_swscale=$FFMPEG_PATH/lib/libswscale.so \
-    -D pkgcfg_lib_FFMPEG_swscale=$FFMPEG_PATH/lib/pkgconfig/libswscale.pc \
     -D CMAKE_INSTALL_PREFIX=./binaries/ \
     -D WITH_TBB=ON \
     -D WITH_PROTOBUF=ON \