[release] v3.3.0

compile_ffmpeg.sh

@@ -37,10 +37,10 @@ fi
 
 FFMPEG_MLU_VER=""
 FFMPEG_MLU_LIB_VER=""
-if [ "${MLU_PLATFORM}" == "MLU370" ]; then
+if [[ "${MLU_PLATFORM}" == "MLU370" || "${MLU_PLATFORM}" == "MLU300" || "${MLU_PLATFORM}" == "MLU500" ]];then
    FFMPEG_MLU_VER="300"
    FFMPEG_MLU_LIB_VER="_v3"
-elif [ "${MLU_PLATFORM}" == "MLU200" ]; then
+elif [[ "${MLU_PLATFORM}" == "MLU200" || "${MLU_PLATFORM}" == "MLU220" || "${MLU_PLATFORM}" == "MLU270" ]];then
    FFMPEG_MLU_VER="200"
 else
    echo "!!! ERROR: The input parameter is not supported: ${MLU_PLATFORM} !!!"

dockerfile/Dockerfile

@@ -25,14 +25,14 @@
 #    --net=host --pid=host --ipc=host -v $HOME/.Xauthority -it --name ubuntu_ffmpeg-mlu  -v $PWD:/workspace ubuntu_ffmpeg-mlu:v1
 # 4. if docker is ready, can execute it by docker start ubuntu_ffmpeg-mlu / docker exec -it  ubuntu_ffmpeg-mlu /bin/bash
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER <Cambricon, Inc.>
 
 WORKDIR /root/ffmpeg-mlu/
 
-ARG neuware_version=cntoolkit_1.6.0
-ARG neuware_package=${neuware_version}-1.ubuntu16.04_amd64.deb
+ARG neuware_version=cntoolkit_3.6.0
+ARG neuware_package=${neuware_version}-1.ubuntu18.04_amd64.deb
 ARG mlu_platform=MLU270
 
 RUN echo -e 'nameserver 114.114.114.114' > /etc/resolv.conf
@@ -67,7 +67,7 @@ RUN dpkg -i /root/ffmpeg-mlu/$neuware_package && \
     cd ffmpeg && \
     git apply ../ffmpeg4.2_mlu.patch && \
     mkdir build && cd build && \
-    ../configure --enable-gpl --enable-version3 --enable-mlumpp --extra-cflags="-I/usr/local/neuware/include" --extra-ldflags="-L/usr/local/neuware/lib64" --extra-libs="-lcncodec -lcnrt -ldl -lcndrv" && \
+    ../configure --enable-gpl --enable-version3 --enable-mlu --enable-mlumpp --extra-cflags="-I/usr/local/neuware/include" --extra-ldflags="-L/usr/local/neuware/lib64" --extra-libs="-lcncodec -lcncodec_v3 -lcnrt -ldl -lcndrv" && \
     make -j && \
     rm -rf /root/ffmpeg-mlu/$neuware_package