update openharmony 1.0.1

.gitignore

@@ -1,39 +0,0 @@
-*.a
-*.o
-*.o.*
-*.d
-*.def
-*.dll
-*.dylib
-*.exe
-*.exp
-*.gcda
-*.gcno
-*.h.c
-*.ilk
-*.lib
-*.pc
-*.pdb
-*.so
-*.so.*
-*.swp
-*.ver
-*.version
-*.ptx
-*.ptx.c
-*_g
-\#*
-.\#*
-/.config
-/.version
-/ffmpeg
-/ffplay
-/ffprobe
-/config.asm
-/config.h
-/coverage.info
-/avversion.h
-/lcov/
-/src
-/mapfile
-/tools/python/__pycache__/

Makefile

@@ -1,182 +1,58 @@
-MAIN_MAKEFILE=1
-include ffbuild/config.mak
+LOCAL_DIR := $(shell pwd)
+MIDDLEWARE_DIR := $(LOCAL_DIR)
+include $(MIDDLEWARE_DIR)/cfg.mak
 
-vpath %.c    $(SRC_PATH)
-vpath %.cpp  $(SRC_PATH)
-vpath %.h    $(SRC_PATH)
-vpath %.inc  $(SRC_PATH)
-vpath %.m    $(SRC_PATH)
-vpath %.S    $(SRC_PATH)
-vpath %.asm  $(SRC_PATH)
-vpath %.rc   $(SRC_PATH)
-vpath %.v    $(SRC_PATH)
-vpath %.texi $(SRC_PATH)
-vpath %.cu   $(SRC_PATH)
-vpath %.ptx  $(SRC_PATH)
-vpath %/fate_config.sh.template $(SRC_PATH)
+GREEN="\e[32;1m"
+DONE="\e[39m"
+RED="\e[31m"
 
-TESTTOOLS   = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch
-HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
-
-# $(FFLIBS-yes) needs to be in linking order
-FFLIBS-$(CONFIG_AVDEVICE)   += avdevice
-FFLIBS-$(CONFIG_AVFILTER)   += avfilter
-FFLIBS-$(CONFIG_AVFORMAT)   += avformat
-FFLIBS-$(CONFIG_AVCODEC)    += avcodec
-FFLIBS-$(CONFIG_AVRESAMPLE) += avresample
-FFLIBS-$(CONFIG_POSTPROC)   += postproc
-FFLIBS-$(CONFIG_SWRESAMPLE) += swresample
-FFLIBS-$(CONFIG_SWSCALE)    += swscale
-
-FFLIBS := avutil
-
-DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd
-
-SKIPHEADERS = compat/w32pthreads.h
-
-# first so "all" becomes default target
-all: all-yes
-
-include $(SRC_PATH)/tools/Makefile
-include $(SRC_PATH)/ffbuild/common.mak
-CFLAGS += --target=arm-liteos --sysroot=../../../../../../../../prebuilts/lite/sysroot
-CFLAGS += -Wno-deprecated-declarations -Wno-incompatible-pointer-types-discards-qualifiers \
-          -Wno-string-plus-int -Wno-absolute-value -Wno-format -Wno-invalid-source-encoding \
-          -Wno-missing-prototypes
-
-FF_EXTRALIBS := $(FFEXTRALIBS)
-FF_DEP_LIBS  := $(DEP_LIBS)
-FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
-
-$(TOOLS): %$(EXESUF): %.o
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS-$(*F)) $(EXTRALIBS) $(ELIBS)
-
-target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
-
-tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
-
-tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS)
-tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS)
-tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS)
-tools/target_dec_%_fuzzer$(EXESUF): $(FF_DEP_LIBS)
-
-CONFIGURABLE_COMPONENTS =                                           \
-    $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))                 \
-    $(SRC_PATH)/libavcodec/bitstream_filters.c                      \
-    $(SRC_PATH)/libavcodec/parsers.c                                \
-    $(SRC_PATH)/libavformat/protocols.c                             \
-
-config.h: ffbuild/.config
-ffbuild/.config: $(CONFIGURABLE_COMPONENTS)
-	@-tput bold 2>/dev/null
-	@-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n'
-	@-tput sgr0 2>/dev/null
-
-SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS               \
-               HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS            \
-               ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS     \
-               ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS                \
-               MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS         \
-               MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS
-
-define RESET
-$(1) :=
-$(1)-yes :=
-endef
-
-define DOSUBDIR
-$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
-SUBDIR := $(1)/
-include $(SRC_PATH)/$(1)/Makefile
--include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
--include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
-include $(SRC_PATH)/ffbuild/library.mak
-endef
-
-$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
-
-include $(SRC_PATH)/fftools/Makefile
-include $(SRC_PATH)/doc/Makefile
-include $(SRC_PATH)/doc/examples/Makefile
-
-libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h
-
-$(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
-ifeq ($(STRIPTYPE),direct)
-	$(STRIP) -o $@ $<
+COMPILE_ROOT := $(LOCAL_DIR)
+FFMPEG_VER := ffmpeg-y
+ifeq ($(CFG_CHIP_TYPE), hi3516cv300)
+FF_CONFIG_SH := enable_decoder_config.sh
+#else ifeq ($(CFG_CHIP_TYPE), hi3518ev300)
+#FF_CONFIG_SH := enable_decoder_config.sh
 else
-	$(CP) $< $@
-	$(STRIP) $@
+FF_CONFIG_SH := disable_decoder_config.sh
 endif
 
-%$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
+export LITEOS_MACRO
+export LITEOS_OSDRV_INCLUDE
+export LITEOS_USR_INCLUDE
+export LITEOS_CMACRO
+export LITEOS_INCLUDE
+export LITEOSTOPDIR
 
-VERSION_SH  = $(SRC_PATH)/ffbuild/version.sh
-GIT_LOG     = $(SRC_PATH)/.git/logs/HEAD
-
-.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) ffbuild/config.mak
-.version: M=@
-
-libavutil/ffversion.h .version:
-	$(M)$(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION)
-	$(Q)touch .version
-
-# force version.sh to run whenever version might have changed
--include .version
-
-install: install-libs install-headers
-
-install-libs: install-libs-yes
-
-install-data: $(DATA_FILES)
-	$(Q)mkdir -p "$(DATADIR)"
-	$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
-
-uninstall: uninstall-data uninstall-headers uninstall-libs uninstall-pkgconfig
-
-uninstall-data:
-	$(RM) -r "$(DATADIR)"
-
-clean::
-	$(RM) $(CLEANSUFFIXES)
-	$(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES)) $(addprefix compat/*/*/,$(CLEANSUFFIXES))
-	$(RM) -r coverage-html
-	$(RM) -rf coverage.info coverage.info.in lcov
-
-distclean:: clean
-	$(RM) .version avversion.h config.asm config.h mapfile  \
-		ffbuild/.config ffbuild/config.* libavutil/avconfig.h \
-		version.h libavutil/ffversion.h libavcodec/codec_names.h \
-		libavcodec/bsf_list.c libavformat/protocol_list.c \
-		libavcodec/codec_list.c libavcodec/parser_list.c \
-		libavformat/muxer_list.c libavformat/demuxer_list.c \
-		libavdevice/indev_list.c libavdevice/outdev_list.c libavfilter/filter_list.c
-ifeq ($(SRC_LINK),src)
-	$(RM) src
+#override CFLAGS to avoid ffmpeg configure use
+CFLAGS:=
+FF_ADAPT_LITEOS=y
+#export LLVM_COMPILER=y
+ifeq ($(CFG_OS_TYPE), linux)
+export LLVM_COMPILER=n
+CONFIGURE_FILE := configure_gcc
+else
+export LLVM_COMPILER=y
+CONFIGURE_FILE := configure_llvm
 endif
-	$(RM) -rf doc/examples/pc-uninstalled
 
-config:
-	$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
+ORG_FFMPEG := $(FFMPEG_VER)
 
-build: all alltools examples testprogs
-check: all alltools examples testprogs fate
+MODNAME := $(FFMPEG_VER)
 
-include $(SRC_PATH)/tests/Makefile
+all: $(ORG_FFMPEG)
 
-$(sort $(OUTDIRS)):
-	$(Q)mkdir -p $@
+.PHONY: $(ORG_FFMPEG) clean
 
-# Dummy rule to stop make trying to rebuild removed or renamed headers
-%.h:
-	@:
+install:$(ORG_FFMPEG)
 
-# Disable suffix rules.  Most of the builtin rules are suffix rules,
-# so this saves some time on slow systems.
-.SUFFIXES:
+clean:
+	@if  [ -d $(ORG_FFMPEG)/install ]; then \
+	cd $(COMPILE_ROOT)/$(ORG_FFMPEG);$(MAKE) $(MFLAGS) distclean;$(MAKE) $(MFLAGS) uninstall;rm -rf $(COMPILE_ROOT)/$(ORG_FFMPEG)/install; \
+	fi
 
-.PHONY: all all-yes alltools build check config testprogs
-.PHONY: *clean install* uninstall*
+$(ORG_FFMPEG):
+	cp $(CONFIGURE_FILE) $(FFMPEG_VER)/configure
+	@if  [ -d $(FFMPEG_VER) ]; then cd $@; chmod 777 ./* -R; ./$(FF_CONFIG_SH) $(CFG_CHIP_TYPE) $(CFG_OS_TYPE) $(CFG_LINUX_COMPILER_VER) $(CFG_OHOS_BUILD_PATH); cd -; fi
+	@if  [ $(FF_ADAPT_LITEOS) = 'y' ]; then cd $@; ./adapt_liteos_config.sh; cd -; fi
+	$(MAKE) $(MFLAGS) -j16 -C $(COMPILE_ROOT)/$@
+	$(MAKE) $(MFLAGS) -C $(@) install

cfg.mak

@@ -0,0 +1,4 @@
+CFG_CHIP_TYPE=hi3518ev300
+CFG_OS_TYPE=ohos
+CFG_LINUX_COMPILER_VER=himix100
+CFG_OHOS_BUILD_PATH=

doc/.gitignore

@@ -1,9 +0,0 @@
-/*.1
-/*.3
-/*.html
-/*.pod
-/config.texi
-/avoptions_codec.texi
-/avoptions_format.texi
-/fate.txt
-/print_options

doc/doxy/.gitignore

@@ -1 +0,0 @@
-/html/

doc/examples/.gitignore

@@ -1,24 +0,0 @@
-/avio_dir_cmd
-/avio_reading
-/decode_audio
-/decode_video
-/demuxing_decoding
-/encode_audio
-/encode_video
-/extract_mvs
-/filter_audio
-/filtering_audio
-/filtering_video
-/http_multiclient
-/hw_decode
-/metadata
-/muxing
-/pc-uninstalled
-/qsvdec
-/remuxing
-/resampling_audio
-/scaling_video
-/transcode_aac
-/transcoding
-/vaapi_encode
-/vaapi_transcode

ffbuild/.gitignore

@@ -1,5 +0,0 @@
-/.config
-/config.fate
-/config.log
-/config.mak
-/config.sh

ffmpeg-y/Makefile

@@ -0,0 +1,181 @@
+MAIN_MAKEFILE=1
+include ffbuild/config.mak
+
+vpath %.c    $(SRC_PATH)
+vpath %.cpp  $(SRC_PATH)
+vpath %.h    $(SRC_PATH)
+vpath %.inc  $(SRC_PATH)
+vpath %.m    $(SRC_PATH)
+vpath %.S    $(SRC_PATH)
+vpath %.asm  $(SRC_PATH)
+vpath %.rc   $(SRC_PATH)
+vpath %.v    $(SRC_PATH)
+vpath %.texi $(SRC_PATH)
+vpath %.cu   $(SRC_PATH)
+vpath %.ptx  $(SRC_PATH)
+vpath %/fate_config.sh.template $(SRC_PATH)
+
+TESTTOOLS   = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch
+HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
+
+# $(FFLIBS-yes) needs to be in linking order
+FFLIBS-$(CONFIG_AVDEVICE)   += avdevice
+FFLIBS-$(CONFIG_AVFILTER)   += avfilter
+FFLIBS-$(CONFIG_AVFORMAT)   += avformat
+FFLIBS-$(CONFIG_AVCODEC)    += avcodec
+FFLIBS-$(CONFIG_AVRESAMPLE) += avresample
+FFLIBS-$(CONFIG_POSTPROC)   += postproc
+FFLIBS-$(CONFIG_SWRESAMPLE) += swresample
+FFLIBS-$(CONFIG_SWSCALE)    += swscale
+
+FFLIBS := avutil
+
+DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd
+
+SKIPHEADERS = compat/w32pthreads.h
+
+# first so "all" becomes default target
+all: all-yes
+
+include $(SRC_PATH)/tools/Makefile
+include $(SRC_PATH)/ffbuild/common.mak
+ifeq ($(LLVM_COMPILER), y)
+CFLAGS += --target=arm-liteos --sysroot=../../../../../prebuilts/lite/sysroot
+LDFLAGS += --target=arm-liteos --sysroot=../../../../../prebuilts/lite/sysroot
+endif
+FF_EXTRALIBS := $(FFEXTRALIBS)
+FF_DEP_LIBS  := $(DEP_LIBS)
+FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
+
+$(TOOLS): %$(EXESUF): %.o
+	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS-$(*F)) $(EXTRALIBS) $(ELIBS)
+
+target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS)
+	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+
+tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS)
+	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+
+tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS)
+tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS)
+tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS)
+tools/target_dec_%_fuzzer$(EXESUF): $(FF_DEP_LIBS)
+
+CONFIGURABLE_COMPONENTS =                                           \
+    $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))                 \
+    $(SRC_PATH)/libavcodec/bitstream_filters.c                      \
+    $(SRC_PATH)/libavcodec/parsers.c                                \
+    $(SRC_PATH)/libavformat/protocols.c                             \
+
+config.h: ffbuild/.config
+ffbuild/.config: $(CONFIGURABLE_COMPONENTS)
+	@-tput bold 2>/dev/null
+	@-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n'
+	@-tput sgr0 2>/dev/null
+
+SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS               \
+               HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS            \
+               ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS     \
+               ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS                \
+               MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS         \
+               MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS
+
+define RESET
+$(1) :=
+$(1)-yes :=
+endef
+
+define DOSUBDIR
+$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
+SUBDIR := $(1)/
+include $(SRC_PATH)/$(1)/Makefile
+-include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
+-include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
+include $(SRC_PATH)/ffbuild/library.mak
+endef
+
+$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
+
+include $(SRC_PATH)/fftools/Makefile
+include $(SRC_PATH)/doc/Makefile
+include $(SRC_PATH)/doc/examples/Makefile
+
+libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h
+
+$(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
+ifeq ($(STRIPTYPE),direct)
+	$(STRIP) -o $@ $<
+else
+	$(CP) $< $@
+	$(STRIP) $@
+endif
+
+%$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS)
+	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
+
+VERSION_SH  = $(SRC_PATH)/ffbuild/version.sh
+GIT_LOG     = $(SRC_PATH)/.git/logs/HEAD
+
+.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) ffbuild/config.mak
+.version: M=@
+
+libavutil/ffversion.h .version:
+	$(M)$(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION)
+	$(Q)touch .version
+
+# force version.sh to run whenever version might have changed
+-include .version
+
+install: install-libs install-headers
+
+install-libs: install-libs-yes
+
+install-data: $(DATA_FILES)
+	$(Q)mkdir -p "$(DATADIR)"
+	$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
+
+uninstall: uninstall-data uninstall-headers uninstall-libs uninstall-pkgconfig
+
+uninstall-data:
+	$(RM) -r "$(DATADIR)"
+
+clean::
+	$(RM) $(CLEANSUFFIXES)
+	$(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES)) $(addprefix compat/*/*/,$(CLEANSUFFIXES))
+	$(RM) -r coverage-html
+	$(RM) -rf coverage.info coverage.info.in lcov
+
+distclean:: clean
+	$(RM) .version avversion.h config.asm config.h mapfile  \
+		ffbuild/.config ffbuild/config.* libavutil/avconfig.h \
+		version.h libavutil/ffversion.h libavcodec/codec_names.h \
+		libavcodec/bsf_list.c libavformat/protocol_list.c \
+		libavcodec/codec_list.c libavcodec/parser_list.c \
+		libavformat/muxer_list.c libavformat/demuxer_list.c \
+		libavdevice/indev_list.c libavdevice/outdev_list.c libavfilter/filter_list.c
+ifeq ($(SRC_LINK),src)
+	$(RM) src
+endif
+	$(RM) -rf doc/examples/pc-uninstalled
+
+config:
+	$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
+
+build: all alltools examples testprogs
+check: all alltools examples testprogs fate
+
+include $(SRC_PATH)/tests/Makefile
+
+$(sort $(OUTDIRS)):
+	$(Q)mkdir -p $@
+
+# Dummy rule to stop make trying to rebuild removed or renamed headers
+%.h:
+	@:
+
+# Disable suffix rules.  Most of the builtin rules are suffix rules,
+# so this saves some time on slow systems.
+.SUFFIXES:
+
+.PHONY: all all-yes alltools build check config testprogs
+.PHONY: *clean install* uninstall*

ffmpeg-y/configure

@@ -7272,7 +7272,7 @@ CC=$cc
 CXX=$cxx
 AS=$as
 OBJCC=$objcc
-LD=${cross_prefix}clang
+LD=clang
 DEPCC=$dep_cc
 DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS)
 DEPAS=$as

ffmpeg-y/disable_decoder_config.sh

@@ -1,9 +1,16 @@
 echo `pwd`
 CUR_DIR=$(pwd)
 CFG_CHIP_TYPE=$1
-COMPILER_DIR=$2
+CFG_OS_TYPE=$2
+CFG_LINUX_COMPILER_VER=$3
+CFG_OHOS_BUILD_PATH=$4
 
-CFG_SDK_TOOLCHAIN=$COMPILER_DIR/bin/
+echo "CFG_CHIP_TYPE=${CFG_CHIP_TYPE} CFG_OS_TYPE=${CFG_OS_TYPE} CFG_LINUX_COMPILER_VER=${CFG_LINUX_COMPILER_VER} CFG_OHOS_BUILD_PATH=${CFG_OHOS_BUILD_PATH}"
+if [ "${CFG_OS_TYPE}" == "ohos" ]; then
+CFG_SDK_TOOLCHAIN=${CFG_OHOS_BUILD_PATH}/
+else
+CFG_SDK_TOOLCHAIN=arm-${CFG_LINUX_COMPILER_VER}-linux-
+fi
 
 configure_attr=" --prefix=./install \
     --disable-autodetect \
@@ -51,90 +58,36 @@ configure_attr=" --prefix=./install \
     --enable-demuxer=wav \
     --disable-gpl \
     --disable-zlib \
-    --disable-w32threads \
-    --disable-os2threads \
-    --disable-alsa \
-    --disable-appkit \
-    --disable-avfoundation \
-    --disable-bzlib \
-    --disable-coreimage \
-    --disable-iconv \
-    --disable-libxcb \
-    --disable-libxcb-shm \
-    --disable-libxcb-xfixes \
-    --disable-libxcb-shape \
-    --disable-lzma \
-    --disable-sndio \
-    --disable-schannel \
-    --disable-sdl2 \
-    --disable-securetransport \
-    --disable-xlib \
-    --disable-amf \
-    --disable-audiotoolbox \
-    --disable-cuda-llvm \
-    --disable-cuvid \
-    --disable-nvdec \
-    --disable-nvenc \
-    --disable-vaapi \
-    --disable-vdpau \
-    --disable-videotoolbox \
-    --disable-ossfuzz \
-    --disable-swscale-alpha \
+    --disable-w32threads --disable-os2threads --disable-alsa --disable-appkit --disable-avfoundation \
+    --disable-bzlib --disable-coreimage --disable-iconv --disable-libxcb --disable-libxcb-shm \
+    --disable-libxcb-xfixes --disable-libxcb-shape --disable-lzma --disable-sndio --disable-schannel \
+    --disable-sdl2 --disable-securetransport --disable-xlib --disable-amf --disable-audiotoolbox \
+    --disable-cuda-llvm --disable-cuvid --disable-nvdec --disable-nvenc --disable-vaapi --disable-vdpau \
+    --disable-videotoolbox --disable-ossfuzz --disable-swscale-alpha \
     --disable-valgrind-backtrace \
     --disable-linux-perf "
 
 
-if [ ${CFG_CHIP_TYPE} == "hi3559av100" ]; then
-echo "hi3559av100 =? ${CFG_CHIP_TYPE}"
-configure_attr+=" --arch=arm64  --cross-prefix=${CFG_SDK_TOOLCHAIN} "
-fi
-
-if [ ${CFG_CHIP_TYPE} == "hi3559"  -o  ${CFG_CHIP_TYPE} == "hi3556" ]; then
+if [ "${CFG_CHIP_TYPE}" == "hi3559"  -o  "${CFG_CHIP_TYPE}" == "hi3556" ]; then
 echo "hi3559/hi3556 =? ${CFG_CHIP_TYPE}"
 configure_attr+=" --cpu=cortex-a7 --arch=armv7-a --cross-prefix=${CFG_SDK_TOOLCHAIN} "
 fi
 
-if [ ${CFG_CHIP_TYPE} == "hi3556av100" ]; then
-echo "hi3556av100 =? ${CFG_CHIP_TYPE}"
-configure_attr+=" --arch=armv7-a --cross-prefix=${CFG_SDK_TOOLCHAIN} "
-fi
-
-if [ ${CFG_CHIP_TYPE} == "hi3559v200" ]; then
+if [ "${CFG_CHIP_TYPE}" == "hi3559v200" ]; then
 echo "hi3559v200 =? ${CFG_CHIP_TYPE}"
 configure_attr+=" --cpu=cortex-a7 --arch=armv7-a --cross-prefix=${CFG_SDK_TOOLCHAIN} "
 fi
 
-if [ ${CFG_CHIP_TYPE} == "hi3516cv500" ]; then
-echo "hi3516cv500 =? ${CFG_CHIP_TYPE}"
-configure_attr+=" --cpu=cortex-a7 --arch=armv7-a --cross-prefix=${CFG_SDK_TOOLCHAIN} "
-fi
-
-if [ ${CFG_CHIP_TYPE} == "hi3516dv300" ]; then
+if [ "${CFG_CHIP_TYPE}" == "hi3516dv300" ]; then
 echo "hi3516dv300 =? ${CFG_CHIP_TYPE}"
 configure_attr+=" --cpu=cortex-a7 --arch=armv7-a --cross-prefix=${CFG_SDK_TOOLCHAIN} "
 fi
 
-if [ ${CFG_CHIP_TYPE} == "hi3518ev300" ]; then
+if [ "${CFG_CHIP_TYPE}" == "hi3518ev300" ]; then
 echo "hi3518ev300 =? ${CFG_CHIP_TYPE}"
 configure_attr+=" --cpu=cortex-a7 --arch=armv7-a --cross-prefix=${CFG_SDK_TOOLCHAIN} "
 fi
 
-
-if [ ${CFG_CHIP_TYPE} == "hi3519av100" ]; then
-echo "hi3519av100 =? ${CFG_CHIP_TYPE}"
-configure_attr+=" --arch=armv7-a --cross-prefix=${CFG_SDK_TOOLCHAIN} "
-fi
-
-if [ ${CFG_CHIP_TYPE} == "hi3562v100" ]; then
-echo "hi3562v100 =? ${CFG_CHIP_TYPE}"
-configure_attr+=" --cpu=cortex-a7 --arch=armv7-a --cross-prefix=${CFG_SDK_TOOLCHAIN} "
-fi
-
-if [ ${CFG_CHIP_TYPE} == "hi3569v100" ]; then
-echo "hi3569v100 =? ${CFG_CHIP_TYPE}"
-configure_attr+=" --arch=arm64  --cross-prefix=${CFG_SDK_TOOLCHAIN} "
-fi
-
 echo ${configure_attr}
 export http_proxy=""
 export https_proxy=""