Merge pull request #1286 from ethanhugg/FF33-patch

avoid encoder crash with random pixel input

.gitignore

@@ -1,7 +1,7 @@
 # Object files
 *.o
 *.obj
-*.res
+codec/obj
 
 # Dependency files
 *.d
@@ -30,7 +30,6 @@ codec_unittest
 # Other files generated by the MSVC compiler
 *.exp
 *.pdb
-*.map
 
 # Executables built by the MSVC project files
 bin
@@ -46,14 +45,3 @@ testbin/test_vd_rc.264
 testbin/test_vd_rc.yuv
 testbin/test.264
 testbin/test.yuv
-
-# iOS output files
-codec/build/iOS/common/build/
-codec/build/iOS/dec/welsdec/build/
-
-# pkg-config file
-*.pc
-
-# editor files
-*~
-

.travis.yml

@@ -1,5 +1,4 @@
 language: cpp
-dist: trusty
 
 compiler:
   - g++
@@ -7,7 +6,7 @@ compiler:
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq nasm g++-multilib gcc-multilib libc6-dev-i386
+  - sudo apt-get install -qq nasm g++-4.6-multilib gcc-multilib libc6-dev-i386
 
 install:
   - make gmp-bootstrap
@@ -21,15 +20,19 @@ before_script:
 
 env:
   - TASK=UnitTest;      TestParameter=""
-  - TASK=BinaryCompare; TestParameter=BA_MW_D.264
-  - TASK=BinaryCompare; TestParameter=CVPCMNL1_SVA_C.264
+  - TASK=BinaryCompare; TestParameter=BA_MW_D.264;
+  - TASK=BinaryCompare; TestParameter=LS_SVA_D.264;
+  - TASK=BinaryCompare; TestParameter=CVPCMNL1_SVA_C.264;
 
 matrix:
   exclude:
     - compiler: clang
-      env: TASK=BinaryCompare; TestParameter=BA_MW_D.264
+      env: TASK=BinaryCompare; TestParameter=BA_MW_D.264;
     - compiler: clang
-      env: TASK=BinaryCompare; TestParameter=CVPCMNL1_SVA_C.264
+      env: TASK=BinaryCompare; TestParameter=LS_SVA_D.264;
+    - compiler: clang
+      env: TASK=BinaryCompare; TestParameter=CVPCMNL1_SVA_C.264;
+
 script:
   -  echo "currrent test is for ${TASK}"
   -  echo "test parameter is ${TestParameter}"

CONTRIBUTORS

@@ -1,4 +1,4 @@
-# Contributors to the OpenH264 project
+# Contributors to the OpenH264 project
 
 Patrick Ai
 Sijia Chen
@@ -30,12 +30,10 @@ Adam Roach
 Sawyer Shan
 Siping Tao
 Martin Storsjö
-Brion Vibber
 James Wang
 Juanny Wang
 Zhiliang Wang
 Hervé Willems
-Gregory J Wolfe
 Katherine Wu
 Guang Xu
 Jeffery Xu
@@ -46,9 +44,8 @@ Rory Zhang
 Volvet Zhang
 Ling Zhu
 James Zhu
-Dong Zhang
-Haibo Zhu
-Huade Shi
+
+
 
 
 

Makefile

@@ -1,13 +1,4 @@
-SRC_PATH=$(word 1, $(dir $(MAKEFILE_LIST)))
-vpath %.c $(SRC_PATH)
-vpath %.cc $(SRC_PATH)
-vpath %.cpp $(SRC_PATH)
-vpath %.asm $(SRC_PATH)
-vpath %.S $(SRC_PATH)
-vpath %.rc $(SRC_PATH)
-vpath %.pc.in $(SRC_PATH)
-
-OS=$(shell uname | tr A-Z a-z | tr -d \\-[:digit:]. | sed -E 's/^(net|open|free)bsd/bsd/')
+OS=$(shell uname | tr A-Z a-z | tr -d \\-[:digit:].)
 ARCH=$(shell uname -m)
 LIBPREFIX=lib
 LIBSUFFIX=a
@@ -24,25 +15,18 @@ V=Yes
 PREFIX=/usr/local
 SHARED=-shared
 OBJ=o
-DESTDIR=
-LIBDIR_NAME=lib
-SHAREDLIB_DIR=$(PREFIX)/lib
 PROJECT_NAME=openh264
 MODULE_NAME=gmpopenh264
-GMP_API_BRANCH=Firefox39
+GMP_API_BRANCH=Firefox33
 CCASFLAGS=$(CFLAGS)
-STATIC_LDFLAGS=-lstdc++
 
-VERSION=1.6
-SHAREDLIBVERSION=3
-
-ifeq (,$(wildcard $(SRC_PATH)gmp-api))
+ifeq (,$(wildcard ./gmp-api))
 HAVE_GMP_API=No
 else
 HAVE_GMP_API=Yes
 endif
 
-ifeq (,$(wildcard $(SRC_PATH)gtest))
+ifeq (,$(wildcard ./gtest))
 HAVE_GTEST=No
 else
 HAVE_GTEST=Yes
@@ -51,16 +35,9 @@ endif
 # Configurations
 ifeq ($(BUILDTYPE), Release)
 CFLAGS += $(CFLAGS_OPT)
-CFLAGS += -DNDEBUG
 USE_ASM = Yes
-ifeq ($(DEBUGSYMBOLS), True)
-CFLAGS += -g
-CXXFLAGS += -g
-DEBUGSYMBOLS_TAG := _debug_symbols
-PROCESS_FILES := True
-endif
 else
-CFLAGS += $(CFLAGS_DEBUG)
+CFLAGS = $(CFLAGS_DEBUG)
 USE_ASM = No
 endif
 
@@ -69,19 +46,10 @@ CFLAGS += -fsanitize=address
 LDFLAGS += -fsanitize=address
 endif
 
-STRIP_FLAGS := -S
-ifeq (linux, $((OS)))
-STRIP_FLAGS := -g
-endif
+include build/platform-$(OS).mk
 
-# Make sure the all target is the first one
-all: libraries binaries
 
-include $(SRC_PATH)build/platform-$(OS).mk
-
-MODULE := $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX)
-
-CFLAGS += -DGENERATED_VERSION_HEADER
+CFLAGS +=
 LDFLAGS +=
 
 ifeq (Yes, $(GCOV))
@@ -91,235 +59,162 @@ endif
 
 #### No user-serviceable parts below this line
 ifneq ($(V),Yes)
-    QUIET_CXX  = @printf "CXX\t$@\n";
-    QUIET_CC   = @printf "CC\t$@\n";
+    QUIET_CXX = @printf "CXX\t$@\n";
+    QUIET_CC  = @printf "CC\t$@\n";
     QUIET_CCAS = @printf "CCAS\t$@\n";
-    QUIET_ASM  = @printf "ASM\t$@\n";
-    QUIET_AR   = @printf "AR\t$@\n";
-    QUIET_RC   = @printf "RC\t$@\n";
-    QUIET      = @
+    QUIET_ASM = @printf "ASM\t$@\n";
+    QUIET_AR  = @printf "AR\t$@\n";
+    QUIET     = @
 endif
 
 
-INCLUDES += -I$(SRC_PATH)codec/api/svc -I$(SRC_PATH)codec/common/inc -Icodec/common/inc
+INCLUDES += -Icodec/api/svc -Icodec/common/inc
 
 DECODER_INCLUDES += \
-    -I$(SRC_PATH)codec/decoder/core/inc \
-    -I$(SRC_PATH)codec/decoder/plus/inc
+    -Icodec/decoder/core/inc \
+    -Icodec/decoder/plus/inc
 
 ENCODER_INCLUDES += \
-    -I$(SRC_PATH)codec/encoder/core/inc \
-    -I$(SRC_PATH)codec/encoder/plus/inc \
-    -I$(SRC_PATH)codec/processing/interface
+    -Icodec/encoder/core/inc \
+    -Icodec/encoder/plus/inc \
+    -Icodec/processing/interface
 
 PROCESSING_INCLUDES += \
-    -I$(SRC_PATH)codec/processing/interface \
-    -I$(SRC_PATH)codec/processing/src/common \
-    -I$(SRC_PATH)codec/processing/src/adaptivequantization \
-    -I$(SRC_PATH)codec/processing/src/downsample \
-    -I$(SRC_PATH)codec/processing/src/scrolldetection \
-    -I$(SRC_PATH)codec/processing/src/vaacalc
+    -Icodec/processing/interface \
+    -Icodec/processing/src/common \
+    -Icodec/processing/src/scrolldetection
 
 GTEST_INCLUDES += \
-    -I$(SRC_PATH)gtest/googletest \
-    -I$(SRC_PATH)gtest/googletest/include
+    -Igtest \
+    -Igtest/include
 
 CODEC_UNITTEST_INCLUDES += \
-    -I$(SRC_PATH)gtest/googletest/include \
-    -I$(SRC_PATH)codec/common/inc \
-    -I$(SRC_PATH)test
+    -Igtest/include \
+    -Icodec/common/inc \
 
 CONSOLE_COMMON_INCLUDES += \
-    -I$(SRC_PATH)codec/console/common/inc
+    -Icodec/console/common/inc
 
-H264DEC_INCLUDES += $(DECODER_INCLUDES) $(CONSOLE_COMMON_INCLUDES) -I$(SRC_PATH)codec/console/dec/inc
+H264DEC_INCLUDES += $(DECODER_INCLUDES) $(CONSOLE_COMMON_INCLUDES) -Icodec/console/dec/inc
 H264DEC_LDFLAGS = $(LINK_LOCAL_DIR) $(call LINK_LIB,decoder) $(call LINK_LIB,common) $(call LINK_LIB,console_common)
 H264DEC_DEPS = $(LIBPREFIX)decoder.$(LIBSUFFIX) $(LIBPREFIX)common.$(LIBSUFFIX) $(LIBPREFIX)console_common.$(LIBSUFFIX)
 
-H264ENC_INCLUDES += $(ENCODER_INCLUDES) $(CONSOLE_COMMON_INCLUDES) -I$(SRC_PATH)codec/console/enc/inc
+H264ENC_INCLUDES += $(ENCODER_INCLUDES) $(CONSOLE_COMMON_INCLUDES) -Icodec/console/enc/inc
 H264ENC_LDFLAGS = $(LINK_LOCAL_DIR) $(call LINK_LIB,encoder) $(call LINK_LIB,processing) $(call LINK_LIB,common) $(call LINK_LIB,console_common)
 H264ENC_DEPS = $(LIBPREFIX)encoder.$(LIBSUFFIX) $(LIBPREFIX)processing.$(LIBSUFFIX) $(LIBPREFIX)common.$(LIBSUFFIX) $(LIBPREFIX)console_common.$(LIBSUFFIX)
 
 CODEC_UNITTEST_LDFLAGS = $(LINK_LOCAL_DIR) $(call LINK_LIB,gtest) $(call LINK_LIB,decoder) $(call LINK_LIB,encoder) $(call LINK_LIB,processing) $(call LINK_LIB,common) $(CODEC_UNITTEST_LDFLAGS_SUFFIX)
 CODEC_UNITTEST_DEPS = $(LIBPREFIX)gtest.$(LIBSUFFIX) $(LIBPREFIX)decoder.$(LIBSUFFIX) $(LIBPREFIX)encoder.$(LIBSUFFIX) $(LIBPREFIX)processing.$(LIBSUFFIX) $(LIBPREFIX)common.$(LIBSUFFIX)
-DECODER_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(DECODER_INCLUDES)
-ENCODER_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(ENCODER_INCLUDES)
-PROCESSING_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(PROCESSING_INCLUDES)
-API_TEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES)
-COMMON_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES)
-MODULE_INCLUDES += -I$(SRC_PATH)gmp-api
+DECODER_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(DECODER_INCLUDES) -Itest -Itest/decoder
+ENCODER_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(ENCODER_INCLUDES) -Itest -Itest/encoder
+PROCESSING_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(PROCESSING_INCLUDES) -Itest -Itest/processing
+API_TEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) -Itest -Itest/api
+COMMON_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(DECODER_INCLUDES) -Itest -Itest/common
+MODULE_INCLUDES += -Igmp-api
 
-DECODER_UNITTEST_CFLAGS += $(CODEC_UNITTEST_CFLAGS)
-ENCODER_UNITTEST_CFLAGS += $(CODEC_UNITTEST_CFLAGS)
-PROCESSING_UNITTEST_CFLAGS += $(CODEC_UNITTEST_CFLAGS)
-API_TEST_CFLAGS += $(CODEC_UNITTEST_CFLAGS)
-COMMON_UNITTEST_CFLAGS += $(CODEC_UNITTEST_CFLAGS)
+.PHONY: test gtest-bootstrap clean
 
-.PHONY: test gtest-bootstrap clean $(PROJECT_NAME).pc $(PROJECT_NAME)-static.pc
-
-generate-version:
-	$(QUIET)sh $(SRC_PATH)codec/common/generate_version.sh $(SRC_PATH)
-
-codec/decoder/plus/src/welsDecoderExt.$(OBJ): | generate-version
-codec/encoder/plus/src/welsEncoderExt.$(OBJ): | generate-version
+all:	libraries binaries
 
 clean:
 ifeq (android,$(OS))
 clean: clean_Android
 endif
-	$(QUIET)rm -f $(OBJS) $(OBJS:.$(OBJ)=.d) $(OBJS:.$(OBJ)=.obj) $(LIBRARIES) $(BINARIES) *.lib *.a *.dylib *.dll *.so *.exe *.pdb *.exp *.pc *.res *.map
+	$(QUIET)rm -f $(OBJS) $(OBJS:.$(OBJ)=.d) $(LIBRARIES) $(BINARIES)
 
 gmp-bootstrap:
 	if [ ! -d gmp-api ] ; then git clone https://github.com/mozilla/gmp-api gmp-api ; fi
 	cd gmp-api && git fetch origin && git checkout $(GMP_API_BRANCH)
 
 gtest-bootstrap:
-	git clone https://github.com/google/googletest.git gtest
+	svn co https://googletest.googlecode.com/svn/trunk/ gtest
 
 ifeq ($(HAVE_GTEST),Yes)
 
+test: codec_unittest$(EXEEXT)
 ifneq (android,$(OS))
 ifneq (ios,$(OS))
-ifneq (msvc-wp,$(OS))
-BUILD_UT_EXE=Yes
-endif
-endif
-endif
-
-test: codec_unittest$(EXEEXT)
-ifeq ($(BUILD_UT_EXE), Yes)
 	./codec_unittest
 endif
+endif
 
 else
 test:
-	@echo "./gtest: No such file or directory."
+	@echo "./gtest : No such file or directory."
 	@echo "You do not have gtest. Run make gtest-bootstrap to get gtest"
 endif
 
-include $(SRC_PATH)codec/common/targets.mk
-include $(SRC_PATH)codec/decoder/targets.mk
-include $(SRC_PATH)codec/encoder/targets.mk
-include $(SRC_PATH)codec/processing/targets.mk
+include codec/common/targets.mk
+include codec/decoder/targets.mk
+include codec/encoder/targets.mk
+include codec/processing/targets.mk
 
 ifeq ($(HAVE_GMP_API),Yes)
-include $(SRC_PATH)module/targets.mk
+include module/targets.mk
 endif
 
 ifneq (android, $(OS))
 ifneq (ios, $(OS))
-ifneq (msvc-wp, $(OS))
-include $(SRC_PATH)codec/console/dec/targets.mk
-include $(SRC_PATH)codec/console/enc/targets.mk
-include $(SRC_PATH)codec/console/common/targets.mk
-endif
+include codec/console/dec/targets.mk
+include codec/console/enc/targets.mk
+include codec/console/common/targets.mk
 endif
 endif
 
-libraries: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX)
-
-# No point in building dylib for ios
 ifneq (ios, $(OS))
-libraries: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
+libraries: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
+else
+libraries: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX)
 endif
 
-LIBRARIES += $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
+LIBRARIES += $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
 
 $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX): $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)
 	$(QUIET)rm -f $@
 	$(QUIET_AR)$(AR) $(AR_OPTS) $+
-ifeq (True, $(PROCESS_FILES))
-	cp $@ $(LIBPREFIX)$(PROJECT_NAME)$(DEBUGSYMBOLS_TAG).$(LIBSUFFIX)
-	strip $(STRIP_FLAGS) $@ -o $@
-endif
 
-$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER): $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)
+$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX): $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)
 	$(QUIET)rm -f $@
-	$(QUIET_CXX)$(CXX) $(SHARED) $(CXX_LINK_O) $+ $(LDFLAGS) $(SHLDFLAGS)
-ifeq (True, $(PROCESS_FILES))
-	cp $@ $(LIBPREFIX)$(PROJECT_NAME)$(DEBUGSYMBOLS_TAG).$(SHAREDLIBSUFFIXVER)
-	strip $(STRIP_FLAGS) $@ -o $@
-endif
-
-ifneq ($(SHAREDLIBSUFFIXVER),$(SHAREDLIBSUFFIX))
-$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX): $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
-	$(QUIET)ln -sfn $+ $@
-ifeq (True, $(PROCESS_FILES))
-	$(QUIET)ln -sfn $(LIBPREFIX)$(PROJECT_NAME)$(DEBUGSYMBOLS_TAG).$(SHAREDLIBSUFFIXVER) $(LIBPREFIX)$(PROJECT_NAME)$(DEBUGSYMBOLS_TAG).$(SHAREDLIBSUFFIX)
-endif
-endif
+	$(QUIET_CXX)$(CXX) $(SHARED) $(LDFLAGS) $(CXX_LINK_O) $+ $(SHLDFLAGS)
 
 ifeq ($(HAVE_GMP_API),Yes)
-plugin: $(MODULE)
-LIBRARIES += $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXVER)
+plugin: $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX)
+LIBRARIES += $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX)
 else
 plugin:
-	@echo "./gmp-api: No such file or directory."
+	@echo "./gmp-api : No such file or directory."
 	@echo "You do not have gmp-api.  Run make gmp-bootstrap to get the gmp-api headers."
 endif
 
-echo-plugin-name:
-	@echo $(MODULE)
-
-$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXVER): $(MODULE_OBJS) $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)
+$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX): $(MODULE_OBJS) $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)
 	$(QUIET)rm -f $@
-	$(QUIET_CXX)$(CXX) $(SHARED) $(CXX_LINK_O) $+ $(LDFLAGS) $(SHLDFLAGS) $(MODULE_LDFLAGS)
-ifeq (True, $(PROCESS_FILES))
-	cp $@ $(LIBPREFIX)$(MODULE_NAME)$(DEBUGSYMBOLS_TAG).$(SHAREDLIBSUFFIXVER)
-	strip $(STRIP_FLAGS) $@ -o $@
-endif
-
-ifneq ($(SHAREDLIBSUFFIXVER),$(SHAREDLIBSUFFIX))
-$(MODULE): $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXVER)
-	$(QUIET)ln -sfn $+ $@
-ifeq (True, $(PROCESS_FILES))
-	$(QUIET)ln -sfn $(LIBPREFIX)$(MODULE_NAME)$(DEBUGSYMBOLS_TAG).$(SHAREDLIBSUFFIXVER) $(LIBPREFIX)$(MODULE_NAME)$(DEBUGSYMBOLS_TAG).$(SHAREDLIBSUFFIX)
-endif
-endif
-
-$(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
-	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
-
-$(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
-	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
+	$(QUIET_CXX)$(CXX) $(SHARED) $(LDFLAGS) $(CXX_LINK_O) $+ $(SHLDFLAGS) $(MODULE_LDFLAGS)
 
 install-headers:
-	mkdir -p $(DESTDIR)$(PREFIX)/include/wels
-	install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(PREFIX)/include/wels
+	mkdir -p $(PREFIX)/include/wels
+	install -m 644 codec/api/svc/codec*.h $(PREFIX)/include/wels
 
-install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
-	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
-	install -m 644 $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
+install-static: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
+	mkdir -p $(PREFIX)/lib
+	install -m 644 $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(PREFIX)/lib
 
-install-static: install-static-lib $(PROJECT_NAME)-static.pc
-	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig
-	install -m 644 $(PROJECT_NAME)-static.pc $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig/$(PROJECT_NAME).pc
-
-install-shared: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) install-headers $(PROJECT_NAME).pc
-	mkdir -p $(DESTDIR)$(SHAREDLIB_DIR)
-	install -m 755 $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER) $(DESTDIR)$(SHAREDLIB_DIR)
-	if [ "$(SHAREDLIBSUFFIXVER)" != "$(SHAREDLIBSUFFIX)" ]; then \
-		cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR); \
-	fi
-	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig
-	install -m 644 $(PROJECT_NAME).pc $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig
+install-shared: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) install-headers
+	mkdir -p $(PREFIX)/lib
+	install -m 755 $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(PREFIX)/lib
 ifneq ($(EXTRA_LIBRARY),)
-	install -m 644 $(EXTRA_LIBRARY) $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
+	install -m 644 $(EXTRA_LIBRARY) $(PREFIX)/lib
 endif
 
-install: install-static-lib install-shared
+install: install-static install-shared
 	@:
 
-ifneq ($(HAVE_GTEST),Yes)
-binaries:
-	@:
-else
-include $(SRC_PATH)build/gtest-targets.mk
-include $(SRC_PATH)test/api/targets.mk
-include $(SRC_PATH)test/decoder/targets.mk
-include $(SRC_PATH)test/encoder/targets.mk
-include $(SRC_PATH)test/processing/targets.mk
-include $(SRC_PATH)test/common/targets.mk
+ifeq ($(HAVE_GTEST),Yes)
+include build/gtest-targets.mk
+include test/api/targets.mk
+include test/decoder/targets.mk
+include test/encoder/targets.mk
+include test/processing/targets.mk
+include test/common/targets.mk
 
 LIBRARIES += $(LIBPREFIX)ut.$(LIBSUFFIX)
 $(LIBPREFIX)ut.$(LIBSUFFIX): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $(PROCESSING_UNITTEST_OBJS) $(COMMON_UNITTEST_OBJS) $(API_TEST_OBJS)
@@ -328,49 +223,36 @@ $(LIBPREFIX)ut.$(LIBSUFFIX): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $
 
 
 LIBRARIES +=$(LIBPREFIX)ut.$(SHAREDLIBSUFFIX)
-$(LIBPREFIX)ut.$(SHAREDLIBSUFFIX): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $(PROCESSING_UNITTEST_OBJS) $(API_TEST_OBJS) $(COMMON_UNITTEST_OBJS) $(CODEC_UNITTEST_DEPS)
+$(LIBPREFIX)ut.$(SHAREDLIBSUFFIX): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $(PROCESSING_UNITTEST_OBJS) $(API_TEST_OBJS) $(COMMON_UNITTEST_OBJS)  $(CODEC_UNITTEST_DEPS)
 	$(QUIET)rm -f $@
-	$(QUIET_CXX)$(CXX) $(SHARED) $(CXX_LINK_O) $+ $(LDFLAGS) $(UTSHLDFLAGS) $(CODEC_UNITTEST_LDFLAGS)
+	$(QUIET_CXX)$(CXX) $(SHARED) $(LDFLAGS) $(CXX_LINK_O) $+ $(CODEC_UNITTEST_LDFLAGS)
 
 binaries: codec_unittest$(EXEEXT)
 BINARIES += codec_unittest$(EXEEXT)
 
-ifeq ($(BUILD_UT_EXE), Yes)
-# Build a normal command line executable
-codec_unittest$(EXEEXT): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $(PROCESSING_UNITTEST_OBJS) $(API_TEST_OBJS) $(COMMON_UNITTEST_OBJS) $(CODEC_UNITTEST_DEPS) | res
-	$(QUIET)rm -f $@
-	$(QUIET_CXX)$(CXX) $(CXX_LINK_O) $+ $(CODEC_UNITTEST_LDFLAGS) $(LDFLAGS)
-
-res:
-	$(QUIET)if [ ! -e res ]; then ln -s $(SRC_PATH)res .; fi
-else
-
-# Build the unit test suite into a library that is included in a project file
 ifeq (ios,$(OS))
 codec_unittest$(EXEEXT): $(LIBPREFIX)ut.$(LIBSUFFIX) $(LIBPREFIX)gtest.$(LIBSUFFIX) $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX)
-else
-codec_unittest$(EXEEXT): $(LIBPREFIX)ut.$(SHAREDLIBSUFFIX)
-endif
 
+else
 ifeq (android,$(OS))
-ifeq (./,$(SRC_PATH))
-codec_unittest$(EXEEXT):
+codec_unittest$(EXEEXT): $(LIBPREFIX)ut.$(SHAREDLIBSUFFIX)
 	cd ./test/build/android && $(NDKROOT)/ndk-build -B APP_ABI=$(APP_ABI) && android update project -t $(TARGET) -p . && ant debug
 
 clean_Android: clean_Android_ut
 clean_Android_ut:
 	-cd ./test/build/android && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean
+
+else
+codec_unittest$(EXEEXT): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $(PROCESSING_UNITTEST_OBJS) $(API_TEST_OBJS) $(COMMON_UNITTEST_OBJS) $(CODEC_UNITTEST_DEPS)
+	$(QUIET)rm -f $@
+	$(QUIET_CXX)$(CXX) $(CXX_LINK_O) $+ $(CODEC_UNITTEST_LDFLAGS) $(LDFLAGS)
+
 endif
 endif
 
-endif
+else
+binaries:
+	@:
 endif
 
 -include $(OBJS:.$(OBJ)=.d)
-
-OBJDIRS = $(sort $(dir $(OBJS)))
-
-$(OBJDIRS):
-	$(QUIET)mkdir -p $@
-
-$(OBJS): | $(OBJDIRS)

README.md

@@ -4,13 +4,12 @@ OpenH264 is a codec library which supports H.264 encoding and decoding. It is su
 
 Encoder Features
 ----------------
-- Constrained Baseline Profile up to Level 5.2 (Max frame size is 36864 macro-blocks)
+- Constrained Baseline Profile up to Level 5.2 (4096x2304)
 - Arbitrary resolution, not constrained to multiples of 16x16
 - Rate control with adaptive quantization, or constant quantization
 - Slice options: 1 slice per frame, N slices per frame, N macroblocks per slice, or N bytes per slice
 - Multiple threads automatically used for multiple slices
 - Temporal scalability up to 4 layers in a dyadic hierarchy
-- Simulcast AVC up to 4 resolutions from a single input
 - Spatial simulcast up to 4 resolutions from a single input
 - Long Term Reference (LTR) frames
 - Memory Management Control Operation (MMCO)
@@ -24,7 +23,7 @@ Encoder Features
 
 Decoder Features
 ----------------
-- Constrained Baseline Profile up to Level 5.2 (Max frame size is 36864 macro-blocks)
+- Constrained Baseline Profile up to Level 5.2 (4096x2304)
 - Arbitrary resolution, not constrained to multiples of 16x16
 - Single thread for all slices
 - Long Term Reference (LTR) frames
@@ -39,57 +38,56 @@ OS Support
 - Windows 64-bit and 32-bit
 - Mac OS X 64-bit and 32-bit
 - Linux 64-bit and 32-bit
-- Android 64-bit and 32-bit
+- Android 32-bit
 - iOS 64-bit and 32-bit
-- Windows Phone 32-bit
 
 Processor Support
 -----------------
 - Intel x86 optionally with MMX/SSE (no AVX yet, help is welcome)
-- ARMv7 optionally with NEON, AArch64 optionally with NEON
+- ARMv7 optionally with NEON
 - Any architecture using C/C++ fallback functions
 
 Building the Library
 --------------------
-NASM needed to be installed for assembly code: workable version 2.10.06 or above, nasm can downloaded from http://www.nasm.us/
-For Mac OSX 64-bit NASM needed to be below version 2.11.08 as nasm 2.11.08 will introduce error when using RIP-relative addresses in Mac OSX 64-bit
+NASM needed to be installed for assembly code: workable version 2.07 or above, nasm can downloaded from http://www.nasm.us/
 
 To build the arm assembly for Windows Phone, gas-preprocessor is required. It can be downloaded from git://git.libav.org/gas-preprocessor.git
 
 For Android Builds
 ------------------
-To build for android platform, You need to install android sdk and ndk. You also need to export `**ANDROID_SDK**/tools` to PATH. On Linux, this can be done by
+To build for android platform, You need to install android sdk and ndk. You also need to export **ANDROID_SDK**/tools to PATH. On Linux, this can be done by
 
-    export PATH=**ANDROID_SDK**/tools:$PATH
+'export PATH=**ANDROID_SDK**/tools:$PATH'
 
 The codec and demo can be built by
 
-    make OS=android NDKROOT=**ANDROID_NDK** TARGET=**ANDROID_TARGET**
+'make OS=android NDKROOT=**ANDROID_NDK** TARGET= **ANDROID_TARGET**'
 
-Valid `**ANDROID_TARGET**` can be found in `**ANDROID_SDK**/platforms`, such as `android-12`.
-You can also set `ARCH`, `NDKLEVEL` according to your device and NDK version.
-`ARCH` specifies the architecture of android device. Currently `arm`, `arm64`, `x86` and `x86_64` are supported, the default is `arm`. (`mips` and `mips64` can also be used, but there's no specific optimization for those architectures.)
-`NDKLEVEL` specifies android api level, the default is 12. Available possibilities can be found in `**ANDROID_NDK**/platforms`, such as `android-21` (strip away the `android-` prefix).
+Valid **ANDROID_TARGET** can be found in **ANDROID_SDK**/platforms, such as android-12.
+You can also set ARCH, NDKLEVEL, GCCVERSION according to your device and NDK version.
+ARCH specifies the architecture of android device. Currently only arm and x86 are supported, the default is arm.
+NDKLEVEL specifies android api level, the api level can be 12-19, the default is 12.
+GCCVERSION specifies which gcc in NDK is used, the default is 4.8.
 
-By default these commands build for the `armeabi-v7a` ABI. To build for the other android
-ABIs, add `ARCH=arm64`, `ARCH=x86`, `ARCH=x86_64`, `ARCH=mips` or `ARCH=mips64`.
-To build for the older `armeabi` ABI (which has armv5te as baseline), add `APP_ABI=armeabi` (`ARCH=arm` is implicit).
-To build for 64-bit ABI, such as `arm64`, explicitly set `NDKLEVEL` to 21 or higher.
+By default these commands build for the armeabi-v7a ABI. To build for the other android
+ABIs, add "ARCH=mips" or "ARCH=x86". To build for the older armeabi ABI (which has
+armv5te as baseline), add "APP_ABI=armeabi" (ARCH=arm is implicit).
 
 For iOS Builds
 --------------
 You can build the libraries and demo applications using xcode project files
-located in `codec/build/iOS/dec` and `codec/build/iOS/enc`.
+located in codec/build/iOS/dec and codec/build/iOS/enc.
 
 You can also build the libraries (but not the demo applications) using the
 make based build system from the command line. Build with
 
-    make OS=ios ARCH=**ARCH**
+'make OS=ios ARCH=**ARCH**'
 
-Valid values for `**ARCH**` are the normal iOS architecture names such as
-`armv7`, `armv7s`, `arm64`, and `i386` and `x86_64` for the simulator.
-Another settable iOS specific parameter
-is `SDK_MIN`, specifying the minimum deployment target for the built library.
+Valid values for **ARCH** are the normal iOS architecture names such as
+armv7, armv7s, arm64, and i386 and x86_64 for the simulator. Additionally,
+one might need to add 'SDK=X.Y' to the make command line in case the default
+SDK version isn't available. Another settable iOS specific parameter
+is SDK_MIN, specifying the minimum deployment target for the built library.
 For other details on building using make on the command line, see
 'For All Platforms' below.
 
@@ -98,54 +96,40 @@ For Windows Builds
 
 Our Windows builds use MinGW which can be found here - http://www.mingw.org/
 
-To build with gcc, add the MinGW bin directory (e.g. `/c/MinGW/bin`) to your path and follow the 'For All Platforms' instructions below.
+To build with gcc, add the MinGW bin directory (e.g. /c/MinGW/bin) to your path and follow the 'For All Platforms' instructions below.
 
 To build with Visual Studio you will need to set up your path to run cl.exe.  The easiest way is to start MSYS from a developer command line session - http://msdn.microsoft.com/en-us/library/ms229859(v=vs.110).aspx  If you need to do it by hand here is an example from a Windows 64bit install of VS2012:
 
-    export PATH="$PATH:/c/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin:/c/Program Files (x86)/Microsoft Visual Studio 11.0/Common7/IDE"
+export PATH="$PATH:/c/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin:/c/Program Files (x86)/Microsoft Visual Studio 11.0/Common7/IDE"
 
 You will also need to set your INCLUDE and LIB paths to point to your VS and SDK installs.  Something like this, again from Win64 with VS2012 (note the use of Windows-style paths here).
 
-    export INCLUDE="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include;C:\Program Files (x86)\Windows Kits\8.0\Include\um;C:\Program Files (x86)\Windows Kits\8.0\Include\shared"
-    export LIB="C:\Program Files (x86)\Windows Kits\8.0\Lib\Win8\um\x86;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\lib"
+export INCLUDE="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include;C:\Program Files (x86)\Windows Kits\8.0\Include\um;C:\Program Files (x86)\Windows Kits\8.0\Include\shared"
+export LIB="C:\Program Files (x86)\Windows Kits\8.0\Lib\Win8\um\x86;C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\lib"
 
-Then add `OS=msvc` to the make line of the 'For All Platforms' instructions.
-
-For Windows Phone builds
-------------------------
-
-Follow the instructions above for normal Windows builds, but use `OS=msvc-wp`
-instead of `OS=msvc`. You will also need gas-preprocessor (as mentioned below
-"Building the Library").
-
-If building for Windows Phone with MSVC 2013, there's no included bat file that sets the lib paths to the Windows Phone kit, but that can be done with a command like this:
-
-    export LIB="c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib\store\arm;c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib\arm;c:\Program Files (x86)\Windows Phone Kits\8.1\lib\arm"
-
-This is only necessary for building the DLL; the static library can be built without setting this.
+Then add 'OS=msvc' to the make line of the 'For All Platforms' instructions.
 
 For All Platforms
 -------------------
 From the main project directory:
-- `make` for automatically detecting architecture and building accordingly
-- `make ARCH=i386` for x86 32bit builds
-- `make ARCH=x86_64` for x86 64bit builds
-- `make V=No` for a silent build (not showing the actual compiler commands)
-- `make DEBUGSYMBOLS=True` for two libraries, one is normal libraries, another one is removed the debugging symbol table entries (those created by the -g option )
+'make' for automatically detecting 32/64bit and building accordingly
+'make ENABLE64BIT=No' for 32bit builds
+'make ENABLE64BIT=Yes' for 64bit builds
+'make V=No' for a silent build (not showing the actual compiler commands)
 
-The command line programs `h264enc` and `h264dec` will appear in the main project directory.
+The command line programs h264enc and h264dec will appear in the main project directory.
 
-A shell script to run the command-line apps is in `testbin/CmdLineExample.sh`
+A shell script to run the command-line apps is in testbin/CmdLineExample.sh
 
-Usage information can be found in `testbin/CmdLineReadMe`
+Usage information can be found in testbin/CmdLineReadMe
 
 Using the Source
 ----------------
-- `codec` - encoder, decoder, console (test app), build (makefile, vcproj)
-- `build` - scripts for Makefile build system.
-- `test` - GTest unittest files.
-- `testbin` - autobuild scripts, test app config files
-- `res` - yuv and bitstream test files
+codec - encoder, decoder, console (test app), build (makefile, vcproj)
+build - scripts for Makefile build system.
+test - GTest unittest files.
+testbin - autobuild scripts, test app config files
+res - yuv and bitstream test files
 
 Known Issues
 ------------
@@ -158,4 +142,4 @@ See the issue tracker on https://github.com/cisco/openh264/issues
 
 License
 -------
-BSD, see `LICENSE` file for details.
+BSD, see LICENSE file for details.

RELEASES

@@ -1,201 +1,9 @@
 
 Releases
------------
-v1.6.0
-------
-- Adjusted the encoder API structures
-- Removed the unused data format in decoder API
-- Encoder support of simulcast AVC
-- Added support of video signal type present information
-- Added support of encoder load-balancing
-- Improved encoder multi-threads, rate control and down-sampling
-- Fixed the frame size constraint in encoder
-- Bug fixes for rate control, multi-threading, simulcasting in encoder
-- Bug fixes for interface call, return value check, memory leak in decoder
-- Bug fixes for UT and statistic information
-- Bug fixes for assembly code
-- Remove the unused and redundant code
-- Improvements on UT, memory allocation failed protection, error-protection in decoder, input parameters checking in encoder, assembly for AVX2 support, assembly code performance, logging and documentation
-- Correct some typos in source code and documents
 
-v1.5.3
-------
-- Bug fixes for GMP Plugin
-
-v1.5.2
-------
-- Fix GMP Plugin causing the Browser crash on Android
-
-v1.5.1
-------
-- Bug fixes for GMP Plugin
-
-v1.5.0
-------
-- Correct a typo in codec return value (github issue#2046, cmUnkonwReason -> cmUnknownReason)
-- Added Codec demo and auto build script for WP8
-- Decoder support of 'Constrained High Profile' of H.264
-- Encoder support of CABAC of H.264
-- Encoder support of input frame rate 60
-- Improved syntax of gaps_in_frame_num_value_allowed_flag in encoder
-- Improved memory usage for multi-threading in encoder
-- Added VUI info for base layer in encoder
-- Added encoder interface to get external setting of iMaxQp and iMinQp for rate control
-- Bug fixes for Rate Control, multi-threading and simulcasting in encoder
-- Bug fixes for NoDelay API, ParseOnly functions, error-concealment off functiond and error-detection in decoder
-- Bug fixes for UT
-- Fixes to avoid valgrind warnings, potential crash and calculation overflow
-- Merged files for decoder/encoder and remove unused files
-- Improvements on build scripts, UT, error-protection in decoder, input param checking in encoder, assembly for 64bit support, downsampling, logging and documentation
-
-Note:
-'Constrained High Profile' = 'Constrained Baseline Profile' plus:
-- CABAC
-- Intra 8x8 mode support
-- 8x8 transform
-- QP scaling matrices
-- QP per chroma component
-- Mono 4:0:0 (experimental)
-- Weighted prediction
-
-v1.4.0
-------
-- Decoder new interface of DecodeFrameNoDelay
-- Added new encoder and decoder statistics
-- Added option for generating pdb in windows builds
-- Added new rate control mode (RC_TIMESTAMP_MODE) for inconstant frame rate input
-- Added new Sps/Pps strategies for real-time video
-— Added support for simulcast avc
-- Improvements in code structure, assembly, input parameter checking, logging, UT and comments
-- In gmp-openh264, return decoder error correctly and other fixes
-- Decoder bug fixes when for Error Concealment disabled
-- Bug fixes for ParseOnly functions
-- Bug fixes for encoding large frame size (>32767MBs)
-- Fixes to avoid valgrind warnings, potential crash and calculation overflow
-
------------
-v1.3.1
-------
-- Fixed and enhanced protection to avoid crash when reading lossy bitstreams
-- Adjust the default mode of Error Concealment used by gmp-openh264
-
------------
-v1.3.0
-------
-- Removed manual API document, now using wiki: https://github.com/cisco/openh264/wiki (0af48e5 for v1.3.0)
-- Added API version in API header files
-- Added pkg-config file
-- Added decoder support of parsing only (bParseOnly) for only parsing bit stream but not decoding
-- Added timestamp and max nal size in gmp-openh264.cpp when calling encoding
-- Added timestamp info in decoder input and return structure
-- Added support of level 9 in decoder
-- Added total length of the encoded frame in encoder return structure
-- Added SetOption(ENCODER_OPTION_SVC_ENCODE_PARAM_BASE,&base) for encoder
-- Set constraint set 0 and 1 flags for non-scalable
-- Improved error concealment algorithms and provide more modes of error-concealment
-- Improved rate control algorithms and reference selection algorithms for screen content encoding 
-- Added encoder and decoder statistics interface
-- Improved input parameter checking and logging
-- Bug fixes, warning reductions, and test improvements
-
------------
-v1.2.0
-------
-- Add and modify encoder APIs related to rate control and screen content encoding
-- Remove PauseFrame in encoder APIs
-- Improve rate control and compression ratio for screen content encoding
-- Improve error concealment algorithm
-- Improve validation of input parameters
-- Add ARM64 assembly
-- bug fixes
-
------------
-v1.1.0
-------
-- Modify some APIs (see API doc for detail)
-- Improve the compression ratio of screen content encoding
-- ARM64 assembly support for most of core functions in encoder & decoder
-- Modify error concealment logic to always return decoding error info until IDR picture comes
-- fix some bugs
-
-
-Binaries
------------
 These binary releases are distributed under this license:
 http://www.openh264.org/BINARY_LICENSE.txt
 
-v1.6.0
-------
-http://ciscobinary.openh264.org/libopenh264-1.6.0-android19.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.6.0-ios.a.bz2
-http://ciscobinary.openh264.org/libopenh264-1.6.0-linux32.3.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.6.0-linux64.3.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.6.0-osx32.3.dylib.bz2
-http://ciscobinary.openh264.org/libopenh264-1.6.0-osx64.3.dylib.bz2
-http://ciscobinary.openh264.org/openh264-1.6.0-win32msvc.dll.bz2
-http://ciscobinary.openh264.org/openh264-1.6.0-win64msvc.dll.bz2
-
-v1.5.0
-------
-http://ciscobinary.openh264.org/libopenh264-1.5.0-android19.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.5.0-ios.a.bz2
-http://ciscobinary.openh264.org/libopenh264-1.5.0-linux32.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.5.0-linux64.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.5.0-osx32.dylib.bz2
-http://ciscobinary.openh264.org/libopenh264-1.5.0-osx64.dylib.bz2
-http://ciscobinary.openh264.org/openh264-1.5.0-win32msvc.dll.bz2
-http://ciscobinary.openh264.org/openh264-1.5.0-win64msvc.dll.bz2
-
-v1.4.0
-------
-http://ciscobinary.openh264.org/libopenh264-1.4.0-android19.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.4.0-linux32.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.4.0-linux64.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.4.0-osx32.dylib.bz2
-http://ciscobinary.openh264.org/libopenh264-1.4.0-osx64.dylib.bz2
-http://ciscobinary.openh264.org/openh264-1.4.0-win32msvc.dll.bz2
-http://ciscobinary.openh264.org/openh264-1.4.0-win64msvc.dll.bz2
-
-v1.3.1
-------
-http://ciscobinary.openh264.org/libopenh264-1.3.1-android19.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.3.1-linux32.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.3.1-linux64.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.3.1-osx32.dylib.bz2
-http://ciscobinary.openh264.org/libopenh264-1.3.1-osx64.dylib.bz2
-http://ciscobinary.openh264.org/openh264-1.3.1-win32msvc.dll.bz2
-http://ciscobinary.openh264.org/openh264-1.3.1-win64msvc.dll.bz2
-
-v1.3.0
-------
-http://ciscobinary.openh264.org/libopenh264-1.3.0-android19.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.3.0-linux32.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.3.0-linux64.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.3.0-osx32.dylib.bz2
-http://ciscobinary.openh264.org/libopenh264-1.3.0-osx64.dylib.bz2
-http://ciscobinary.openh264.org/openh264-1.3.0-win32msvc.dll.bz2
-http://ciscobinary.openh264.org/openh264-1.3.0-win64msvc.dll.bz2
-
-v1.2.0
-------
-http://ciscobinary.openh264.org/libopenh264-1.2.0-android19.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.2.0-linux32.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.2.0-linux64.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.2.0-osx32.dylib.bz2
-http://ciscobinary.openh264.org/libopenh264-1.2.0-osx64.dylib.bz2
-http://ciscobinary.openh264.org/openh264-1.2.0-win32msvc.dll.bz2
-http://ciscobinary.openh264.org/openh264-1.2.0-win64msvc.dll.bz2
-
-v1.1.0
-------
-http://ciscobinary.openh264.org/libopenh264-1.1.0-android19.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.1.0-linux32.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.1.0-linux64.so.bz2
-http://ciscobinary.openh264.org/libopenh264-1.1.0-osx32.dylib.bz2
-http://ciscobinary.openh264.org/libopenh264-1.1.0-osx64.dylib.bz2
-http://ciscobinary.openh264.org/openh264-1.1.0-win32msvc.dll.bz2
-http://ciscobinary.openh264.org/openh264-1.1.0-win64msvc.dll.bz2
-
 v1.0.0
 ------
 

autotest/codec_comparision/run_MultiCodecComparision.sh

@@ -1,431 +0,0 @@
-#!/bin/bash
-#*******************************************************************
-# brief: multi-encoders comparision for openh264
-#        (one given sequence only)
-#        comparision almong encoders in \$TestEncoderList
-#
-#        more detail, please refer to runUsage() and runBrief()
-#
-# date: 2015-12-16
-#*******************************************************************
-
-runUsage()
-{
-    echo -e "\033[32m ********************************************************************* \033[0m"
-    echo " Usage: "
-    echo "      --$0 \$TestPicW \$TestPicH \$TestEncoderList"
-    echo ""
-    echo "      --example:"
-    echo "        $0 1280 720 h264enc_master h264enc_target1 h264enc_target2 "
-    echo ""
-    echo " Pre-test:"
-    echo "      --1) copy welsenc.cfg from ./openh264/testbin/ to current dir"
-    echo "      --2) set test YUV path in welsenc.cfg "
-    echo "      --3) copy layer0.cfg from ./openh264/testbin/layer2.cfg to current dir"
-    echo "      --4) copy layer1.cfg from ./openh264/testbin/layer2.cfg to current dir"
-    echo "      --5) copy layer2.cfg from ./openh264/testbin/layer2.cfg to current dir"
-    echo "      --6) copy layer3.cfg from ./openh264/testbin/layer2.cfg to current dir"
-    echo "           layer0.cfg~layer3.cfg are used for multi-layers test cases"
-    echo ""
-    echo "      --7) generate at least one encoder, "
-    echo "           eg. h264enc_master----master branch as benchmark codec"
-    echo "               h264enc_target----your branch CodecChanged as target codec"
-    echo ""
-    echo "      --8) copy all tests codec to folder ./Encoder"
-    echo "      --9) run below command line:"
-    echo "           $0 \$TestPicW \$TestPicH \$TestEncoderList"
-    echo ""
-    echo " Post-test:"
-    echo "      --1) temp cases log will be output in ./Trace-AllTestData"
-    echo "      --2) all comparision data parsed from log files will be output to "
-    echo "           related .csv file under ./Trace-AllTestData "
-    echo ""
-    echo " example:"
-    echo "     --comparison almong h264enc_master h264enc_target1 h264enc_target2"
-    echo "       for Zhuling_1280x720.yuv"
-    echo ""
-    echo "     --run command as below:"
-    echo "       $0 1280 720 h264enc_master h264enc_target1 h264enc_target2 "
-    echo ""
-    echo "     --get final result files(.csv) under ./Trace-AllTestData"
-    echo ""
-    echo -e "\033[32m ********************************************************************* \033[0m"
-}
-
-runBrief()
-{
-    echo -e "\033[32m ********************************************************************* \033[0m"
-    echo " brief:"
-    echo ""
-    echo " encoder veision comparision "
-    echo "       --comparision almong encoders in \$TestEncoderList"
-    echo "       --please generate at least one encoder and copy to folder ./Encoder"
-    echo "       --script will run all test cases for each test encoder"
-    echo "         and generate related trace log files for each encoder"
-    echo "       --script will parse and extact data based on keyword from trace log file"
-    echo "         and output to related .csv files for all encoder"
-    echo "       --the test outout file will be put under ./Trace-AllTestData"
-    echo ""
-    echo " test cases:"
-    echo "       --add more cases in function runGlobleInit()"
-    echo "       --add new argument with for loop  like rc. etc in function "
-    echo "         runAllEncodeCasesAndGenerateLog()"
-    echo ""
-    echo " new data:"
-    echo "      --currently only memory usage, you can add new data for your comparision"
-    echo "      --need to add related data parse in function runParseTraceLog()"
-    echo ""
-    echo -e "\033[32m ********************************************************************* \033[0m"
-}
-
-runPrompt()
-{
-    echo -e "\033[32m ********************************************************************* \033[0m"
-    echo ""
-    echo "             ------Test completed!--------"
-    echo ""
-    echo -e "\033[32m ********************************************************************* \033[0m"
-    echo " "
-    echo "   --Total ${iTotalCaseNum} cases run for encoders: ${aEncoderList[@]}"
-    echo ""
-    echo "   --Statistic files for comparision are list as below:"
-    echo "     ${MemoryUsageStatic}"
-    echo ""
-    echo "   --trace log files can be found under:"
-    echo "     ${LogDir}"
-    echo ""
-    echo -e "\033[32m ********************************************************************* \033[0m"
-}
-
-runGlobleInit()
-{
-    CurrenDir=`pwd`
-    LogDir="${CurrenDir}/Trace-AllTestData"
-    EncoderDir="${CurrenDir}/Encoder"
-
-    if [ ! -d ${LogDir} ]
-    then
-        mkdir ${LogDir}
-    fi
-
-
-    LogFile="Log_EncTraceInfo.log"
-    MemoryUsageStatic="${LogDir}/MemoryUsage.csv"
-    TempEncoderList=""
-    for((i=0; i<${#aEncoderList[@]}; i++))
-    do
-        if [ -z "${TempEncoderList}" ]
-        then
-            TempEncoderList="${aEncoderList[$i]},"
-        else
-            TempEncoderList="${TempEncoderList} ${aEncoderList[$i]},"
-        fi
-    done
-
-    let "iTotalCaseNum=0"
-    let "MemoryUsage = 0"
-    echo "LogDir is ${LogDir}"
-    echo "MemoryUsageStatic file is ${MemoryUsageStatic}"
-    echo "SpatialLayerNum, ThreadNum, SliceMode, SliceNum, SlicMbNum, ${TempEncoderList}" >${MemoryUsageStatic}
-
-    echo "LogDir is ${LogDir}"
-    echo "MemoryUsageStatic file is ${MemoryUsageStatic}"
-
-
-    let "iTraceLevel=4"
-    let "iFrameToBeEncoded = 32"
-    let "iMaxNalSize=0"
-    #you can add more test case like rc, gop size, et.
-    #and add "for loop" in function runAllEncodeCasesAndGenerateLog()
-    aSpatialLayerNum=(1 2 3 4 )
-    aThreadIdc=(1 4)
-    aSliceMode=(0 1 2 3)
-    aSliceNum=(0 8 16 32)
-    aSliceMbNum=(0 960)
-
-    Encoder=""
-    sEncoderCommand=""
-}
-
-runCheck()
-{
-    if [ ! -d ${EncoderDir} ]
-    then
-        echo "encoder folder does not exist, please following below command to copy encoder to test folder--./Encoder"
-        echo "   mkdir Encoder"
-        echo "   cp \${AllVersionEncoders}  ./Encoder "
-        exit 1
-    fi
-
-    let "bEncoderFlag = 0"
-    echo "aEncoderList is ${aEncoderList[@]} "
-    for file in ${aEncoderList[@]}
-    do
-        if [ -x ${EncoderDir}/${file} ]
-        then
-            let "bEncoderFlag = 1"
-        fi
-    done
-
-    if [ ${bEncoderFlag} -eq 0 ]
-    then
-        echo "no encoder under test folder, please following below command to copy encoder to test folder--./Encoder"
-        echo "   cp \${AllVersionEncoders}  ./Encoder "
-        echo "   chmod u+x ./Encoder/* "
-        exit 1
-    fi
-}
-
-
-runGenerateSpatialLayerResolution()
-{
-    SpatialLayerNum=$1
-    if [ -z "${SpatialLayerNum}" ]
-    then
-        let "SpatialLayerNum =1"
-    fi
-
-    let "PicW_L0= PicW / 8"
-    let "PicW_L1= PicW / 4"
-    let "PicW_L2= PicW / 2"
-    let "PicW_L3= PicW"
-
-    let "PicH_L0= PicH / 8"
-    let "PicH_L1= PicH / 4"
-    let "PicH_L2= PicH / 2"
-    let "PicH_L3= PicH"
-
-    if [ ${SpatialLayerNum} -eq 1 ]
-    then
-        aPicW=( ${PicW_L3} 0 0 0 )
-        aPicH=( ${PicH_L3} 0 0 0 )
-
-    elif [ ${SpatialLayerNum} -eq 2 ]
-    then
-        aPicW=( ${PicW_L2} ${PicW_L3} 0 0 )
-        aPicH=( ${PicH_L2} ${PicH_L3} 0 0 )
-
-    elif [ ${SpatialLayerNum} -eq 3 ]
-    then
-        aPicW=( ${PicW_L1} ${PicW_L2} ${PicW_L3} 0 )
-        aPicH=( ${PicH_L1} ${PicH_L2} ${PicH_L3} 0 )
-
-    elif [ ${SpatialLayerNum} -eq 4 ]
-    then
-        aPicW=( ${PicW_L0} ${PicW_L1} ${PicW_L2} ${PicW_L3} )
-        aPicH=( ${PicH_L0} ${PicH_L1} ${PicH_L2} ${PicH_L3} )
-    fi
-
-    echo "*************************************************************************"
-    echo "  ${SpatialLayerNum} layers spactial resolution for ${PicW}x${PicH} are:"
-    echo ""
-    echo "  aPicW is ${aPicW[@]}"
-    echo "  aPicH is ${aPicH[@]}"
-    echo "*************************************************************************"
-
-}
-
-#parse data from encoder trace log
-#you can add more key word to extract data from log file
-runParseTraceLog()
-{
-    TempLogFile=$1
-    let "MemoryUsage = 0"
-
-    echo "*****************************************"
-    echo "parsing trace log file"
-    echo "log file name is ${TempLogFile}"
-    echo "*****************************************"
-
-    if [ ! -e ${TempLogFile} ]
-    then
-        echo "LogFile ${TempLogFile} does not exist, please double check!"
-        return 1
-    fi
-
-    MemUsageInLog=""
-    while read line
-    do
-        if [[ "${line}" =~ "overall memory usage" ]]
-        then
-            #[OpenH264] this = 0x0x7fa4d2c04c30, Info:WelsInitEncoderExt() exit, overall memory usage: 40907254 bytes
-            MemUsageInLog=(`echo $line | awk 'BEGIN {FS="usage:"} {print $2}' `)
-        fi
-
-        # you can add more key word to extract data from log file
-        # e.g.: bit rate, fps, encoder time, psnr etc.
-        # add script block like:
-        # ****************************************************
-        #   if [[ "${line}" =~ "KeyWordYouWantToSearch" ]]
-        #   then
-        #       $line in log file which contain data you want
-        #       DataYouWant=(`echo $line | awk 'BEGIN {FS="keywordYourSearch"} {print $2}' `)
-        #   fi
-        # ****************************************************
-
-    done < ${TempLogFile}
-
-    let "MemoryUsage = ${MemUsageInLog}"
-    echo "MemoryUsage is ${MemoryUsage}"
-}
-
-runEncodeOneCase()
-{
-    #encoding process
-    echo "------------------------------------------------------"
-    echo "${Encoder} welsenc.cfg ${sEncoderCommand}" >${LogFile}
-    ${Encoder} welsenc.cfg ${sEncoderCommand}      2>>${LogFile}
-    ${Encoder} welsenc.cfg ${sEncoderCommand}       >>${LogFile}
-    echo "------------------------------------------------------"
-}
-
-runAllEncodeCasesAndGenerateLog()
-{
-
-    echo "aSpatialLayerNum is ${aSpatialLayerNum[@]}"
-    echo "aThreadIdc       is ${aThreadIdc[@]}"
-    echo "aSliceMode       is ${aSliceMode[@]}"
-    echo "aSliceNum        is ${aSliceNum[@]}"
-    echo "aSliceMbNum      is ${aSliceMbNum[@]}"
-
-    sEncoderCommand1="-lconfig 0 layer0.cfg -lconfig 1 layer1.cfg -lconfig 2 layer2.cfg  -lconfig 3 layer3.cfg"
-    TempMemoryUsage=""
-    OtherDataYouWant=""
-    TempTestCase=""
-    let "CaseNum=1"
-    for iSLayerNum in ${aSpatialLayerNum[@]}
-    do
-        for iThreadNum in ${aThreadIdc[@]}
-        do
-            for iSliceMode in ${aSliceMode[@]}
-            do
-                for iSliceNum in ${aSliceNum[@]}
-                do
-                    #raster slice mb mode, slice-mb-num =0, switch to row-mb-mode
-                    if [ ${iSliceMode} -eq 2 ]
-                    then
-                        aSliceMbNum=(0 960)
-                    else
-                        aSliceMbNum=(960)
-                    fi
-
-                    for iSlicMbNum in ${aSliceMbNum[@]}
-                    do
-                        TempMemoryUsage=""
-                        #for cases output to statistic file
-                        TempTestCase="${iSLayerNum}, ${iThreadNum}, ${iSliceMode}, ${iSliceNum}, ${iSlicMbNum}"
-
-                        for eEncoder in ${aEncoderList[@]}
-                        do
-                            Encoder=${EncoderDir}/${eEncoder}
-                            if [ -x ${Encoder} ]
-                            then
-
-                                if [ ${iSliceMode} -eq 3 ]
-                                then
-                                    iMaxNalSize=1000
-                                else
-                                    iMaxNalSize=0
-                                fi
-
-                                runGenerateSpatialLayerResolution ${iSLayerNum}
-
-                                sEncoderCommand2="-slcmd 0 ${iSliceMode} -slcmd 1 ${iSliceMode} -slcmd 2 ${iSliceMode} -slcmd 3 ${iSliceMode}"
-                                sEncoderCommand3="-slcnum 0 ${iSliceNum} -slcnum 1  ${iSliceNum} -slcnum 2 ${iSliceNum} -slcnum 3 ${iSliceNum}"
-                                sEncoderCommand4="-slcmbnum 0 ${iSlicMbNum} -slcmbnum 1 ${iSlicMbNum} -slcmbnum 2 ${iSlicMbNum} -slcmbnum 3 ${iSlicMbNum} "
-
-                                sEncoderCommand5="-trace ${iTraceLevel} -numl  ${iSLayerNum}  -thread  ${iThreadNum} -nalsize  ${iMaxNalSize}"
-
-                                sEncoderCommand6="-dw 0 ${aPicW[0]} -dw 1 ${aPicW[1]}  -dw 2 ${aPicW[2]} -dw 3 ${aPicW[3]}"
-                                sEncoderCommand7="-dh 0 ${aPicH[0]} -dh 1 ${aPicH[1]}  -dh 2 ${aPicH[2]} -dh 3 ${aPicH[3]}"
-
-                                sEncoderCommand="-frms ${iFrameToBeEncoded} ${sEncoderCommand1} ${sEncoderCommand2} ${sEncoderCommand3} ${sEncoderCommand4} ${sEncoderCommand5} ${sEncoderCommand6} ${sEncoderCommand7}"
-
-                                LogFile="${LogDir}/${CaseNum}_LogInfo_iSLNum_${iSLayerNum}_ThrNum_${iThreadNum}_SlcM_${iSliceMode}_SlcN_${iSliceNum}_${eEncoder}.log"
-
-                                echo "Encode command is: "
-                                echo "${Encoder} welsenc.cfg  ${sEncoderCommand}"
-                                echo ""
-                                echo "log file is ${LogFile}"
-
-                                #encode one case
-                                runEncodeOneCase
-
-                                #parse trace log
-                                runParseTraceLog ${LogFile}
-
-                                #data extracted from log
-                                #you can add new data here like rc, fps , etc.
-                                echo "memory usage is ${MemoryUsage}"
-                                if [ -z ${TempMemoryUsage} ]
-                                then
-                                    TempMemoryUsage="${MemoryUsage},"
-                                else
-                                    TempMemoryUsage="${TempMemoryUsage} ${MemoryUsage},"
-                                fi
-                                echo "TempMemoryUsage is ${TempMemoryUsage}"
-                            fi
-                        done
-
-                        #output memory usage for all encoders
-                        echo "${TempTestCase}, ${TempMemoryUsage}, ${OtherDataYouWant}" >>${MemoryUsageStatic}
-                        let " CaseNum ++"
-                        let "iTotalCaseNum ++"
-
-                    done
-
-                done
-
-            done
-
-        done
-
-    done
-
-}
-
-
-runMain()
-{
-    runGlobleInit
-    runCheck
-    runAllEncodeCasesAndGenerateLog
-    runPrompt
-}
-
-#*************************************************************
-if [ $# -lt 3 ]
-then
-    runUsage
-    runBrief
-    exit 1
-fi
-
-declare -a aEncoderList
-declare -a aParamList
-
-aParamList=( $@ )
-ParamNum=$#
-
-PicW=${aParamList[0]}
-PicH=${aParamList[1]}
-
-for((i=2;i<$#;i++))
-do
-    echo "encoder is  ${aParamList[$i]}"
-    aEncoderList="${aEncoderList} ${aParamList[$i]}"
-done
-aEncoderList=(${aEncoderList})
-
-
-echo -e "\033[32m ********************************* \033[0m"
-echo ""
-echo "   --num parameters is ${ParamNum} "
-echo "   --input parameters are:"
-echo "     $0 $@"
-echo ""
-echo -e "\033[32m ********************************* \033[0m"
-
-runMain
-#*************************************************************
-

autotest/performanceTest/.gitignore

@@ -1,13 +0,0 @@
-#performance test resource folder
-./EncoderPerfTestRes
-./DecoderPerfTestRes
-./DecoderPerfTestRes/*.*
-./EncoderPerfTestRes/*.*
-#performance test result folder
-./TestResultCSV
-#
-.DS_Store
-#.
-./android/report
-./ios/report
-

autotest/performanceTest/android/run_AutoTest_android.sh

@@ -1,180 +0,0 @@
-#!/bin/bash
-
-AUTO_TEST_ANDROID_PATH=`pwd`
-AUTO_TEST_SRC_PATH="../../../"
-AUTO_TEST_RES_PATH="${AUTO_TEST_ANDROID_PATH}/report"
-mkdir -p ${AUTO_TEST_RES_PATH}
-#Prepare android build enviroment
-echo please set the enviroment variable as:
-echo export ANDROID_HOME="path of android sdk"
-echo export ANDROID_NDK_HOME="path of android ndk"
-ANDROID_SDK_PATH=${ANDROID_HOME}
-ANDROID_NDK_PATH=${ANDROID_NDK_HOME}
-ANDROID_MAKE_PARAMS="OS=android NDKROOT=${ANDROID_NDK_PATH} TARGET=android-19"
-
-if [ "#${ANDROID_SDK_PATH}" = "#" ]
-then
-echo Please set ANDROID_HOME with the path of Android SDK
-exit 1
-fi
-if [ "#${ANDROID_NDK_PATH}" = "#" ]
-then
-echo Please set ANDROID_NDK_HOME with the path of Android NDK
-exit 1
-fi
-#make build
-cd ${AUTO_TEST_SRC_PATH}
-find ./ -name *.o -exec rm -f {} \;
-find ./ -name *.d -exec rm -f {} \;
-make $ANDROID_MAKE_PARAMS
-
-if [ $? -ne 0 ]
-then
-   echo Build error,check with the trace of make
-   exit 1
-fi
-
-ENCDEC=$1
-#find apk
-if [ ${ENCDEC} = "enc" ]
-then
-echo Start to find enc apk
-apk_name=`find ./ -name WelsEncTest-debug.apk`
-if [ "#${apk_name}" = "#" ]
-then
-  echo Fail to find encoder APK.
-  exit 1
-fi
-else
-echo Start to find dec apk
-apk_name=`find ./ -name WelsDecTest-debug.apk`
-if [ "#${apk_name}" = "#" ]
-then
-echo Fail to find decoder APK.
-exit 1
-fi
-fi
-
-#prepare devices
-ADB=${ANDROID_SDK_PATH}/platform-tools/adb
-
-#get devices
-devices=`$ADB devices | awk -F" " '/\tdevice/{print $1}'`
-if [ "#$devices" = "#" ];then
-   echo "Have not any android devices."
-   exit 1
-fi
-
-#run apk
-run_apk() {
-local apk=$1;
-local rand=` date +%s`
-
-if [[ "${apk}" =~ "WelsDecTest-debug.apk" ]]
-then
-   apk_id="com.wels.dec"
-   apk_main="com.wels.dec/.WelsDecTest"
-   test_path="/sdcard/welsdec"
-   log_grep_params="welsdec"
-   test_res=${AUTO_TEST_ANDROID_PATH}/../DecoderPerfTestRes
-   report_file=${AUTO_TEST_RES_PATH}/decPerf
-
-fi
-if [[ "${apk}" =~ "WelsEncTest-debug.apk" ]]
-then
-  apk_id="com.wels.enc"
-  apk_main="com.wels.enc/.WelsEncTest"
-  test_path="/sdcard/welsenc"
-  log_grep_params="welsenc"
-  test_res=${AUTO_TEST_ANDROID_PATH}/../EncoderPerfTestRes
-  report_file=${AUTO_TEST_RES_PATH}/encPerf
-fi
-space="limit"
-for dev in $devices; do
-    dev_info_file=${AUTO_TEST_RES_PATH}/${dev}.log
-    $ADB -s $dev uninstall ${apk_id}
-    $ADB -s $dev install -r ${apk}
-    #TODO: output more info about android device such as name,cpu,memory,and also power comsumption.
-    #echo `$ADB -s $dev shell cat /system/build.prop |grep ro.product.model | awk -F"=" '{print $2}'`>${dev_info_file}
-    #push resources
-    #For limited devices space
-    if [ ${space} = "limit" ]
-    then
-    test_res_bak=${test_res}_bak
-    mv ${test_res} ${test_res_bak}
-    mkdir -p ${test_res}
-    test_case=`ls ${test_res_bak}`
-    for case in ${test_case}
-    do
-       echo ${case}
-        cp -r ${test_res_bak}/${case} ${test_res}/.
-        $ADB -s $dev push ${test_res} ${test_path}
-        #before start logcat,kill logcat
-        pid=`$ADB -s $dev shell ps | grep logcat | awk '{print $2;}'`
-        [ "#$pid" != "#" ] && $ADB -s $dev shell kill $pid >/dev/null
-        $ADB -s $dev logcat -c
-        $ADB -s $dev logcat |grep ${log_grep_params} >>${report_file}_${dev}_${rand}.log &
-        $ADB -s $dev shell am start -n ${apk_main}
-        # check whetehr the app is finished every 2 sec
-        for (( ; ; )); do
-            $ADB -s $dev shell ps | grep ${apk_id}
-            if [ $? -ne 0 ]; then
-                sleep 2
-                $ADB -s $dev shell ps | grep ${apk_id}
-                [ $? -ne 0 ] && break
-            fi
-            sleep 2
-        done
-
-        # kill logcat
-        pid=`$ADB -s $dev shell ps | grep logcat | awk '{print $2;}'`
-        [ "#$pid" != "#" ] && $ADB -s $dev shell kill $pid >/dev/null
-
-        #delete the res
-        $ADB -s $dev shell rm -rf ${test_path}
-        rm -rf ${test_res}/${case}
-    done
-    rm -rf ${test_res}
-    mv ${test_res_bak} ${test_res}
-    else
-    $ADB -s $dev push ${test_res} ${test_path}
-    #before start logcat,kill logcat
-    pid=`$ADB -s $dev shell ps | grep logcat | awk '{print $2;}'`
-    [ "#$pid" != "#" ] && $ADB -s $dev shell kill $pid >/dev/null
-    $ADB -s $dev logcat -c
-    $ADB -s $dev logcat |grep ${log_grep_params} >${report_file}_${dev}_${rand}.log &
-    $ADB -s $dev shell am start -n ${apk_main}
-    # check whetehr the app is finished every 2 sec
-    for (( ; ; )); do
-    $ADB -s $dev shell ps | grep ${apk_id}
-    if [ $? -ne 0 ]; then
-        sleep 2
-        $ADB -s $dev shell ps | grep ${apk_idi}
-        [ $? -ne 0 ] && break
-    fi
-    sleep 2
-    done
-
-    # kill logcat
-    pid=`$ADB -s $dev shell ps | grep logcat | awk '{print $2;}'`
-    [ "#$pid" != "#" ] && $ADB -s $dev shell kill $pid >/dev/null
-
-    #delete the res
-    $ADB -s $dev shell rm -rf ${test_path}
-    fi
-
-done
-}
-for apk in ${apk_name};do
-   run_apk $apk;
-   if [ $? -ne 0 ]
-   then
-     echo There is something wrong happened when run ${apk_name}
-     exit 1
-   else
-     echo Finished $ENCDEC performance test on android
-     echo The test result is at ./android/report/xxx.log
-     echo xxxxxxxxxxxxxxxAndroid $ENCDEC Endxxxxxxxxxxxxxxxx
-   fi
-done
-

autotest/performanceTest/ios/run_AutoTest_ios.sh

@@ -1,193 +0,0 @@
-#!/bin/bash
-
-##############################################################
-#Build ios test ref app
-
-#set the default configuration
-CODEC_TEST_IOS_ARCH="armv7 armv7s arm64"
-CODEC_TEST_IOS_PLATFORM="iphoneos"
-CODEC_TEST_IOS_DEBUG_RELEASE="Release"
-CODEC_TEST_IOS_REPORT_SUBFOLDER="release"
-
-
-buildXcodeProject()
-{
- xcodebuild ARCHS="${CODEC_TEST_IOS_ARCH}" VALID_ARCHS="${CODEC_TEST_IOS_ARCH}" ONLY_ACTIVE_ARCH=YES  -project $1 -target $2 -configuration $3 -sdk ${CODEC_TEST_IOS_PLATFORM} clean build
-
-if [ $? -eq 0 ]; then
- echo "build $1 $3 successfully"
- else
- echo "build $1 $3  fail"
- exit 1
- fi
-}
-
-
-
-iosPerformanceTest()
-{
-
-if [ $# -gt 2 ]; then
-echo "Please use command $0 [enc/dec] [release/debug]"
-exit 1
-fi
-
-for PARAM in $*; do
- if [ "enc" = "${PARAM}" ]; then
-     CODEC_TEST_XCODE_PROJECT_NAME="${AUTO_TEST_SRC_PATH}/codec/build/iOS/enc/encDemo/encDemo.xcodeproj"
-     CODEC_TEST_IOS_PROJECT_NAME="encDemo"
-     CODEC_TEST_IOS_PROJECT_PATH="${AUTO_TEST_SRC_PATH}/codec/build/iOS/enc/encDemo/build"
-     CODEC_TEST_IOS_APP=${CODEC_TEST_IOS_PROJECT_PATH}/${CODEC_TEST_IOS_DEBUG_RELEASE}-iphoneos/${CODEC_TEST_IOS_PROJECT_NAME}.app
-     CODEC_TEST_IOS_APP_ID="cisco.encDemo"
-     CODEC_TEST_RES=${AUTO_TEST_IOS_PATH}/../EncoderPerfTestRes
-     CODEC_TEST_LOG="encPerf"
- elif [ "dec" = "${PARAM}" ]; then
-     CODEC_TEST_XCODE_PROJECT_NAME="${AUTO_TEST_SRC_PATH}/codec/build/iOS/dec/demo/demo.xcodeproj/"
-     CODEC_TEST_IOS_PROJECT_NAME="demo"
-     CODEC_TEST_IOS_PROJECT_PATH="${AUTO_TEST_SRC_PATH}/codec/build/iOS/dec/demo/build"
-     CODEC_TEST_IOS_APP=${CODEC_TEST_IOS_PROJECT_PATH}/${CODEC_TEST_IOS_DEBUG_RELEASE}-iphoneos/${CODEC_TEST_IOS_PROJECT_NAME}.app
-     CODEC_TEST_IOS_APP_ID="hf.cisco.demo"
-     CODEC_TEST_RES=${AUTO_TEST_IOS_PATH}/../DecoderPerfTestRes
-     CODEC_TEST_LOG="decPerf"
- elif [ "release" = "${PARAM}" ]; then
-     CODEC_TEST_IOS_DEBUG_RELEASE="Release"
-     CODEC_TEST_IOS_REPORT_SUBFOLDER="release"
- elif [ "debug" = "${PARAM}" ]; then
-     CODEC_TEST_IOS_DEBUG_RELEASE="Debug"
-     CODEC_TEST_IOS_REPORT_SUBFOLDER="debug"
- else
-    echo parameters are illegal!!!, please have a check.
-    exit 1
- fi
- done
-
-echo "Codec test will run on ${CODEC_TEST_IOS_PLATFORM} with ${CODEC_TEST_IOS_DEBUG_RELEASE}"
-buildXcodeProject ${CODEC_TEST_XCODE_PROJECT_NAME} ${CODEC_TEST_IOS_PROJECT_NAME} ${CODEC_TEST_IOS_DEBUG_RELEASE} ${CODEC_TEST_IOS_PLATFORM}
-
-
-
-
-##############run on ios devices#########################
-# for real device
-if [ ! -d ${CODEC_TEST_IOS_APP} ] ; then
-echo "${CODEC_TEST_IOS_APP} is not found"
-exit 1
-else
-echo "Find app ${CODEC_TEST_IOS_APP}"
-fi
-
- #ensure instruments not runing
-echo "Try to kill the runing instruments"
-pids_str=`ps x -o pid,command | grep -v grep | grep "instruments" | awk '{printf "%s,", $1}'`
-instruments_pids="${pids_str//,/ }"
-for pid in ${instruments_pids}; do
-echo "Found instruments ${pid}. Killing..."
-kill -9 ${pid} && wait ${pid} &> /dev/null
-done
-
-
-
-DEVICES=`system_profiler SPUSBDataType | sed -n -e '/iPad/,/Serial/p' -e '/iPhone/,/Serial/p' | grep "Serial Number:" | awk -F ": " '{print $2}'`
-if [ "${DEVICES}#" == "#" ]
-then
-echo "Can not find any connected device! please check device is connected to MAC!"
-exit 1
-else
-rand=`date +%s`
-for DEVICE_ID in ${DEVICES}
-do
-echo "Try to run on device:${DEVICE_ID}"
-
-#Encoder YUV file too large
-if [ ${ENCDEC} = "enc" ]
-then
-#For limited devices space
-BAKRES=${CODEC_TEST_RES}_bak
-mv ${CODEC_TEST_RES} ${BAKRES}
-mkdir -p ${CODEC_TEST_RES}
-CODEC_CASE=`ls ${BAKRES}`
-echo ${CODEC_CASE}
-for CASE in ${CODEC_CASE}
-do
-echo ${CASE}
-cp -r ${BAKRES}/${CASE} ${CODEC_TEST_RES}/.
-
-
-#uninstall the application from device to remove the last result
-./fruitstrap uninstall --bundle ${CODEC_TEST_IOS_APP_ID} --id ${DEVICE_ID}
-if [ $? -ne 0 ]; then
-echo uninstall application: ${CODEC_TEST_IOS_APP} from device: ${DEVICE_ID} is failed!
-fi
-#install the application
-./fruitstrap install --bundle ${CODEC_TEST_IOS_APP} --id ${DEVICE_ID}
-if [ $? -ne 0 ]; then
-echo install application: ${CODEC_TEST_IOS_APP} to device: ${DEVICE_ID} is failed!
-exit 1
-fi
-
-./iFileTransfer -o copy -id ${DEVICE_ID} -app ${CODEC_TEST_IOS_APP_ID} -from ${CODEC_TEST_RES}
-instruments -w ${DEVICE_ID}  -t /Applications/Xcode.app/Contents/Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate ${CODEC_TEST_IOS_APP} -e UIASCRIPT ./uiascript.js -e UIARRESULTPATH /tmp/
-#copy to report folder
-./iFileTransfer -o download -id ${DEVICE_ID} -app ${CODEC_TEST_IOS_APP_ID} -from /Documents/${CODEC_TEST_LOG}.log -to ${CODEC_TEST_IOS_REPORT_PATH}/${CODEC_TEST_LOG}_${DEVICE_ID}_${rand}_${CASE}.log
-if [ $? -ne 0 ]; then
-echo "download file: ${CODEC_TEST_LOG}.log from ${CODEC_TEST_IOS_APP_ID} is failed!"
-exit 1
-fi
-cat ${CODEC_TEST_IOS_REPORT_PATH}/${CODEC_TEST_LOG}_${DEVICE_ID}_${rand}_${CASE}.log>>${CODEC_TEST_IOS_REPORT_PATH}/${CODEC_TEST_LOG}_${DEVICE_ID}_${rand}.log
-rm -f ${CODEC_TEST_IOS_REPORT_PATH}/${CODEC_TEST_LOG}_${DEVICE_ID}_${rand}_${CASE}.log
-rm -rf ${CODEC_TEST_RES}/${CASE}
-done
-rm -rf ${CODEC_TEST_RES}
-mv ${BAKRES} ${CODEC_TEST_RES}
-#Enough spaces
-else
-#uninstall the application from device to remove the last result
-./fruitstrap uninstall --bundle ${CODEC_TEST_IOS_APP_ID} --id ${DEVICE_ID}
-if [ $? -ne 0 ]; then
-echo uninstall application: ${CODEC_TEST_IOS_APP} from device: ${DEVICE_ID} is failed!
-fi
-#install the application
-./fruitstrap install --bundle ${CODEC_TEST_IOS_APP} --id ${DEVICE_ID}
-if [ $? -ne 0 ]; then
-echo install application: ${CODEC_TEST_IOS_APP} to device: ${DEVICE_ID} is failed!
-exit 1
-fi
-
-./iFileTransfer -o copy -id ${DEVICE_ID} -app ${CODEC_TEST_IOS_APP_ID} -from ${CODEC_TEST_RES}
-instruments -w ${DEVICE_ID}  -t /Applications/Xcode.app/Contents/Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate ${CODEC_TEST_IOS_APP} -e UIASCRIPT ./uiascript.js -e UIARRESULTPATH /tmp/
-#copy to report folder
-./iFileTransfer -o download -id ${DEVICE_ID} -app ${CODEC_TEST_IOS_APP_ID} -from /Documents/${CODEC_TEST_LOG}.log -to ${CODEC_TEST_IOS_REPORT_PATH}/${CODEC_TEST_LOG}_${DEVICE_ID}_${rand}_${CASE}.log
-if [ $? -ne 0 ]; then
-echo "download file: ${CODEC_TEST_LOG}.log from ${CODEC_TEST_IOS_APP_ID} is failed!"
-exit 1
-fi
-
-
-fi
-done
-
-fi
-}
-
-AUTO_TEST_IOS_PATH=`pwd`
-AUTO_TEST_SRC_PATH="../../.."
-CODEC_TEST_IOS_REPORT_PATH="${AUTO_TEST_IOS_PATH}/report"
-if [ ! -d ${CODEC_TEST_IOS_REPORT_PATH} ]
-then
- mkdir -p ${CODEC_TEST_IOS_REPORT_PATH}
-fi
-
-ENCDEC=$1
-#start to get encoder/decoder performance data,default run the xcode with release
-iosPerformanceTest $ENCDEC release
-
-if [ $? -ne 0 ]; then
-echo "Running $ENCDEC demo to get encoder performance is failed!"
-exit 1
-else
-echo Finished $ENCDEC performance test on ios devices
-echo the test result is generated at ./ios/report/xx.loGbash parsePerfData.sh
-echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxIOS $ENCDEC  Endxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-fi
-#TODO:according to the trace of instruments to do some analysis
-#find ./ -name *.trace -exec rm -rf {} \;

autotest/performanceTest/ios/uiascript.js

@@ -1,19 +0,0 @@
-UIATarget.onAlert = function onAlert(alert){
-
-    UIALogger.logMessage("In Alert!");
-	title = alert.name();
-	if (title && title.indexOf("Microphone") !== -1) {
-		UIALogger.logMessage("Alert with title '" + title + "' encountered!");
-		var buttons = alert.buttons();
-		var buttonCount = buttons.length;
-
-		if (buttonCount > 0) {
-			var acceptButton = buttons[buttonCount - 1];
-			acceptButton.tap(); // last button is accept
-		}
-	return true; //forbid the default cancel processing
-    }
-    return false; //using the default cancel processing
-}
-var target = UIATarget.localTarget();
-target.delay(6000);

autotest/performanceTest/parsePerfData.sh

@@ -1,107 +0,0 @@
-#!/bin/bash
-
-#usage  runGetPerformanceInfo   ${PerformanceLogFile}
-runGetPerformanceInfo_openh264()
-{
-
-        if [ ! $# -eq 2 ]
-        then
-                echo "not enough parameters!"
-                echo "usage: ${0} [android/ios] ${PerformanceLogFile}"
-                return 1
-        fi
-
-        local PerformanceLogFile=$2
-    local FileName=""
-        local Width=""
-        local Height=""
-        local Frames=""
-        local FPS=""
-        local EncodeTime=""
-    if [ $1 = "android" ]
-    then seperatorNum=3
-    else
-        seperatorNum=2
-    fi
-
-        while read line
-        do
-                if [[ $line =~ "enc yuv file"  ]]
-                then
-            FileName=`echo $line | awk 'BEGIN {FS="enc yuv file"} {print $2}'`
-            FileName=`echo $FileName | awk 'BEGIN {FS=":"} {print $2}'`
-        fi
-        if [[ $line =~ "Width" ]]
-        then
-            Width=`echo $line | awk 'BEGIN {FS=":"} {print $'${seperatorNum}'}'`
-        fi
-        if [[ $line =~ "Height" ]]
-        then
-            Height=`echo $line | awk 'BEGIN {FS=":"} {print $'${seperatorNum}'}'`
-        fi
-        if [[ $line =~ "Frames" ]]
-        then
-            Frames=`echo $line | awk 'BEGIN {FS=":"} {print $'${seperatorNum}'}'`
-        fi
-        if [[ $line =~ "FPS" ]]
-        then
-            FPS=`echo $line | awk 'BEGIN {FS=":"} {print $'${seperatorNum}'}'`
-            FPS=`echo $FPS | awk 'BEGIN {FS="fps"} {print $1}'`
-        echo "${FileName},"${Width}x${Height}",${Frames},${FPS}"
-        fi
-
-        if [[  $line =~ "encode time"  ]]
-                then
-                        EncodeTime=`echo $line | awk 'BEGIN {FS=":"} {print $'${seperatorNum}'}'`
-                fi
-        if [[ $line =~ "height" ]]
-        then
-            Height=`echo $line | awk 'BEGIN {FS=":"} {print $'${seperatorNum}'}'`
-        fi
-        if [[ $line =~ "H264 source file name" ]]
-        then
-            FileName=`echo $line | awk 'BEGIN {FS=":"} {print $'${seperatorNum}'}'`
-       if [ $1 = "ios" ]
-       then
-            FileName=`echo $FileName | awk -F"DecoderPerfTestRes" '{print $2}'`
-            FileName=`echo $FileName | awk -F"/" '{print $2}'`
-       else
-            FileName=`echo $FileName | awk -F"/" '{print $4}'`
-       fi
-      fi
-
-        done <${PerformanceLogFile}
-
-
-}
-AUTO_TEST_RESULT_PATH="./TestResultCSV/"
-
-
-parseLogToCSV()
-{
-if [ $# -ne 1 ]
-then echo "Please input $0 [android/ios]"
-fi
-if [ $* = "android" ]
-then
-     Result_log_path="./android/report/"
-     suffix=android
-     dos2unix ${Result_log_path}*.*
-else
-Result_log_path="./ios/report/"
-suffix=ios
-fi
-Result_log=`ls ${Result_log_path}`
-
-for log in ${Result_log}
-do
-  PerformFile=`echo $log |awk -F"." '{print $1}'`
-  PerformFile=${PerformFile}_${suffix}.csv
- #inital perfermance file
- echo "$log,,,">>${AUTO_TEST_RESULT_PATH}${PerformFile}
- echo "YUV,Resolution,Encodedframes,FPS">>${AUTO_TEST_RESULT_PATH}${PerformFile}
-  runGetPerformanceInfo_openh264 ${suffix} ${Result_log_path}${log}>>${AUTO_TEST_RESULT_PATH}${PerformFile}
-done
-}
-parseLogToCSV android
-parseLogToCSV ios

autotest/performanceTest/run_perfTest.sh

@@ -1,122 +0,0 @@
-#!bin/bash
-IOS=1
-ANDROID=1
-ENC=1
-DEC=1
-AUTO_TEST_PATH=`pwd`
-
-#Judge to run the test on which kind of mobile
-if [ $# -eq 0 ];then
-echo Default testing will run on android and ios devices meanwhile
-else
-for params in $*; do
-if [ $params = "ios" ];then
-  echo Running the test just on ios devices
-  ANDROID=0
-elif [ $params = "android" ];then
-  echo Running the test just on android devices
-  IOS=0
-elif [ $params = "enc" ];then
-  echo Running the encoder performance test
-  DEC=0
-elif [ $params = "dec" ];then
-  echo Running the decoder performance test
-  ENC=0
-else
-  echo parameters are illegal!!!, ${0} [ios/android] [enc/dec]
-  exit 1
-fi
-done
-fi
-
-#Prepare encoder resources
-if [ ${ENC} = "1" ]
-then
-if [ ! -d ./EncoderPerTestRes ]
-then
-mkdir -p ./EncoderPerfTestRes
-fi
-if [ "#`ls ./EncoderPerfTestRes`" = "#" ]
-then
-echo put yuv and cfg file into ./EncoderPerfTest folder as
-echo case_720p
-echo case_720p/welsenc.cfg
-echo case_720p/layer2.cfg
-echo case_720p/yuv
-echo case_720p/yuv/xxx1.yuv
-echo case_720p/yuv/xxx2.yuv
-echo case_360p
-echo case_360p/welsenc.cfg
-echo ......
-else
-#Run the encoder performance test
-if [ ${IOS} = "1" ]
-then
-echo xxxxxxxxxxxxxxxxIOS ENC Startxxxxxxxxxxxxxxxxxx
-echo Run the Encoder performance test on ios devices
-cd ./ios
-bash run_AutoTest_ios.sh enc
-cd ${AUTO_TEST_PATH}
-fi
-
-if [ ${ANDROID} = "1" ]
-then
-echo xxxxxxxxxxxxxxAndroid ENC Startxxxxxxxxxxxxxxxxxxxx
-echo Run the Encoder performance test on android devices
-cd ./android
-bash run_AutoTest_android.sh enc
-cd ${AUTO_TEST_PATH}
-fi
-fi
-fi
-
-#Prepare decoder resources
-if [ ${DEC} = "1" ]
-then
-if [ ! -d ./DecoderPerfTestRes ]
-then
-mkdir -p ./DecoderPerfTestRes
-fi
-
-if [ "#`ls ./DecoderPerfTestRes`" = "#" ]
-then
-echo put decoded bitstreams into such folder as
-echo xxx1.264
-echo xxx2.264
-echo ........
-else
-#Run the decoder performance test
-if [ ${IOS} = "1" ]
-then
-echo xxxxxxxxxxxxxxxxIOS DEC Startxxxxxxxxxxxxxxxxxx
-echo Run the Decoder performance test on ios devices
-cd ./ios
-bash run_AutoTest_ios.sh dec
-cd ${AUTO_TEST_PATH}
-fi
-
-if [ ${ANDROID} = "1" ]
-then
-echo xxxxxxxxxxxxxxAndroid DEC Startxxxxxxxxxxxxxxxxxxxx
-echo Run the Decoder performance test on android devices
-cd ./android
-bash run_AutoTest_android.sh dec
-cd ${AUTO_TEST_PATH}
-fi
-fi
-fi
-
-#TODO:NOW just generate csv file to display performance data
-cd ${AUTO_TEST_PATH}
-if [[ "#`ls ./ios/report`" == "#" && "#`ls ./android/report`" == "#" ]]
-then
-echo There is nothing result log generated at ios or android devices
-else
-echo Start to generate test result csv file
-#Test result
-mkdir -p ./TestResultCSV
-bash parsePerfData.sh
-echo The csv file locate ./TestResultCSV/xxx.csv
-fi
-
-

autotest/unitTest/.gitignore

@@ -1,4 +0,0 @@
-.DS_Store
-./ios/report/
-./android/report/
-

autotest/unitTest/android/run_AutoTest_android.sh

@@ -1,112 +0,0 @@
-#!/bin/bash
-
-AUTO_TEST_ANDROID_PATH=`pwd`
-AUTO_TEST_SRC_PATH="../../../"
-AUTO_TEST_RES_PATH="${AUTO_TEST_ANDROID_PATH}/report"
-if [ ! -d ${AUTO_TEST_RES_PATH} ]
-then
-mkdir -p ${AUTO_TEST_RES_PATH}
-else
-echo "Will delete those outdate xml in the report"
-rm -f ${AUTO_TEST_RES_PATH}/*.xml
-fi
-#Prepare android build enviroment
-echo please set the enviroment variable as:
-echo export ANDROID_HOME="path of android sdk"
-echo export ANDROID_NDK_HOME="path of android ndk"
-ANDROID_SDK_PATH=${ANDROID_HOME}
-ANDROID_NDK_PATH=${ANDROID_NDK_HOME}
-ANDROID_MAKE_PARAMS="OS=android NDKROOT=${ANDROID_NDK_PATH} TARGET=android-19"
-
-if [ "#${ANDROID_SDK_PATH}" = "#" ]
-then
-echo Please set ANDROID_HOME with the path of Android SDK
-exit 1
-fi
-if [ "#${ANDROID_NDK_PATH}" = "#" ]
-then
-echo Please set ANDROID_NDK_HOME with the path of Android NDK
-exit 1
-fi
-#make build
-cd ${AUTO_TEST_SRC_PATH}
-find ./ -name *.o -exec rm -f {} \;
-find ./ -name *.d -exec rm -f {} \;
-make clean
-make $ANDROID_MAKE_PARAMS test
-
-if [ $? -ne 0 ]
-then
-   echo Build error,check with the trace of make
-   exit 1
-fi
-
-#find apk
-echo Start to find unittest apk
-apk_name=`find ./ -name MainActivity-debug.apk`
-if [ "#${apk_name}" = "#" ]
-then
-  echo Fail to find encoder APK.
-  exit 1
-fi
-
-#prepare devices
-ADB=${ANDROID_SDK_PATH}/platform-tools/adb
-
-#get devices
-devices=`$ADB devices | awk -F" " '/\tdevice/{print $1}'`
-if [ "#$devices" = "#" ];then
-   echo "Have not any android devices."
-   exit 1
-fi
-
-#run apk
-run_apk() {
-local apk=$1;
-local rand=` date +%s`
-apk_id="com.cisco.codec.unittest"
-apk_main="com.cisco.codec.unittest/.MainActivity"
-test_path="/sdcard/welsenc"
-log_grep_params="welsenc"
-test_res=./res
-xml_file="sdcard/codec_unittest.xml"
-for dev in $devices; do
-    #dev_info_file=${AUTO_TEST_RES_PATH}/${dev}.log
-    report_file=${AUTO_TEST_RES_PATH}/codec_unittest_${dev}_${rand}.xml
-    $ADB -s $dev uninstall ${apk_id}
-    $ADB -s $dev install -r ${apk}
-    #TODO: output more info about android device such as name,cpu,memory,and also power comsumption.
-    echo `$ADB -s $dev shell cat /system/build.prop |grep ro.product.model | awk -F"=" '{print $2}'`>${dev_info_file}
-    $ADB -s $dev push ${test_res} /sdcard/res
-    $ADB -s $dev shell am start --es path "$xml_file" -n ${apk_main}
-    # check whetehr the app is finished every 2 sec
-    for (( ; ; )); do
-        $ADB -s $dev shell ps | grep ${apk_id}
-        if [ $? -ne 0 ]; then
-            sleep 2
-            $ADB -s $dev shell ps | grep ${apk_id}
-            [ $? -ne 0 ] && break
-        fi
-        sleep 2
-    done
-
-    # kill logcat
-    $ADB -s $dev pull ${xml_file} ${report_file}
-    #delete the res
-    $ADB -s $dev shell rm -rf ${xml_file}
-    $ADB -s $dev shell rm -rf /sdcard/res
-done
-}
-for apk in ${apk_name};do
-   run_apk $apk;
-   if [ $? -ne 0 ]
-   then
-     echo There is something wrong happened when run ${apk_name}
-     exit 1
-   else
-     echo Finished unit test on android
-     echo The test result is at ./android/report/xxx.xml
-     echo xxxxxxxxxxxxxxxAndroid unittest Endxxxxxxxxxxxxxxxx
-   fi
-done
-

autotest/unitTest/ios/run_AutoTest_ios.sh

@@ -1,167 +0,0 @@
-#!/bin/bash
-
-##############################################################
-#Build ios test ref app
-
-#set the default configuration
-CODEC_TEST_IOS_ARCH="armv7"
-CODEC_TEST_IOS_PLATFORM="iphoneos"
-CODEC_TEST_IOS_DEBUG_RELEASE="Release"
-CODEC_TEST_IOS_REPORT_SUBFOLDER="release"
-
-
-buildXcodeProject()
-{
- xcodebuild ARCHS="${CODEC_TEST_IOS_ARCH}" VALID_ARCHS="${CODEC_TEST_IOS_ARCH}" ONLY_ACTIVE_ARCH=NO -project $1 -target $2 -configuration $3 -sdk ${CODEC_TEST_IOS_PLATFORM} clean build
-
-if [ $? -eq 0 ]; then
- echo "build $1 $3 successfully"
- else
- echo "build $1 $3  fail"
- exit 1
- fi
-}
-
-
-
-iosUnitTest()
-{
-
-if [ $# -gt 2 ]; then
-echo "Please use command $0 [armv7/armv7s/arm64] [release/debug]"
-exit 1
-fi
-
-     CODEC_TEST_XCODE_PROJECT_NAME="${AUTO_TEST_SRC_PATH}/test/build/ios/codec_unittest/codec_unittest.xcodeproj/"
-     CODEC_TEST_IOS_PROJECT_NAME="codec_unittest"
-     CODEC_TEST_IOS_PROJECT_PATH="${AUTO_TEST_SRC_PATH}/test/build/ios/codec_unittest/build"
-     CODEC_TEST_IOS_APP=${CODEC_TEST_IOS_PROJECT_PATH}/${CODEC_TEST_IOS_DEBUG_RELEASE}-iphoneos/${CODEC_TEST_IOS_PROJECT_NAME}.app
-     CODEC_TEST_IOS_APP_ID="com.cisco.codec-unittest"
-     CODEC_TEST_RES=${AUTO_TEST_SRC_PATH}/res
-     CODEC_TEST_LOG="codec_unittest"
-for PARAM in $*; do
-   if [ "release" = "${PARAM}" ]; then
-     CODEC_TEST_IOS_DEBUG_RELEASE="Release"
-     CODEC_TEST_IOS_REPORT_SUBFOLDER="release"
- elif [ "debug" = "${PARAM}" ]; then
-     CODEC_TEST_IOS_DEBUG_RELEASE="Debug"
-     CODEC_TEST_IOS_REPORT_SUBFOLDER="debug"
- elif [ "armv7" = "${PARAM}" ];then
-      CODEC_TEST_IOS_ARCH="armv7"
- elif [ "armv7s" = "${PARAM}" ];then
-     CODEC_TEST_IOS_ARCH="armv7s"
- elif [ "arm64" = "${PARAM}" ];then
-    CODEC_TEST_IOS_ARCH="arm64"
- else
-    echo parameters are illegal!!!, please have a check.
-    exit 1
- fi
- done
-cd ${AUTO_TEST_SRC_PATH}
-IOS_MAKE_PARAMS="OS=ios ARCH=${CODEC_TEST_IOS_ARCH}"
-############make build
-find ./ -name *.o -exec rm -rf {} \;
-find ./ -name *.d -exec rm -rf {} \;
-rm -f *.so
-make clean
-make ${IOS_MAKE_PARAMS} test
-echo "Codec test will run on ${CODEC_TEST_IOS_PLATFORM} with ${CODEC_TEST_IOS_DEBUG_RELEASE}"
-cd ${AUTO_TEST_IOS_PATH}
-buildXcodeProject ${CODEC_TEST_XCODE_PROJECT_NAME} ${CODEC_TEST_IOS_PROJECT_NAME} ${CODEC_TEST_IOS_DEBUG_RELEASE} ${CODEC_TEST_IOS_PLATFORM}
-
-
-
-
-##############run on ios devices#########################
-# for real device
-if [ ! -d ${CODEC_TEST_IOS_APP} ] ; then
-echo "${CODEC_TEST_IOS_APP} is not found"
-exit 1
-else
-echo "Find app ${CODEC_TEST_IOS_APP}"
-fi
-
- #ensure instruments not runing
-echo "Try to kill the runing instruments"
-pids_str=`ps x -o pid,command | grep -v grep | grep "instruments" | awk '{printf "%s,", $1}'`
-instruments_pids="${pids_str//,/ }"
-for pid in ${instruments_pids}; do
-echo "Found instruments ${pid}. Killing..."
-kill -9 ${pid} && wait ${pid} &> /dev/null
-done
-
-
-
-DEVICES=`system_profiler SPUSBDataType | sed -n -e '/iPad/,/Serial/p' -e '/iPhone/,/Serial/p' | grep "Serial Number:" | awk -F ": " '{print $2}'`
-if [ "${DEVICES}#" == "#" ]
-then
-echo "Can not find any connected device! please check device is connected to MAC!"
-exit 1
-else
-rand=`date +%s`
-for DEVICE_ID in ${DEVICES}
-do
-echo "Try to run on device:${DEVICE_ID}"
-
-#uninstall the application from device to remove the last result
-${AUTO_TEST_IOS_SCRIPT_PATH}/fruitstrap uninstall --bundle ${CODEC_TEST_IOS_APP_ID} --id ${DEVICE_ID}
-if [ $? -ne 0 ]; then
-echo uninstall application: ${CODEC_TEST_IOS_APP} from device: ${DEVICE_ID} is failed!
-fi
-#install the application
-${AUTO_TEST_IOS_SCRIPT_PATH}/fruitstrap install --bundle ${CODEC_TEST_IOS_APP} --id ${DEVICE_ID}
-if [ $? -ne 0 ]; then
-echo install application: ${CODEC_TEST_IOS_APP} to device: ${DEVICE_ID} is failed!
-exit 1
-fi
-
-${AUTO_TEST_IOS_SCRIPT_PATH}/iFileTransfer -o copy -id ${DEVICE_ID} -app ${CODEC_TEST_IOS_APP_ID} -from ${CODEC_TEST_RES}
-instruments -w ${DEVICE_ID}  -t /Applications/Xcode.app/Contents/Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate ${CODEC_TEST_IOS_APP} -e UIASCRIPT ${AUTO_TEST_IOS_SCRIPT_PATH}/uiascript.js -e UIARRESULTPATH /tmp/
-#copy to report folder
-${AUTO_TEST_IOS_SCRIPT_PATH}/iFileTransfer -o download -id ${DEVICE_ID} -app ${CODEC_TEST_IOS_APP_ID} -from /Documents/${CODEC_TEST_LOG}.xml -to ${CODEC_TEST_IOS_REPORT_PATH}/${CODEC_TEST_LOG}_${DEVICE_ID}_${rand}_${CODEC_TEST_IOS_ARCH}.xml
-if [ $? -ne 0 ]; then
-echo "download file: ${CODEC_TEST_LOG}.xml from ${CODEC_TEST_IOS_APP_ID} is failed!"
-exit 1
-fi
-
-done
-fi
-}
-
-AUTO_TEST_IOS_PATH=`pwd`
-AUTO_TEST_SRC_PATH="../../.."
-AUTO_TEST_IOS_SCRIPT_PATH="../../performanceTest/ios"
-CODEC_TEST_IOS_REPORT_PATH="${AUTO_TEST_IOS_PATH}/report"
-if [ ! -d ${CODEC_TEST_IOS_REPORT_PATH} ]
-then
- mkdir -p ${CODEC_TEST_IOS_REPORT_PATH}
-else
- echo "Will delete those outdate xml in the report"
- rm -f ${CODEC_TEST_IOS_REPORT_PATH}/*.xml
-fi
-
-#start to run unittest,default run the xcode at arch armv7 with release
-iosUnitTest armv7 release
-
-if [ $? -ne 0 ]; then
-echo "Running Unittest demo with armv7 is failed!"
-exit 1
-else
-echo Finished unittest with armv7 on ios devices
-echo the test result is generated at ./ios/report/xx.xml
-fi
-#start to run unittest,run the xcode at arch arm64 with release
-iosUnitTest arm64 release
-if [ $? -ne 0 ]; then
-echo "Running Unittest demo with arm64 is failed!"
-exit 1
-else
-echo Finished unittest with arm64 on ios devices
-echo the test result is generated at ./ios/report/xx.xml
-fi
-
-echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxIOS unittest  Endxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-#TODO:according to the trace of instruments to do some analysis
-#find ${AUTO_TEST_IOS_SCRIPT_PATH} -name *.trace -exec rm -rf {} \;
-rm -rf *.trace

autotest/unitTest/run_ParseUTxml.sh

@@ -1,70 +0,0 @@
-if [ $# -ne 1 ];then
-    echo Please input $0 [report dir]
-    exit 1
-fi
-
-REPORT=$1
-if [ ! -e ${REPORT} ];then
-    echo "The directory of ${REPORT} dose't not exit,please check the test log"
-    exit 1
-fi
-
-UT_Failed_Num=0
-parse_unittest() {
-    res=$1
-    echo ${res}
-    echo Start to parse unittest results of $res
-    if [ -e $res ];then
-    tests=`cat $res | grep "<testsuites" | awk -F " " '{print $2;}' | awk -F "\"" '{print $2;}'`
-    fails=`cat $res | grep "<testsuites" | awk -F " " '{print $3;}' | awk -F "\"" '{print $2;}'`
-    times=`cat $res | grep "<testsuites" | awk -F " " '{print $6;}' | awk -F "\"" '{print $2;}'`
-    waste=`cat $res | grep "<testsuites" | awk -F " " '{print $7;}' | awk -F "\"" '{print $2;}'`
-    msg="Total testcases: $tests, failed: $fails,time:$waste seconds, at$times,xml:$res"
-    echo ${msg}
-    UT_Failed_Num=$((${UT_Failed_Num}+${fails}))
-cat >> mail.log << EOF
-<style>
-.fail {
-    background-color: yellow;
-}
-</style>
-<br>
-   <table  style="width:600px" cellspacing="0" border="1" width="100%">
-    <thead>
-    <tr>
-        <td>Total unit test cases</td>
-        <td>Failed</td>
-        <td>Time</td>
-        <td>Date</td>
-    </tr>
-    </thead>
-       <tbody>
-        <tr style="text-align:center; font-weight: bold;">
-            <td>${tests}</td>
-            <td><font class="fail">${fails}</font></td>
-            <td>${waste}</td>
-            <td>${times}</td>
-        </tr>
-    </tbody>
-    </table>
-<br>
-EOF
-   fi
-}
-
-xmlcount=`ls $REPORT | wc -l`
-xmlfiles=`ls $REPORT`
-if [ ${xmlcount} -eq 0 ];
-then echo There is nothing xml files generated at $REPORT
-    exit 1
-fi
-for file in $xmlfiles;do
-   parse_unittest $REPORT/$file
-done
-if [ ${UT_Failed_Num} = "0" ];then
-echo Total $xmlcount files at $REPORT,all sucessful
-exit 0
-else
-echo Total $xmlcount files at $REPORT,${UT_Failed_Num} error cases
-exit 2
-fi

autotest/unitTest/run_unitTest.sh

@@ -1,98 +0,0 @@
-#!/bin/bash
-
-AUTO_TEST_PATH=`pwd`
-IOS=0
-ANDROID=0
-#Prepare GTEST
-AUTO_TEST_SRC_PATH="../../"
-cd ${AUTO_TEST_SRC_PATH}
-if [ ! -d "./gtest" ]
-then
-   make gtest-bootstrap
-fi
-cd ${AUTO_TEST_PATH}
-#To find whether have android devices
-echo please set the enviroment variable as:
-echo export ANDROID_HOME="path of android sdk"
-echo export ANDROID_NDK_HOME="path of android ndk"
-ANDROID_SDK_PATH=${ANDROID_HOME}
-ANDROID_NDK_PATH=${ANDROID_NDK_HOME}
-if [ "#${ANDROID_SDK_PATH}" = "#" ]
-then
-echo Please set ANDROID_HOME with the path of Android SDK
-exit 1
-fi
-if [ "#${ANDROID_NDK_PATH}" = "#" ]
-then
-echo Please set ANDROID_NDK_HOME with the path of Android NDK
-exit 1
-fi
-#prepare devices
-ADB=${ANDROID_SDK_PATH}/platform-tools/adb
-
-#get devices
-devices=`$ADB devices | awk -F" " '/\tdevice/{print $1}'`
-if [ "#$devices" = "#" ];then
-   echo "Can not find any android devices!"
-else
-   echo Start to run the unittest on android devices
-   ANDROID=1
-   cd ./android
-   bash run_AutoTest_android.sh >/dev/null 2>&1
-   if [ $? -ne 0 ];then
-   echo There is something wrong happened when runing unittest on android devices,please to check
-   else
-   echo Finish run the unittest on android devices sucessfully
-   fi
-   cd ${AUTO_TEST_PATH}
-fi
-
-#To find whether have ios devices
- DEVICES=`system_profiler SPUSBDataType | sed -n -e '/iPad/,/Serial/p' -e '/iPhone/,/Serial/p' | grep "Serial Number:" | awk -F ": " '{print $2}'`
- if [ "${DEVICES}#" == "#" ]
- then
- echo "Can not find any ios devices!"
-else
-  echo Start to run the unittest on ios devices
-  IOS=1
-  cd ./ios
-  bash run_AutoTest_ios.sh >/dev/null 2>&1
- if [ $? -ne 0 ];then
- echo There is something wrong happened when runing unittest on ios devices,please to check
- else
- echo Finish run the unittest on android devices sucessfully
-fi
- cd ${AUTO_TEST_PATH}
-fi
-
-#To parse the unit test result file to find whether have failures
-if [ ${ANDROID} = "1" ];then
-echo "
-<style>
-.env {
-    background-color: #95B9C7;
-    font: 30px bold;
-}</style>">>mail.log
-echo "<br><font class="env">Run unit test on android devices</font>">>mail.log
-bash run_ParseUTxml.sh ./android/report
-ret=$?
-if [ ${ret} -eq 0 ];then
-echo Unit test run on the android devices have not any failure case
-elif [ ${ret} -eq 2 ];then
-echo Unit test have cases failed,please check
-elif [ ${ret} -eq 1 ];then
-echo Unit test run failed
-fi
-fi
-if [ ${IOS} = "1" ];then
-echo "<br><font class="env">Run unit test on ios devices with armv7 & arm64</font>">>mail.log
-bash run_ParseUTxml.sh ./ios/report
-ret=$?
-if [ $ret -eq 0 ];then
-echo Unit test run on the ios devices have not any failure case
-elif [ $ret -eq 2 ];then
-echo Unit test have cases failed,please check
-elif [ $ret -eq 1 ];then
-echo Unit test run failed
-fi
-fi

build/AutoBuildForWPAndWindows.bat

@@ -1,439 +0,0 @@
-@echo off
-rem *************************************************************************************************
-rem   usage:
-rem      AutoBuildForWPAndWindows.bat % Configuration %
-rem      --For debug  version:
-rem          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-Debug-C
-rem          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-Debug-ASM
-rem          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-Debug-C
-rem          Win64-ASM:         AutoBuildForWPAndWindows.bat  Win64-Debug-ASM
-rem          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-Debug-C
-rem          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-Debug-ASM
-rem      --For release version:
-rem          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-Release-C
-rem          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-Release-ASM
-rem          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-Release-C
-rem          Win64-ASM(WP8):    AutoBuildForWPAndWindows.bat  Win64-Release-ASM
-rem          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-Release-C
-rem          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-Release-ASM
-rem      --For debug and release version:
-rem          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-All-C
-rem          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-All-ASM
-rem          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-All-C
-rem          Win64-ASM:         AutoBuildForWPAndWindows.bat  Win64-All-ASM
-rem          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-All-C
-rem          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-All-ASM
-rem      --For default:
-rem         AutoBuildForWPAndWindows.bat
-rem           ARM-All-ASM(WP8)
-rem
-rem      --lib/dll files will be copied to folder .\bin
-rem         --win32 folder bin\i386*
-rem         --win64 folder bin\x86_64*
-rem         --arm   folder bin\arm*
-rem
-rem   Environment:
-rem        ----for windows phone, Visual studio with update 3 or later is needed
-rem        ----gas-preprocessor(windows phone build only)
-rem           --you can clone it from git://git.libav.org/gas-preprocessor.git
-rem           --for more detail, please refer to https://git.libav.org/?p=gas-preprocessor.git
-rem           -- and then set gas-preprocessor path to the %GasScriptPath% variable in this script
-rem             or just copy to VC2013 bin's path,you can refer to variable %VC12Path%
-rem
-rem        ----MinGW
-rem           --install MinGW tools
-rem           --more detail, please refer to http://www.mingw.org/
-rem
-rem   2015/03/15 huashi@cisco.com
-rem *************************************************************************************************
-
-set WP8Flag=0
-call :BasicSetting
-call :PathSetting
-call :SetBuildOption %1
-if not %ERRORLEVEL%==0 (
-    echo not suppot option!
-    goto :ErrorReturn
-)
-call :EnvSetting     %1
-call :BuildResultInit
-call :RunBuild
-call :OutputBuildResult
-call :GetFinalReturnCode
-echo  ReturnCode is %ReturnCode%
-cd %WorkingDir%
-goto :End
-
-:RunBuild
-    for %%j in ( %aConfigurationList% ) do  (
-        set BuildFlag=0
-        call :Build       %%j
-        call :BuildCheck  %%j
-        call :CopyDll     %%j
-  )
-goto :EOF
-
-
-rem function for setting
-rem ***********************************************
-:BasicSetting
-  set DllFile=openh264.dll
-  set LibFile=openh264.lib
-  set PDBFile=openh264.pdb
-  set UTDllFile=ut.dll
-  set UTBinFile=codec_unittest.exe
-  set EncBinFile=h264enc.exe
-  set DecBinFile=h264dec.exe
-goto :EOF
-
-:PathSetting
-  set WorkingDir=%cd%
-  cd ..
-  set RootDir=%cd%
-  set BinDir=%RootDir%\bin
-  cd %WorkingDir%
-goto :EOF
-
-:EnvSetting
-  set MinGWPath=C:\MinGW\bin
-  set MsysPath=C:\MinGW\msys\1.0\bin
-  set GitPath=C:\Program Files (x86)\Git\bin
-
-  set VC14Path=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-  set VC12Path=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC
-  set VC11Path=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC
-  set VC10Path=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC
-  set VC9Path=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC
-
-  set VC12ArmLib01=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib\store\arm
-  set VC12ArmLib02=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib\arm
-  set WP8KitLib=C:\Program Files (x86)\Windows Phone Kits\8.1\lib\arm
-
-  if exist "%VC9Path%"     set VCPATH=%VC9Path%
-  if exist "%VC10Path%"    set VCPATH=%VC10Path%
-  if exist "%VC11Path%"    set VCPATH=%VC11Path%
-  if exist "%VC12Path%"    set VCPATH=%VC12Path%
-  if exist "%VC14Path%"    set VCPATH=%VC14Path%
-  if %WP8Flag%==1          set VCPATH=%VC12Path%
-
-  set GasScriptPath=%VCPATH%\bin
-
-  if "%vArcType%" =="i386"   set PATH=%MinGWPath%;%MsysPath%;%VCPATH%\bin;%GitPath%;%PATH%
-  if "%vArcType%" =="x86_64" set PATH=%MinGWPath%;%MsysPath%;%VCPATH%\bin;%GitPath%;%PATH%
-  if "%vArcType%" =="arm"    set PATH=%MinGWPath%;%MsysPath%;%VCPATH%\bin;%GitPath%;%PATH%
-  rem if "%vArcType%" =="arm"    set PATH=C:\MinGW\bin;C:\MinGW\msys\1.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin;C:\Program Files (x86)\Git\bin;%PATH%
-
-  if "%vArcType%" =="i386"   call "%VCPATH%\vcvarsall.bat" x86
-  if "%vArcType%" =="x86_64" call "%VCPATH%\vcvarsall.bat" x64
-  if "%vArcType%" =="arm"    call "%VCPATH%\vcvarsall.bat" x86_arm
-  if %WP8Flag%==1            call :WPSetting
-
-  echo PATH is %PATH%
-  echo LIB  is %LIB%
-goto :EOF
-
-:WPSetting
-  set LIB=%VC12ArmLib01%;%VC12ArmLib02%;%WP8KitLib%
-  echo LIB setting for wp8 is:
-  echo   %LIB%
-  if  not exist "%VC12Path%" (
-      echo    VC12 does not exist,
-      echo ******************************************
-      echo    VC12 does not exist,
-      echo    which is needed for windows phone
-      echo ******************************************
-      goto :ErrorReturn
-    )
-goto :EOF
-
-:SetBuildOption
-  if "aaa%1"=="aaa" (
-      set aConfigurationList=Debug Release
-      set vArcType=arm
-      set vOSType=msvc-wp
-      set vEnable64BitFlag=No
-      set vASMFlag=Yes
-      set WP8Flag=1
-      echo default setting
-  ) else if "%1"=="Win32-Debug-C" (
-      set aConfigurationList=Debug
-      set vArcType=i386
-      set vOSType=msvc
-      set vEnable64BitFlag=No
-      set vASMFlag=No
-      echo Win32-Debug-C setting
-  )  else if "%1"=="Win32-Release-C" (
-      set aConfigurationList=Release
-      set vArcType=i386
-      set vOSType=msvc
-      set vEnable64BitFlag=No
-      set vASMFlag=No
-      echo Win32-Release-C setting
-  )  else if "%1"=="Win64-Debug-C" (
-      set aConfigurationList=Debug
-      set vArcType=x86_64
-      set vOSType=msvc
-      set vEnable64BitFlag=Yes
-      set vASMFlag=No
-      echo All-C setting
-  )  else if "%1"=="Win64-Release-C" (
-      set aConfigurationList=Release
-      set vArcType=x86_64
-      set vOSType=msvc
-      set vEnable64BitFlag=Yes
-      set vASMFlag=No
-      echo Win64-Release-C setting
-  )  else if "%1"=="ARM-Debug-C" (
-      set aConfigurationList=Debug
-      set vArcType=arm
-      set vOSType=msvc-wp
-      set vEnable64BitFlag=No
-      set vASMFlag=No
-      set WP8Flag=1
-      echo ARM-Debug-C setting
-  )  else if "%1"=="ARM-Release-C" (
-      set aConfigurationList=Debug Release
-      set vArcType=arm
-      set vOSType=msvc-wp
-      set vEnable64BitFlag=No
-      set vASMFlag=No
-      set WP8Flag=1
-      echo ARM-Release-C setting
-  )   else if "%1"=="Win32-All-C" (
-      set aConfigurationList=Debug Release
-      set vArcType=i386
-      set vOSType=msvc
-      set vEnable64BitFlag=No
-      set vASMFlag=No
-      echo Win32-All-C setting
-  )  else if "%1"=="Win64-All-C" (
-      set aConfigurationList=Debug Release
-      set vArcType=x86_64
-      set vOSType=msvc
-      set vEnable64BitFlag=Yes
-      set vASMFlag=No
-      echo All-C setting
-  )  else if "%1"=="ARM-All-C" (
-      set aConfigurationList=Debug Release
-      set vArcType=arm
-      set vOSType=msvc-wp
-      set vEnable64BitFlag=No
-      set vASMFlag=No
-      set WP8Flag=1
-    echo ARM-All-C setting
-  )  else if "%1"=="Win32-Debug-ASM" (
-      set aConfigurationList=Debug
-      set vArcType=i386
-      set vOSType=msvc
-      set vEnable64BitFlag=No
-      set vASMFlag=Yes
-      echo Win32-Debug-ASM setting
-  )  else if "%1"=="Win32-Release-ASM" (
-      set aConfigurationList=Release
-      set vArcType=i386
-      set vOSType=msvc
-      set vEnable64BitFlag=No
-      set vASMFlag=Yes
-      echo Win32-Release-ASM setting
-  )  else if "%1"=="Win64-Debug-ASM" (
-      set aConfigurationList=Debug
-      set vArcType=x86_64
-      set vOSType=msvc
-      set vEnable64BitFlag=Yes
-      set vASMFlag=Yes
-      echo All-ASM setting
-  )  else if "%1"=="Win64-Release-ASM" (
-      set aConfigurationList=Release
-      set vArcType=x86_64
-      set vOSType=msvc
-      set vEnable64BitFlag=Yes
-      set vASMFlag=Yes
-      echo Win64-Release-ASM setting
-  )  else if "%1"=="ARM-Debug-ASM" (
-      set aConfigurationList=Debug
-      set vArcType=arm
-      set vOSType=msvc-wp
-      set vEnable64BitFlag=No
-      set vASMFlag=Yes
-      set WP8Flag=1
-      echo ARM-Debug-ASM setting
-  )  else if "%1"=="ARM-Release-ASM" (
-      set aConfigurationList=Release
-      set vArcType=arm
-      set vOSType=msvc-wp
-      set vEnable64BitFlag=No
-      set vASMFlag=Yes
-      set WP8Flag=1
-      echo ARM-Release-ASM setting
-  )   else if "%1"=="Win32-All-ASM" (
-      set aConfigurationList=Debug Release
-      set vArcType=i386
-      set vOSType=msvc
-      set vEnable64BitFlag=No
-      set vASMFlag=Yes
-      echo Win32-All-ASM setting
-  )  else if "%1"=="Win64-All-ASM" (
-      set aConfigurationList=Debug Release
-      set vArcType=x86_64
-      set vOSType=msvc
-      set vEnable64BitFlag=Yes
-      set vASMFlag=Yes
-      echo All-ASM setting
-  )  else if "%1"=="ARM-All-ASM" (
-      set aConfigurationList=Debug Release
-      set vArcType=arm
-      set vOSType=msvc-wp
-      set vEnable64BitFlag=No
-      set vASMFlag=Yes
-      set WP8Flag=1
-      echo ARM-All-ASM setting
-  )  else (
-      call :help
-      goto :ErrorReturn
-  )
-  echo aConfigurationList is %aConfigurationList%
-  echo vArcType is           %vArcType%
-  echo vOSType  is           %vOSType%
-  echo vEnable64BitFlag is   %vEnable64BitFlag%
-  echo vASMFlag is           %vASMFlag%
-goto :EOF
-
-rem function for build result
-rem ***********************************************
-:BuildResultInit
-  set BuildDebugFlag=0
-  set BuildReleaseFlag=0
-  set BuildDebugInfo=NULL
-  set BuildReleaseInfo=NULL
-goto :EOF
-
-:OutputBuildResult
-  echo  BuildDebugFlag   =%BuildDebugFlag%
-  echo  BuildReleaseFlag =%BuildReleaseFlag%
-  echo  BuildDebugInfo   =%BuildDebugInfo%
-  echo  BuildReleaseInfo =%BuildReleaseInfo%
-  goto :EOF
-
-:BuildCheck
-  set vConfiguration=%1
-  if not %BuildFlag%==0 (
-    if "%vConfiguration%"=="Debug" (
-      set BuildDebugFlag=1
-      set BuildDebugInfo="build debug--failed"
-    ) else (
-      set BuildReleaseFlag=1
-      set BuildReleaseInfo="build release--failed"
-    )
-  ) else (
-    if "%vConfiguration%"=="Debug" (
-      set BuildDebugFlag=0
-      set BuildDebugInfo="build debug--succeed"
-    ) else (
-      set BuildReleaseFlag=0
-      set BuildReleaseInfo="build release--succeed"
-    )
-  )
-goto :EOF
-
-:GetFinalReturnCode
-  set aBuildFlagList=%BuildDebugFlag%  %BuildReleaseFlag%
-  echo  aBuildFlagList is %aBuildFlagList%
-  set ReturnCode=0
-  for %%k in (%aBuildFlagList%) do  (
-    if not %%k == 0 (
-      set ReturnCode=1
-    )
-  )
-goto :EOF
-
-rem function for help
-rem ***********************************************
-:help
-  echo *******************************************************************************
-  echo   usage:
-  echo      AutoBuildForWPAndWindows.bat % Configuration %
-  echo      --For debug  version:
-  echo          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-Debug-C
-  echo          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-Debug-ASM
-  echo          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-Debug-C
-  echo          Win64-ASM:         AutoBuildForWPAndWindows.bat  Win64-Debug-ASM
-  echo          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-Debug-C
-  echo          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-Debug-ASM
-  echo      --For release version:
-  echo          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-Release-C
-  echo          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-Release-ASM
-  echo          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-Release-C
-  echo          Win64-ASM:         AutoBuildForWPAndWindows.bat  Win64-Release-ASM
-  echo          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-Release-C
-  echo          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-Release-ASM
-  echo      --For debug and release version:
-  echo          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-All-C
-  echo          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-All-ASM
-  echo          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-All-C
-  echo          Win64-ASM:         AutoBuildForWPAndWindows.bat  Win64-All-ASM
-  echo          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-All-C
-  echo          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-All-ASM
-  echo      --For default:
-  echo         AutoBuildForWPAndWindows.bat
-  echo           ARM-All-ASM(WP8)
-  echo *******************************************************************************
-goto :EOF
-
-rem function for build
-rem ***********************************************
-:Build
-  set vConfiguration=%1
-  cd  %RootDir%
-  echo bash -c "make OS=%vOSType%  ARCH=%vArcType% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration% clean"
-  echo bash -c "make OS=%vOSType%  ARCH=%vArcType% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration%"
-  bash -c "make OS=%vOSType%  ARCH=%vArcType% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration% clean"
-  bash -c "make OS=%vOSType%  ARCH=%vArcType% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration%"
-  if not %ERRORLEVEL%==0 (
-    set BuildFlag=1
-  )
-  cd %WorkingDir%
-goto :EOF
-
-:CopyDll
-  set vConfiguration=%1
-  set vBuildOption=%2
-  cd %RootDir%
-  if "%vArcType%"=="arm" (
-    set vBinDirName=ARM
-  ) else if "%vArcType%"=="i386" (
-    set vBinDirName=Win32
-  ) else (
-    set vBinDirName=x64
-  )
-  set ArchDestDir=%BinDir%\%vBinDirName%
-  set FullDestDir=%BinDir%\%vBinDirName%\%vConfiguration%
-  echo copying dll files to destination folder...
-  echo FullDestDir is %FullDestDir%
-  if not exist %ArchDestDir% md %ArchDestDir%
-  if exist %FullDestDir% (
-    rd /s /q %FullDestDir%
-  )
-  md %FullDestDir%
-
-  echo current dir is:
-  cd
-  set DestDir=bin/%vBinDirName%/%vConfiguration%
-  echo DestDir is %DestDir%
-  if "%vOSType%"=="msvc-wp" (
-     set aFileList=%DllFile% %LibFile% %PDBFile% %UTDllFile%
-  ) else (
-     set aFileList=%DllFile% %LibFile% %PDBFile% %UTBinFile% %EncBinFile% %DecBinFile%
-  )
-  for %%k in (%aFileList%) do (
-    bash -c "cp -f  %%k  %DestDir%"
-  )
-  cd %WorkingDir%
-goto :EOF
-
-:ErrorReturn
-  endlocal
-exit /b 2
-
-:End
-  endlocal
-exit /b %ReturnCode%

build/Dockerfile

@@ -1,51 +0,0 @@
-# This is a docker image with all the tools to build openh264 for linux 
-
-# build the docker image with: sudo docker build -t openh264tools - < Dockerfile 
-# get the result with: sudo docker run -t -i -v /tmp/openH264:/build openh264tools /bin/cp libopenh264.so log /build
-# the results will be left in /tmp/openH264
-# have a look at log file and if the hash match the "Fluffy got" hashes
-
-FROM ubuntu:14.04
-MAINTAINER Cullen Jennings <fluffy@cisco.com>
-RUN apt-get update
-RUN apt-get upgrade -y
-RUN apt-get install -y bison flex g++ gcc git libgmp3-dev libmpc-dev libmpfr-dev libz-dev make wget
-
-WORKDIR /tmp
-RUN wget http://ftp.gnu.org/gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.gz
-RUN tar xvfz gcc-4.9.2.tar.gz
-WORKDIR /tmp/gcc-4.9.2/
-RUN mkdir build 
-WORKDIR /tmp/gcc-4.9.2/build
-RUN ../configure --disable-checking --enable-languages=c,c++ --enable-multiarch --enable-shared --enable-threads=posix  --with-gmp=/usr/local/lib --with-mpc=/usr/lib --with-mpfr=/usr/lib --without-included-gettext --with-system-zlib --with-tune=generic --disable-multilib --disable-nls
-RUN make -j 8 
-RUN make install 
-
-WORKDIR	 /tmp
-RUN wget http://www.nasm.us/pub/nasm/releasebuilds/2.11.06/nasm-2.11.06.tar.gz
-RUN tar xvfz nasm-2.11.06.tar.gz 
-WORKDIR /tmp/nasm-2.11.06/
-RUN ./configure
-RUN make
-RUN make install 
-
-WORKDIR /tmp
-RUN git clone https://github.com/cisco/openh264.git
-WORKDIR /tmp/openh264
-RUN git checkout v1.1
-RUN make ENABLE64BIT=Yes
-
-RUN date > log 
-RUN uname -a >> log 
-RUN nasm -v >> log 
-RUN gcc -v 2>> log
-RUN git status -v >> log
-
-RUN openssl dgst -sha1 libopenh264.so >> log
-RUN echo "Fluffy Got hash of  - 3b6280fce36111ab9c911453f4ee1fd99ce6f841" >> log
-
-
-
-
-
-

build/arch.mk

@@ -1,31 +0,0 @@
-#for x86
-HAVE_AVX2 := true
-
-ifneq ($(filter %86 x86_64, $(ARCH)),)
-include $(SRC_PATH)build/x86-common.mk
-ifeq ($(USE_ASM), Yes)
-ifeq ($(HAVE_AVX2), true)
-CFLAGS += -DHAVE_AVX2
-CXXFLAGS += -DHAVE_AVX2
-ASMFLAGS += -DHAVE_AVX2
-endif
-endif
-endif
-
-#for arm
-ifneq ($(filter-out arm64, $(filter arm%, $(ARCH))),)
-ifeq ($(USE_ASM), Yes)
-ASM_ARCH = arm
-ASMFLAGS += -I$(SRC_PATH)codec/common/arm/
-CFLAGS += -DHAVE_NEON
-endif
-endif
-
-#for arm64
-ifneq ($(filter arm64 aarch64, $(ARCH)),)
-ifeq ($(USE_ASM), Yes)
-ASM_ARCH = arm64
-ASMFLAGS += -I$(SRC_PATH)codec/common/arm64/
-CFLAGS += -DHAVE_NEON_AARCH64
-endif
-endif

build/astyle.cfg

@@ -7,4 +7,3 @@
 --unpad-paren
 --pad-first-paren-out
 --lineend=linux
---convert-tabs

build/gtest-targets.mk

@@ -1,11 +1,10 @@
-GTEST_SRCDIR=gtest/googletest
+GTEST_SRCDIR=gtest
 GTEST_CPP_SRCS=\
 	$(GTEST_SRCDIR)/src/gtest-all.cc\
 
 GTEST_OBJS += $(GTEST_CPP_SRCS:.cc=.$(OBJ))
 
 OBJS += $(GTEST_OBJS)
-
 $(GTEST_SRCDIR)/%.$(OBJ): $(GTEST_SRCDIR)/%.cc
 	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(GTEST_CFLAGS) $(GTEST_INCLUDES) -c $(CXX_O) $<
 

build/mktargets.py

@@ -134,42 +134,37 @@ if len(cfiles) > 0:
     for cfile in cfiles:
         f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, cfile))
     f.write("\n")
-    f.write("%s_OBJS += $(%s_C_SRCS:.c=.$(OBJ))\n"%(PREFIX, PREFIX))
+    f.write("%s_OBJS += $(%s_C_SRCS:.c=.$(OBJ))\n\n"%(PREFIX, PREFIX))
 
 if len(asm) > 0:
+    f.write("ifeq ($(ASM_ARCH), x86)\n")
     f.write("%s_ASM_SRCS=\\\n"%(PREFIX))
     for c in asm:
         f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c))
     f.write("\n")
-    f.write("%s_OBJSASM += $(%s_ASM_SRCS:.asm=.$(OBJ))\n"%(PREFIX, PREFIX))
-    f.write("ifeq ($(ASM_ARCH), x86)\n")
-    f.write("%s_OBJS += $(%s_OBJSASM)\n"%(PREFIX,PREFIX))
-    f.write("endif\n")
-    f.write("OBJS += $(%s_OBJSASM)\n\n"%(PREFIX))
+    f.write("%s_OBJS += $(%s_ASM_SRCS:.asm=.$(OBJ))\n"%(PREFIX, PREFIX))
+    f.write("endif\n\n")
 
 if len(armfiles) > 0:
+    f.write("ifeq ($(ASM_ARCH), arm)\n")
     f.write("%s_ASM_ARM_SRCS=\\\n"%(PREFIX))
     for c in armfiles:
         f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c))
     f.write("\n")
-    f.write("%s_OBJSARM += $(%s_ASM_ARM_SRCS:.S=.$(OBJ))\n"%(PREFIX, PREFIX))
-    f.write("ifeq ($(ASM_ARCH), arm)\n")
-    f.write("%s_OBJS += $(%s_OBJSARM)\n"%(PREFIX,PREFIX))
-    f.write("endif\n")
-    f.write("OBJS += $(%s_OBJSARM)\n\n"%(PREFIX))
+    f.write("%s_OBJS += $(%s_ASM_ARM_SRCS:.S=.$(OBJ))\n"%(PREFIX, PREFIX))
+    f.write("endif\n\n")
 
 if len(arm64files) > 0:
+    f.write("ifeq ($(ASM_ARCH), arm64)\n")
     f.write("%s_ASM_ARM64_SRCS=\\\n"%(PREFIX))
     for c in arm64files:
         f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c))
     f.write("\n")
-    f.write("%s_OBJSARM64 += $(%s_ASM_ARM64_SRCS:.S=.$(OBJ))\n"%(PREFIX, PREFIX))
-    f.write("ifeq ($(ASM_ARCH), arm64)\n")
-    f.write("%s_OBJS += $(%s_OBJSARM64)\n"%(PREFIX,PREFIX))
-    f.write("endif\n")
-    f.write("OBJS += $(%s_OBJSARM64)\n\n"%(PREFIX))
+    f.write("%s_OBJS += $(%s_ASM_ARM64_SRCS:.S=.$(OBJ))\n"%(PREFIX, PREFIX))
+    f.write("endif\n\n")
+
+f.write("OBJS += $(%s_OBJS)\n"%PREFIX)
 
-f.write("OBJS += $(%s_OBJS)\n\n"%(PREFIX))
 write_cpp_rule_pattern(f)
 
 if len(cfiles) > 0:

build/mktargets.sh

@@ -14,4 +14,4 @@ python build/mktargets.py --directory test/processing --prefix processing_unitte
 python build/mktargets.py --directory test/api --prefix api_test
 python build/mktargets.py --directory test/common --prefix common_unittest
 python build/mktargets.py --directory module --prefix module
-python build/mktargets.py --directory gtest/googletest --library gtest --out build/gtest-targets.mk --cpp-suffix .cc --include gtest-all.cc
+python build/mktargets.py --directory gtest --library gtest --out build/gtest-targets.mk --cpp-suffix .cc --include gtest-all.cc

build/msvc-app.mk

@@ -1,15 +0,0 @@
-include $(SRC_PATH)build/msvc-common.mk
-CFLAGS_OPT += -MD
-CFLAGS_DEBUG += -MDd
-CFLAGS += -DUNICODE
-# Ignore warnings about the main function prototype when building with -ZW
-CXXFLAGS += -ZW -wd4447
-# Ignore warnings about code built with -ZW in .lib files
-AR_OPTS += -ignore:4264
-
-# WelsThreadLib requires building with -ZW, since it uses new Windows Runtime
-# classes for creating threads.
-# If linking an .exe that contains Windows Runtime code, the first object
-# file linked into the exe also needs to be built with -ZW (otherwise the build
-# fails with "vccorlib_lib_should_be_specified_before_msvcrt_lib_to_linker",
-# so set it on all files.

build/platform-android.mk

@@ -1,9 +1,6 @@
 ARCH = arm
-include $(SRC_PATH)build/arch.mk
+include build/platform-arch.mk
 SHAREDLIBSUFFIX = so
-# Android APK/JARs expect libraries to be unversioned
-SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX)
-SHLDFLAGS =
 NDKLEVEL = 12
 ifeq ($(ARCH), arm)
   ifneq ($(APP_ABI), armeabi)
@@ -12,20 +9,16 @@ ifeq ($(ARCH), arm)
     LDFLAGS += -march=armv7-a -Wl,--fix-cortex-a8
     APP_ABI = armeabi-v7a
   endif
-else ifeq ($(ARCH), arm64)
-  APP_ABI = arm64-v8a
-else ifeq ($(ARCH), x86)
-  APP_ABI = x86
   ifeq (Yes, $(USE_ASM))
-    ASMFLAGS += -f elf
+    ASMFLAGS += -march=armv7-a -mfpu=neon
   endif
-else ifeq ($(ARCH), x86_64)
-  APP_ABI = x86_64
+else ifeq ($(ARCH), x86)
+    APP_ABI = x86
   ifeq (Yes, $(USE_ASM))
-    ASMFLAGS += -f elf64
+    ASMFLAGS += -f elf32
   endif
 else
-  APP_ABI = $(ARCH)
+    APP_ABI = $(ARCH)
 endif
 
 ifndef NDKROOT
@@ -35,7 +28,7 @@ ifndef TARGET
 $(error TARGET is not set)
 endif
 
-TOOLCHAINPREFIX = $(shell NDK_PROJECT_PATH=$(SRC_PATH)/codec/build/android/dec make --no-print-dir -f $(NDKROOT)/build/core/build-local.mk DUMP_TOOLCHAIN_PREFIX APP_ABI=$(APP_ABI))
+TOOLCHAINPREFIX = $(shell NDK_PROJECT_PATH=./codec/build/android/dec make --no-print-dir -f $(NDKROOT)/build/core/build-local.mk DUMP_TOOLCHAIN_PREFIX APP_ABI=$(APP_ABI))
 
 SYSROOT = $(NDKROOT)/platforms/android-$(NDKLEVEL)/arch-$(ARCH)
 CXX = $(TOOLCHAINPREFIX)g++
@@ -44,13 +37,7 @@ AR = $(TOOLCHAINPREFIX)ar
 CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) -MMD -MP
 CXXFLAGS += -fno-rtti -fno-exceptions
 LDFLAGS += --sysroot=$(SYSROOT)
-SHLDFLAGS = -Wl,--no-undefined -Wl,-z,relro -Wl,-z,now -Wl,-soname,lib$(PROJECT_NAME).so
-
-ifneq ($(CXX),$(wildcard $(CXX)))
-ifneq ($(CXX).exe,$(wildcard $(CXX).exe))
-$(error Compiler not found, bad NDKROOT or ARCH?)
-endif
-endif
+SHLDFLAGS = -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-soname,lib$(PROJECT_NAME).so
 
 STL_INCLUDES = \
     -I$(NDKROOT)/sources/cxx-stl/stlport/stlport
@@ -63,8 +50,7 @@ CODEC_UNITTEST_LDFLAGS_SUFFIX = $(STL_LIB)
 MODULE_INCLUDES = $(STL_INCLUDES)
 MODULE_LDFLAGS = $(STL_LIB)
 
-ifeq (./,$(SRC_PATH))
-binaries: decdemo encdemo
+binaries : decdemo encdemo
 
 decdemo: libraries
 	cd ./codec/build/android/dec && $(NDKROOT)/ndk-build -B APP_ABI=$(APP_ABI) && android update project -t $(TARGET) -p . && ant debug
@@ -78,10 +64,6 @@ clean_Android_dec:
 	-cd ./codec/build/android/dec && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean
 clean_Android_enc:
 	-cd ./codec/build/android/enc && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean
-else
-clean_Android:
-	@:
-endif
 
 COMMON_INCLUDES += -I$(NDKROOT)/sources/android/cpufeatures
 COMMON_OBJS += $(COMMON_SRCDIR)/src/cpu-features.$(OBJ)

build/platform-arch.mk

@@ -0,0 +1,17 @@
+ifneq ($(filter %86 x86_64, $(ARCH)),)
+include build/platform-x86-common.mk
+endif
+ifneq ($(filter-out arm64, $(filter arm%, $(ARCH))),)
+ifeq ($(USE_ASM), Yes)
+ASM_ARCH = arm
+ASMFLAGS += -Icodec/common/arm/
+CFLAGS += -DHAVE_NEON
+endif
+endif
+ifneq ($(filter arm64 aarch64, $(ARCH)),)
+ifeq ($(USE_ASM), Yes)
+ASM_ARCH = arm64
+ASMFLAGS += -Icodec/common/arm64/
+CFLAGS += -DHAVE_NEON_AARCH64
+endif
+endif

build/platform-bsd.mk

@@ -1,14 +0,0 @@
-include $(SRC_PATH)build/arch.mk
-SHAREDLIBSUFFIX = so
-SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX).$(SHAREDLIBVERSION)
-SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
-CFLAGS += -fPIC
-LDFLAGS += -lpthread
-ifeq ($(ASM_ARCH), x86)
-ifeq ($(ARCH), x86_64)
-ASMFLAGS += -f elf64
-else
-ASMFLAGS += -f elf
-endif
-endif
-

build/platform-darwin.mk

@@ -1,16 +1,11 @@
-include $(SRC_PATH)build/arch.mk
-SHAREDLIB_DIR = $(PREFIX)/lib
+include build/platform-arch.mk
 SHAREDLIBSUFFIX = dylib
-SHAREDLIBSUFFIXVER=$(SHAREDLIBVERSION).$(SHAREDLIBSUFFIX)
-SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \
-	-fno-common -headerpad_max_install_names -install_name \
-	$(SHAREDLIB_DIR)/$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
 SHARED = -dynamiclib
 CFLAGS += -Wall -fPIC -MMD -MP
 LDFLAGS += -lpthread
 ifeq ($(ASM_ARCH), x86)
 ASMFLAGS += -DPREFIX
-ifeq ($(ARCH), x86_64)
+ifeq ($(ENABLE64BIT), Yes)
 ASMFLAGS += -f macho64
 else
 ASMFLAGS += -f macho

build/platform-freebsd.mk

@@ -0,0 +1,12 @@
+include build/platform-arch.mk
+SHAREDLIBSUFFIX = so
+CFLAGS += -fPIC
+LDFLAGS += -lpthread
+ifeq ($(ASM_ARCH), x86)
+ifeq ($(ENABLE64BIT), Yes)
+ASMFLAGS += -f elf64
+else
+ASMFLAGS += -f elf
+endif
+endif
+

build/platform-ios.mk

@@ -1,5 +1,5 @@
 ARCH = armv7
-include $(SRC_PATH)build/platform-darwin.mk
+include build/platform-darwin.mk
 CXX = clang++
 CC = clang
 ifneq ($(filter %86 x86_64, $(ARCH)),)
@@ -12,6 +12,6 @@ SDK_MIN = 5.1
 
 XCODE=$(shell xcode-select -p)
 SDKROOT = $(XCODE)/Platforms/$(SDKTYPE).platform/Developer/SDKs/$(SDKTYPE)$(SDK).sdk
-CFLAGS += -arch $(ARCH) -isysroot $(SDKROOT) -miphoneos-version-min=$(SDK_MIN) -DAPPLE_IOS -fembed-bitcode
+CFLAGS += -arch $(ARCH) -isysroot $(SDKROOT) -miphoneos-version-min=$(SDK_MIN) -DAPPLE_IOS
 LDFLAGS += -arch $(ARCH) -isysroot $(SDKROOT) -miphoneos-version-min=$(SDK_MIN)
 

build/platform-linux.mk

@@ -1,22 +1,15 @@
-include $(SRC_PATH)build/arch.mk
+include build/platform-arch.mk
 SHAREDLIBSUFFIX = so
-SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX).$(SHAREDLIBVERSION)
-SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
 CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP
 LDFLAGS += -lpthread
-AR_OPTS = crD $@
 ifeq ($(ASM_ARCH), x86)
-ifeq ($(ARCH), x86_64)
+ifeq ($(ENABLE64BIT), Yes)
 ASMFLAGS += -f elf64
 else
-ASMFLAGS += -f elf
+ASMFLAGS += -f elf32
 endif
 endif
 ifeq ($(ASM_ARCH), arm)
 ASMFLAGS += -march=armv7-a -mfpu=neon
 endif
 
-ifeq ($(CXX), clang++)
-CXXFLAGS += -Wc++11-compat-reserved-user-defined-literal
-endif
-

build/platform-mingw_nt.mk

@@ -1,12 +1,8 @@
-include $(SRC_PATH)build/x86-common.mk
-SHAREDLIB_DIR = $(PREFIX)/bin
+include build/platform-x86-common.mk
 SHAREDLIBSUFFIX = dll
-SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX)
-EXTRA_LIBRARY=$(LIBPREFIX)$(PROJECT_NAME).dll.a
-SHLDFLAGS = -Wl,--out-implib,$(EXTRA_LIBRARY)
 CFLAGS += -MMD -MP
 LDFLAGS +=
-ifeq ($(ARCH), x86_64)
+ifeq ($(ENABLE64BIT), Yes)
 ASMFLAGS += -f win64
 ASMFLAGS_PLATFORM = -DWIN64
 CC = x86_64-w64-mingw32-gcc

build/platform-msvc-app.mk

@@ -1,3 +0,0 @@
-include $(SRC_PATH)build/msvc-app.mk
-CFLAGS += -DWINAPI_FAMILY=WINAPI_FAMILY_APP
-

build/platform-msvc-common.mk

@@ -1,6 +1,6 @@
-include $(SRC_PATH)build/arch.mk
+include build/platform-arch.mk
 ifeq ($(ASM_ARCH), x86)
-ifeq ($(ARCH), x86_64)
+ifeq ($(ENABLE64BIT), Yes)
 ASMFLAGS += -f win64
 ASMFLAGS_PLATFORM = -DWIN64
 else
@@ -10,7 +10,7 @@ else
 endif
 ifeq ($(ASM_ARCH), arm)
 CCAS = gas-preprocessor.pl -as-type armasm -force-thumb -- armasm
-CCASFLAGS = -nologo -DHAVE_NEON -ignore 4509
+CCASFLAGS = -nologo -DHAVE_NEON
 endif
 
 CC=cl
@@ -35,15 +35,7 @@ LIBSUFFIX=lib
 LIBPREFIX=
 EXEEXT=.exe
 OBJ=obj
-SHAREDLIB_DIR = $(PREFIX)/bin
 SHAREDLIBSUFFIX=dll
-SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX)
 SHARED=-LD
+SHLDFLAGS=-link -def:openh264.def -implib:$(PROJECT_NAME)_dll.lib
 EXTRA_LIBRARY=$(PROJECT_NAME)_dll.lib
-LDFLAGS += -link
-SHLDFLAGS=-debug -map -opt:ref -opt:icf -def:$(SRC_PATH)openh264.def -implib:$(EXTRA_LIBRARY)
-STATIC_LDFLAGS=
-CODEC_UNITTEST_CFLAGS=-D_CRT_SECURE_NO_WARNINGS
-
-%.res: %.rc
-	$(QUIET_RC)rc -fo $@ $<

build/platform-msvc-wp.mk

@@ -1,6 +1,10 @@
 ARCH = arm
-include $(SRC_PATH)build/msvc-app.mk
-CFLAGS += -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP -DWINDOWS_PHONE
-LDFLAGS += -nodefaultlib:kernel32.lib -nodefaultlib:ole32.lib WindowsPhoneCore.lib
-UTSHLDFLAGS = -def:$(SRC_PATH)ut.def
+include build/platform-msvc-common.mk
+CFLAGS_OPT += -MD
+CFLAGS_DEBUG += -MDd
+CFLAGS += -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
+CXXFLAGS +=
+LDFLAGS +=
+
+codec/common/src/WelsThreadLib.$(OBJ): CXXFLAGS += -ZW
 

build/platform-msvc.mk

@@ -1,6 +1,5 @@
-include $(SRC_PATH)build/msvc-common.mk
+include build/platform-msvc-common.mk
 LDFLAGS += user32.lib
 CFLAGS_OPT += -MT
 CFLAGS_DEBUG += -MTd -Gm
 
-$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER): openh264.res

build/platform-x86-common.mk

@@ -1,14 +1,12 @@
 CFLAGS_M32=-m32
 CFLAGS_M64=-m64
-ASM_INCLUDES = -I$(SRC_PATH)codec/common/x86/
-ifneq ($(ENABLE64BIT),)
-ifeq ($(ENABLE64BIT), Yes)
-ARCH = x86_64
-else
-ARCH = x86
-endif
-endif
+ASM_INCLUDES = -Icodec/common/x86/
+ifeq (, $(ENABLE64BIT))
 ifeq ($(ARCH), x86_64)
+ENABLE64BIT=Yes
+endif
+endif
+ifeq ($(ENABLE64BIT), Yes)
 CFLAGS += $(CFLAGS_M64)
 LDFLAGS += $(CFLAGS_M64)
 ASMFLAGS_PLATFORM = -DUNIX64
@@ -19,9 +17,6 @@ ASMFLAGS_PLATFORM = -DX86_32
 endif
 ifeq ($(USE_ASM),Yes)
 CFLAGS += -DX86_ASM
-ifneq ($(ARCH), x86_64)
-CFLAGS += -DX86_32_ASM
-endif
 ASM_ARCH = x86
 endif
 ASM = nasm

codec/api/svc/codec_api.h

@@ -1,6 +1,4 @@
 /*!
- *@page License
- *
  * \copy
  *     Copyright (c)  2013, Cisco Systems
  *     All rights reserved.
@@ -36,7 +34,7 @@
 #define WELS_VIDEO_CODEC_SVC_API_H__
 
 #ifndef __cplusplus
-#if defined(_MSC_VER) && (_MSC_VER < 1800)
+#ifdef _MSC_VER
 typedef unsigned char bool;
 #else
 #include <stdbool.h>
@@ -52,383 +50,71 @@ typedef unsigned char bool;
 #define EXTAPI
 #endif
 
-/**
-  * @file codec_api.h
-*/
-
-/**
-  * @page Overview
-  *   * This page is for openh264 codec API usage.
-  *   * For how to use the encoder,please refer to page UsageExampleForEncoder
-  *   * For how to use the decoder,please refer to page UsageExampleForDecoder
-  *   * For more detail about ISVEncoder,please refer to page ISVCEnoder
-  *   * For more detail about ISVDecoder,please refer to page ISVCDecoder
-*/
-
-/**
-  * @page DecoderUsageExample
-  *
-  * @brief
-  *   * An example for using the decoder for Decoding only or Parsing only
-  *
-  * Step 1:decoder declaration
-  * @code
-  *
-  *  //decoder declaration
-  *  ISVCDecoder *pSvcDecoder;
-  *  //input: encoded bitstream start position; should include start code prefix
-  *  unsigned char *pBuf =...;
-  *  //input: encoded bit stream length; should include the size of start code prefix
-  *  int iSize =...;
-  *  //output: [0~2] for Y,U,V buffer for Decoding only
-  *  unsigned char *pData[3] =...;
-  *  //in-out: for Decoding only: declare and initialize the output buffer info, this should never co-exist with Parsing only
-  *  SBufferInfo sDstBufInfo;
-  *  memset(&sDstBufInfo, 0, sizeof(SBufferInfo));
-  *  //in-out: for Parsing only: declare and initialize the output bitstream buffer info for parse only, this should never co-exist with Decoding only
-  *  SParserBsInfo sDstParseInfo;
-  *  memset(&sDstParseInfo, 0, sizeof(SParserBsInfo));
-  *  sDstParseInfo.pDstBuff = new unsigned char[PARSE_SIZE]; //In Parsing only, allocate enough buffer to save transcoded bitstream for a frame
-  *
-  * @endcode
-  *
-  * Step 2:decoder creation
-  * @code
-  *  CreateDecoder(pSvcDecoder);
-  * @endcode
-  *
-  * Step 3:declare required parameter, used to differentiate Decoding only and Parsing only
-  * @code
-  *  SDecodingParam sDecParam = {0};
-  *  sDecParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_AVC;
-  *  //for Parsing only, the assignment is mandatory
-  *  sDecParam.bParseOnly = true;
-  * @endcode
-  *
-  * Step 4:initialize the parameter and decoder context, allocate memory
-  * @code
-  *  Initialize(&sDecParam);
-  * @endcode
-  *
-  * Step 5:do actual decoding process in slice level;
-  *        this can be done in a loop until data ends
-  * @code
-  *  //for Decoding only
-  *  iRet = DecodeFrameNoDelay(pBuf, iSize, pData, &sDstBufInfo);
-  *  //or
-  *  iRet = DecodeFrame2(pBuf, iSize, pData, &sDstBufInfo);
-  *  //for Parsing only
-  *  iRet = DecodeParser(pBuf, iSize, &sDstParseInfo);
-  *  //decode failed
-  *  If (iRet != 0){
-  *      RequestIDR or something like that.
-  *  }
-  *  //for Decoding only, pData can be used for render.
-  *  if (sDstBufInfo.iBufferStatus==1){
-  *      output pData[0], pData[1], pData[2];
-  *  }
-  * //for Parsing only, sDstParseInfo can be used for, e.g., HW decoding
-  *  if (sDstBufInfo.iNalNum > 0){
-  *      Hardware decoding sDstParseInfo;
-  *  }
-  *  //no-delay decoding can be realized by directly calling DecodeFrameNoDelay(), which is the recommended usage.
-  *  //no-delay decoding can also be realized by directly calling DecodeFrame2() again with NULL input, as in the following. In this case, decoder would immediately reconstruct the input data. This can also be used similarly for Parsing only. Consequent decoding error and output indication should also be considered as above.
-  *  iRet = DecodeFrame2(NULL, 0, pData, &sDstBufInfo);
-  *  judge iRet, sDstBufInfo.iBufferStatus ...
-  * @endcode
-  *
-  * Step 6:uninitialize the decoder and memory free
-  * @code
-  *  Uninitialize();
-  * @endcode
-  *
-  * Step 7:destroy the decoder
-  * @code
-  *  DestroyDecoder();
-  * @endcode
-  *
-*/
-
-/**
-  * @page EncoderUsageExample1
-  *
-  * @brief
-  *  * An example for using encoder with basic parameter
-  *
-  * Step1:setup encoder
-  * @code
-  *  int rv = WelsCreateSVCEncoder (&encoder_);
-  *  ASSERT_EQ (0, rv);
-  *  ASSERT_TRUE (encoder_ != NULL);
-  * @endcode
-  *
-  * Step2:initilize with basic parameter
-  * @code
-  *  SEncParamBase param;
-  *  memset (&param, 0, sizeof (SEncParamBase));
-  *  param.iUsageType = usageType;
-  *  param.fMaxFrameRate = frameRate;
-  *  param.iPicWidth = width;
-  *  param.iPicHeight = height;
-  *  param.iTargetBitrate = 5000000;
-  *  encoder_->Initialize (&param);
-  * @endcode
-  *
-  * Step3:set option, set option during encoding process
-  * @code
-  *  encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &g_LevelSetting);
-  *  int videoFormat = videoFormatI420;
-  *  encoder_->SetOption (ENCODER_OPTION_DATAFORMAT, &videoFormat);
-  * @endcode
-  *
-  * Step4: encode and  store ouput bistream
-  * @code
-  *  int frameSize = width * height * 3 / 2;
-  *  BufferedData buf;
-  *  buf.SetLength (frameSize);
-  *  ASSERT_TRUE (buf.Length() == (size_t)frameSize);
-  *  SFrameBSInfo info;
-  *  memset (&info, 0, sizeof (SFrameBSInfo));
-  *  SSourcePicture pic;
-  *  memset (&pic, 0, sizeof (SsourcePicture));
-  *  pic.iPicWidth = width;
-  *  pic.iPicHeight = height;
-  *  pic.iColorFormat = videoFormatI420;
-  *  pic.iStride[0] = pic.iPicWidth;
-  *  pic.iStride[1] = pic.iStride[2] = pic.iPicWidth >> 1;
-  *  pic.pData[0] = buf.data();
-  *  pic.pData[1] = pic.pData[0] + width * height;
-  *  pic.pData[2] = pic.pData[1] + (width * height >> 2);
-  *  for(int num = 0;num<total_num;num++) {
-  *     //prepare input data
-  *     rv = encoder_->EncodeFrame (&pic, &info);
-  *     ASSERT_TRUE (rv == cmResultSuccess);
-  *     if (info.eFrameType != videoFrameTypeSkip && cbk != NULL) {
-  *      //output bitstream
-  *     }
-  *  }
-  * @endcode
-  *
-  * Step5:teardown encoder
-  * @code
-  *  if (encoder_) {
-  *      encoder_->Uninitialize();
-  *      WelsDestroySVCEncoder (encoder_);
-  *  }
-  * @endcode
-  *
-  */
-
-/**
-  * @page EncoderUsageExample2
-  *
-  * @brief
-  *     * An example for using the encoder with extension parameter.
-  *     * The same operation on Step 1,3,4,5 with Example-1
-  *
-  * Step 2:initialize with extension parameter
-  * @code
-  *  SEncParamExt param;
-  *  encoder->GetDefaultParams (&param);
-  *  param.iUsageType = usageType;
-  *  param.fMaxFrameRate = frameRate;
-  *  param.iPicWidth = width;
-  *  param.iPicHeight = height;
-  *  param.iTargetBitrate = 5000000;
-  *  param.bEnableDenoise = denoise;
-  *  param.iSpatialLayerNum = layers;
-  *  //SM_DYN_SLICE don't support multi-thread now
-  *  if (sliceMode != SM_SINGLE_SLICE && sliceMode != SM_DYN_SLICE)
-  *      param.iMultipleThreadIdc = 2;
-  *
-  *  for (int i = 0; i < param.iSpatialLayerNum; i++) {
-  *      param.sSpatialLayers[i].iVideoWidth = width >> (param.iSpatialLayerNum - 1 - i);
-  *      param.sSpatialLayers[i].iVideoHeight = height >> (param.iSpatialLayerNum - 1 - i);
-  *      param.sSpatialLayers[i].fFrameRate = frameRate;
-  *      param.sSpatialLayers[i].iSpatialBitrate = param.iTargetBitrate;
-  *
-  *      param.sSpatialLayers[i].sSliceCfg.uiSliceMode = sliceMode;
-  *      if (sliceMode == SM_DYN_SLICE) {
-  *          param.sSpatialLayers[i].sSliceCfg.sSliceArgument.uiSliceSizeConstraint = 600;
-  *          param.uiMaxNalSize = 1500;
-  *      }
-  *  }
-  *  param.iTargetBitrate *= param.iSpatialLayerNum;
-  *  encoder_->InitializeExt (&param);
-  *  int videoFormat = videoFormatI420;
-  *  encoder_->SetOption (ENCODER_OPTION_DATAFORMAT, &videoFormat);
-  *
-  * @endcode
-  */
-
-
-
-
 #ifdef __cplusplus
-/**
-* @brief Endocder definition
-*/
 class ISVCEncoder {
  public:
-  /**
-  * @brief  Initialize the encoder
-  * @param  pParam  basic encoder parameter
-  * @return CM_RETURN: 0 - success; otherwise - failed;
-  */
+  /*
+   * return: CM_RETURN: 0 - success; otherwise - failed;
+   */
   virtual int EXTAPI Initialize (const SEncParamBase* pParam) = 0;
-
-  /**
-  * @brief  Initilaize encoder by using extension parameters.
-  * @param  pParam  extension parameter for encoder
-  * @return CM_RETURN: 0 - success; otherwise - failed;
-  */
   virtual int EXTAPI InitializeExt (const SEncParamExt* pParam) = 0;
 
-  /**
-  * @brief   Get the default extension parameters.
-  *          If you want to change some parameters of encoder, firstly you need to get the default encoding parameters,
-  *          after that you can change part of parameters you want to.
-  * @param   pParam  extension parameter for encoder
-  * @return  CM_RETURN: 0 - success; otherwise - failed;
-  * */
   virtual int EXTAPI GetDefaultParams (SEncParamExt* pParam) = 0;
-  /// uninitialize the encoder
+
   virtual int EXTAPI Uninitialize() = 0;
 
-  /**
-  * @brief Encode one frame
-  * @param kpSrcPic the pointer to the source luminance plane
-  *        chrominance data:
-  *        CbData = kpSrc  +  m_iMaxPicWidth * m_iMaxPicHeight;
-  *        CrData = CbData + (m_iMaxPicWidth * m_iMaxPicHeight)/4;
-  *        the application calling this interface needs to ensure the data validation between the location
-  * @param pBsInfo output bit stream
-  * @return  0 - success; otherwise -failed;
-  */
+  /*
+   * return: 0 - success; otherwise -failed;
+   */
   virtual int EXTAPI EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) = 0;
-
-  /**
-  * @brief  Encode the parameters from output bit stream
-  * @param  pBsInfo output bit stream
-  * @return 0 - success; otherwise - failed;
-  */
+  /*
+   * return: 0 - success; otherwise - failed;
+   */
   virtual int EXTAPI EncodeParameterSets (SFrameBSInfo* pBsInfo) = 0;
 
-  /**
-  * @brief  Force encoder to encoder frame as IDR if bIDR set as true
-  * @param  bIDR true: force encoder to encode frame as IDR frame;false, return 1 and nothing to do
-  * @return 0 - success; otherwise - failed;
-  */
+  /*
+   * return: 0 - success; otherwise - failed;
+   */
+  virtual int EXTAPI PauseFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) = 0;
+
+  /*
+   * return: 0 - success; otherwise - failed;
+   */
   virtual int EXTAPI ForceIntraFrame (bool bIDR) = 0;
 
-  /**
-  * @brief   Set option for encoder, detail option type, please refer to enumurate ENCODER_OPTION.
-  * @param   pOption option for encoder such as InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,...
-  * @return  CM_RETURN: 0 - success; otherwise - failed;
-  */
+  /************************************************************************
+   * InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,..
+   ************************************************************************/
+  /*
+   * return: CM_RETURN: 0 - success; otherwise - failed;
+   */
   virtual int EXTAPI SetOption (ENCODER_OPTION eOptionId, void* pOption) = 0;
-
-  /**
-  * @brief   Set option for encoder, detail option type, please refer to enumurate ENCODER_OPTION.
-  * @param   pOption option for encoder such as InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,...
-  * @return  CM_RETURN: 0 - success; otherwise - failed;
-  */
   virtual int EXTAPI GetOption (ENCODER_OPTION eOptionId, void* pOption) = 0;
   virtual ~ISVCEncoder() {}
 };
 
-
-
-/**
-* @brief Decoder definition
-*/
 class ISVCDecoder {
  public:
-
-  /**
-  * @brief  Initilaize decoder
-  * @param  pParam  parameter for decoder
-  * @return 0 - success; otherwise - failed;
-  */
   virtual long EXTAPI Initialize (const SDecodingParam* pParam) = 0;
-
-  /// Uninitialize the decoder
   virtual long EXTAPI Uninitialize() = 0;
 
-  /**
-  * @brief   Decode one frame
-  * @param   pSrc the h264 stream to be decoded
-  * @param   iSrcLen the length of h264 stream
-  * @param   ppDst buffer pointer of decoded data (YUV)
-  * @param   pStride output stride
-  * @param   iWidth output width
-  * @param   iHeight output height
-  * @return  0 - success; otherwise -failed;
-  */
   virtual DECODING_STATE EXTAPI DecodeFrame (const unsigned char* pSrc,
       const int iSrcLen,
       unsigned char** ppDst,
       int* pStride,
       int& iWidth,
       int& iHeight) = 0;
-
-/**
-  * @brief    For slice level DecodeFrameNoDelay() (4 parameters input),
-  *           whatever the function return value is, the output data
-  *           of I420 format will only be available when pDstInfo->iBufferStatus == 1,.
-  *           This function will parse and reconstruct the input frame immediately if it is complete
-  *           It is recommended as the main decoding function for H.264/AVC format input
-  * @param   pSrc the h264 stream to be decoded
-  * @param   iSrcLen the length of h264 stream
-  * @param   ppDst buffer pointer of decoded data (YUV)
-  * @param   pDstInfo information provided to API(width, height, etc.)
-  * @return  0 - success; otherwise -failed;
-  */
-  virtual DECODING_STATE EXTAPI DecodeFrameNoDelay (const unsigned char* pSrc,
-      const int iSrcLen,
-      unsigned char** ppDst,
-      SBufferInfo* pDstInfo) = 0;
-
-  /**
-  * @brief    For slice level DecodeFrame2() (4 parameters input),
-  *           whatever the function return value is, the output data
-  *           of I420 format will only be available when pDstInfo->iBufferStatus == 1,.
-  *           (e.g., in multi-slice cases, only when the whole picture
-  *           is completely reconstructed, this variable would be set equal to 1.)
-  * @param   pSrc the h264 stream to be decoded
-  * @param   iSrcLen the length of h264 stream
-  * @param   ppDst buffer pointer of decoded data (YUV)
-  * @param   pDstInfo information provided to API(width, height, etc.)
-  * @return  0 - success; otherwise -failed;
-  */
+  /*
+   * return: 0 - success; otherwise -failed;
+   */
   virtual DECODING_STATE EXTAPI DecodeFrame2 (const unsigned char* pSrc,
       const int iSrcLen,
       unsigned char** ppDst,
       SBufferInfo* pDstInfo) = 0;
 
-  /**
-  * @brief   This function parse input bitstream only, and rewrite possible SVC syntax to AVC syntax
-  * @param   pSrc the h264 stream to be decoded
-  * @param   iSrcLen the length of h264 stream
-  * @param   pDstInfo bit stream info
-  * @return  0 - success; otherwise -failed;
-  */
-  virtual DECODING_STATE EXTAPI DecodeParser (const unsigned char* pSrc,
-      const int iSrcLen,
-      SParserBsInfo* pDstInfo) = 0;
-
-  /**
-  * @brief   This API does not work for now!! This is for future use to support non-I420 color format output.
-  * @param   pSrc the h264 stream to be decoded
-  * @param   iSrcLen the length of h264 stream
-  * @param   pDst buffer pointer of decoded data (YUV)
-  * @param   iDstStride output stride
-  * @param   iDstLen bit stream info
-  * @param   iWidth output width
-  * @param   iHeight output height
-  * @param   iColorFormat output color format
-  * @return  to do ...
-  */
+  /*
+   *  this API does not work for now!! This is for future use to support non-I420 color format output.
+   */
   virtual DECODING_STATE EXTAPI DecodeFrameEx (const unsigned char* pSrc,
       const int iSrcLen,
       unsigned char* pDst,
@@ -438,18 +124,10 @@ class ISVCDecoder {
       int& iHeight,
       int& iColorFormat) = 0;
 
-  /**
-  * @brief   Set option for decoder, detail option type, please refer to enumurate DECODER_OPTION.
-  * @param   pOption  option for decoder such as OutDataFormat, Eos Flag, EC method, ...
-  * @return  CM_RETURN: 0 - success; otherwise - failed;
-  */
+  /*************************************************************************
+   * OutDataFormat, Eos Flag, EC method, ...
+   *************************************************************************/
   virtual long EXTAPI SetOption (DECODER_OPTION eOptionId, void* pOption) = 0;
-
-  /**
-  * @brief   Get option for decoder, detail option type, please refer to enumurate DECODER_OPTION.
-  * @param   pOption  option for decoder such as OutDataFormat, Eos Flag, EC method, ...
-  * @return  CM_RETURN: 0 - success; otherwise - failed;
-  */
   virtual long EXTAPI GetOption (DECODER_OPTION eOptionId, void* pOption) = 0;
   virtual ~ISVCDecoder() {}
 };
@@ -473,6 +151,8 @@ int (*Uninitialize) (ISVCEncoder*);
 int (*EncodeFrame) (ISVCEncoder*, const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo);
 int (*EncodeParameterSets) (ISVCEncoder*, SFrameBSInfo* pBsInfo);
 
+int (*PauseFrame) (ISVCEncoder*, const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo);
+
 int (*ForceIntraFrame) (ISVCEncoder*, bool bIDR);
 
 int (*SetOption) (ISVCEncoder*, ENCODER_OPTION eOptionId, void* pOption);
@@ -492,20 +172,11 @@ DECODING_STATE (*DecodeFrame) (ISVCDecoder*, const unsigned char* pSrc,
                                int* iWidth,
                                int* iHeight);
 
-DECODING_STATE (*DecodeFrameNoDelay) (ISVCDecoder*, const unsigned char* pSrc,
-                                const int iSrcLen,
-                                unsigned char** ppDst,
-                                SBufferInfo* pDstInfo);
-
 DECODING_STATE (*DecodeFrame2) (ISVCDecoder*, const unsigned char* pSrc,
                                 const int iSrcLen,
                                 unsigned char** ppDst,
                                 SBufferInfo* pDstInfo);
 
-DECODING_STATE (*DecodeParser) (ISVCDecoder*, const unsigned char* pSrc,
-                                const int iSrcLen,
-                                SParserBsInfo* pDstInfo);
-
 DECODING_STATE (*DecodeFrameEx) (ISVCDecoder*, const unsigned char* pSrc,
                                  const int iSrcLen,
                                  unsigned char* pDst,
@@ -522,53 +193,12 @@ long (*GetOption) (ISVCDecoder*, DECODER_OPTION eOptionId, void* pOption);
 
 typedef void (*WelsTraceCallback) (void* ctx, int level, const char* string);
 
-/** @brief   Create encoder
- *  @param   ppEncoder encoder
- *  @return  0 - success; otherwise - failed;
-*/
 int  WelsCreateSVCEncoder (ISVCEncoder** ppEncoder);
-
-
-/** @brief   Destroy encoder
-*   @param   pEncoder encoder
- *  @return  void
-*/
 void WelsDestroySVCEncoder (ISVCEncoder* pEncoder);
 
-
-/** @brief   Get the capability of decoder
- *  @param   pDecCapability  decoder capability
- *  @return  0 - success; otherwise - failed;
-*/
-int WelsGetDecoderCapability (SDecoderCapability* pDecCapability);
-
-
-/** @brief   Create decoder
- *  @param   ppDecoder decoder
- *  @return  0 - success; otherwise - failed;
-*/
 long WelsCreateDecoder (ISVCDecoder** ppDecoder);
-
-
-/** @brief   Destroy decoder
- *  @param   pDecoder  decoder
- *  @return  void
-*/
 void WelsDestroyDecoder (ISVCDecoder* pDecoder);
 
-/** @brief   Get codec version
- *           Note, old versions of Mingw (GCC < 4.7) are buggy and use an
- *           incorrect/different ABI for calling this function, making it
- *           incompatible with MSVC builds.
- *  @return  The linked codec version
-*/
-OpenH264Version WelsGetCodecVersion (void);
-
-/** @brief   Get codec version
- *  @param   pVersion  struct to fill in with the version
-*/
-void WelsGetCodecVersionEx (OpenH264Version *pVersion);
-
 #ifdef __cplusplus
 }
 #endif

codec/api/svc/codec_app_def.h

@@ -30,262 +30,193 @@
  *
  */
 
-
-
 #ifndef WELS_VIDEO_CODEC_APPLICATION_DEFINITION_H__
 #define WELS_VIDEO_CODEC_APPLICATION_DEFINITION_H__
-/**
-  * @file  codec_app_def.h
-  * @brief Data and /or structures introduced in Cisco OpenH264 application
-*/
-
+////////////////Data and /or structures introduced in Cisco OpenH264 application////////////////
 #include "codec_def.h"
 /* Constants */
-#define MAX_TEMPORAL_LAYER_NUM          4
-#define MAX_SPATIAL_LAYER_NUM           4
-#define MAX_QUALITY_LAYER_NUM           4
+#define MAX_TEMPORAL_LAYER_NUM		4
+#define MAX_SPATIAL_LAYER_NUM		4
+#define MAX_QUALITY_LAYER_NUM		4
 
-#define MAX_LAYER_NUM_OF_FRAME          128
-#define MAX_NAL_UNITS_IN_LAYER          128     ///< predetermined here, adjust it later if need
+#define MAX_LAYER_NUM_OF_FRAME		128
+#define MAX_NAL_UNITS_IN_LAYER		128	// predetermined here, adjust it later if need
 
-#define MAX_RTP_PAYLOAD_LEN             1000
-#define AVERAGE_RTP_PAYLOAD_LEN         800
+#define MAX_RTP_PAYLOAD_LEN		1000
+#define AVERAGE_RTP_PAYLOAD_LEN		800
 
 
-#define SAVED_NALUNIT_NUM_TMP           ( (MAX_SPATIAL_LAYER_NUM*MAX_QUALITY_LAYER_NUM) + 1 + MAX_SPATIAL_LAYER_NUM )  ///< SPS/PPS + SEI/SSEI + PADDING_NAL
-#define MAX_SLICES_NUM_TMP              ( ( MAX_NAL_UNITS_IN_LAYER - SAVED_NALUNIT_NUM_TMP ) / 3 )
+#define SAVED_NALUNIT_NUM_TMP		( (MAX_SPATIAL_LAYER_NUM*MAX_QUALITY_LAYER_NUM) + 1 + MAX_SPATIAL_LAYER_NUM ) //SPS/PPS + SEI/SSEI + PADDING_NAL
+#define MAX_SLICES_NUM_TMP			( ( MAX_NAL_UNITS_IN_LAYER - SAVED_NALUNIT_NUM_TMP ) / 3 )
 
-
-#define AUTO_REF_PIC_COUNT  -1          ///< encoder selects the number of reference frame automatically
-#define UNSPECIFIED_BIT_RATE 0          ///< to do: add detail comment
-
-/**
- * @brief Struct of OpenH264 version
- */
-///
-/// E.g. SDK version is 1.2.0.0, major version number is 1, minor version number is 2, and revision number is 0.
-typedef struct  _tagVersion {
-  unsigned int uMajor;                  ///< The major version number
-  unsigned int uMinor;                  ///< The minor version number
-  unsigned int uRevision;               ///< The revision number
-  unsigned int uReserved;               ///< The reserved number, it should be 0.
-} OpenH264Version;
-
-/**
-* @brief Decoding status
-*/
+#define AUTO_REF_PIC_COUNT  -1  // encoder selects the number of reference frame automatically
 typedef enum {
-  /**
-  * Errors derived from bitstream parsing
-  */
-  dsErrorFree           = 0x00,   ///< bit stream error-free
-  dsFramePending        = 0x01,   ///< need more throughput to generate a frame output,
-  dsRefLost             = 0x02,   ///< layer lost at reference frame with temporal id 0
-  dsBitstreamError      = 0x04,   ///< error bitstreams(maybe broken internal frame) the decoder cared
-  dsDepLayerLost        = 0x08,   ///< dependented layer is ever lost
-  dsNoParamSets         = 0x10,   ///< no parameter set NALs involved
-  dsDataErrorConcealed  = 0x20,   ///< current data error concealed specified
+  /* Errors derived from bitstream parsing */
+  dsErrorFree			= 0x00,	/* Bitstream error-free */
+  dsFramePending		= 0x01,	/* Need more throughput to generate a frame output,  */
+  dsRefLost			= 0x02,	/* layer lost at reference frame with temporal id 0  */
+  dsBitstreamError	= 0x04,	/* Error bitstreams(maybe broken internal frame) the decoder cared */
+  dsDepLayerLost		= 0x08,	/* Dependented layer is ever lost */
+  dsNoParamSets		= 0x10, /* No parameter set NALs involved */
+  dsDataErrorConcealed  = 0x20, /* current data Error concealed specified */
 
-  /**
-  * Errors derived from logic level
-  */
-  dsInvalidArgument     = 0x1000, ///< invalid argument specified
-  dsInitialOptExpected  = 0x2000, ///< initializing operation is expected
-  dsOutOfMemory         = 0x4000, ///< out of memory due to new request
-  /**
-  * ANY OTHERS?
-  */
-  dsDstBufNeedExpan     = 0x8000  ///< actual picture size exceeds size of dst pBuffer feed in decoder, so need expand its size
+  /* Errors derived from logic level */
+  dsInvalidArgument	= 0x1000,	/* Invalid argument specified */
+  dsInitialOptExpected = 0x2000,	/* Initializing operation is expected */
+  dsOutOfMemory		= 0x4000,	/* Out of memory due to new request */
+  /* ANY OTHERS? */
+  dsDstBufNeedExpand	= 0x8000	/* Actual picture size exceeds size of dst pBuffer feed in decoder, so need expand its size */
 
 } DECODING_STATE;
 
-/**
-* @brief Option types introduced in SVC encoder application
-*/
+/* Option types introduced in SVC encoder application */
 typedef enum {
   ENCODER_OPTION_DATAFORMAT = 0,
-  ENCODER_OPTION_IDR_INTERVAL,               ///< IDR period,0/-1 means no Intra period (only the first frame); lager than 0 means the desired IDR period, must be multiple of (2^temporal_layer)
-  ENCODER_OPTION_SVC_ENCODE_PARAM_BASE,      ///< structure of Base Param
-  ENCODER_OPTION_SVC_ENCODE_PARAM_EXT,       ///< structure of Extension Param
-  ENCODER_OPTION_FRAME_RATE,                 ///< maximal input frame rate, current supported range: MAX_FRAME_RATE = 30,MIN_FRAME_RATE = 1
+  ENCODER_OPTION_IDR_INTERVAL,
+  ENCODER_OPTION_SVC_ENCODE_PARAM_BASE,
+  ENCODER_OPTION_SVC_ENCODE_PARAM_EXT,
+  ENCODER_OPTION_FRAME_RATE,
   ENCODER_OPTION_BITRATE,
   ENCODER_OPTION_MAX_BITRATE,
   ENCODER_OPTION_INTER_SPATIAL_PRED,
   ENCODER_OPTION_RC_MODE,
-  ENCODER_OPTION_RC_FRAME_SKIP,
-  ENCODER_PADDING_PADDING,                   ///< 0:disable padding;1:padding
+  ENCODER_PADDING_PADDING,
 
-  ENCODER_OPTION_PROFILE,                    ///< assgin the profile for each layer
-  ENCODER_OPTION_LEVEL,                      ///< assgin the level for each layer
-  ENCODER_OPTION_NUMBER_REF,                 ///< the number of refererence frame
-  ENCODER_OPTION_DELIVERY_STATUS,            ///< the delivery info which is a feedback from app level
+  ENCODER_OPTION_PROFILE,
+  ENCODER_OPTION_LEVEL,
+  ENCODER_OPTION_NUMBER_REF,
+  ENCODER_OPTION_DELIVERY_STATUS,
 
   ENCODER_LTR_RECOVERY_REQUEST,
   ENCODER_LTR_MARKING_FEEDBACK,
-  ENCODER_LTR_MARKING_PERIOD,
-  ENCODER_OPTION_LTR,                        ///< 0:disable LTR;larger than 0 enable LTR; LTR number is fixed to be 2 in current encoder
+  ENCOCER_LTR_MARKING_PERIOD,
+  ENCODER_OPTION_LTR,
   ENCODER_OPTION_COMPLEXITY,
 
-  ENCODER_OPTION_ENABLE_SSEI,                ///< enable SSEI: true--enable ssei; false--disable ssei
-  ENCODER_OPTION_ENABLE_PREFIX_NAL_ADDING,   ///< enable prefix: true--enable prefix; false--disable prefix
-  ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, ///< enable pSps/pPps id addition: true--enable pSps/pPps id; false--disable pSps/pPps id addistion
+  ENCODER_OPTION_ENABLE_SSEI,               //enable SSEI: true--enable ssei; false--disable ssei
+  ENCODER_OPTION_ENABLE_PREFIX_NAL_ADDING,   //enable prefix: true--enable prefix; false--disable prefix
+  ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, //enable pSps/pPps id addition: true--enable pSps/pPps id; false--disable pSps/pPps id addistion
 
   ENCODER_OPTION_CURRENT_PATH,
-  ENCODER_OPTION_DUMP_FILE,                  ///< dump layer reconstruct frame to a specified file
-  ENCODER_OPTION_TRACE_LEVEL,                ///< trace info based on the trace level
-  ENCODER_OPTION_TRACE_CALLBACK,             ///< a void (*)(void* context, int level, const char* message) function which receives log messages
-  ENCODER_OPTION_TRACE_CALLBACK_CONTEXT,     ///< context info of trace callback
-
-  ENCODER_OPTION_GET_STATISTICS,             ///< read only
-  ENCODER_OPTION_STATISTICS_LOG_INTERVAL,    ///< log interval in millisecond
-
-  ENCODER_OPTION_IS_LOSSLESS_LINK,            ///< advanced algorithmetic settings
-
-  ENCODER_OPTION_BITS_VARY_PERCENTAGE        ///< bit vary percentage
+  ENCODER_OPTION_DUMP_FILE,
+  ENCODER_OPTION_TRACE_LEVEL,
+  ENCODER_OPTION_TRACE_CALLBACK, // a void (*)(void* context, int level, const char* message) function which receives log messages
+  ENCODER_OPTION_TRACE_CALLBACK_CONTEXT,
 } ENCODER_OPTION;
 
-/**
-* @brief Option types introduced in decoder application
-*/
+/* Option types introduced in decoder application */
 typedef enum {
-  DECODER_OPTION_END_OF_STREAM = 1,     ///< end of stream flag
-  DECODER_OPTION_VCL_NAL,               ///< feedback whether or not have VCL NAL in current AU for application layer
-  DECODER_OPTION_TEMPORAL_ID,           ///< feedback temporal id for application layer
-  DECODER_OPTION_FRAME_NUM,             ///< feedback current decoded frame number
-  DECODER_OPTION_IDR_PIC_ID,            ///< feedback current frame belong to which IDR period
-  DECODER_OPTION_LTR_MARKING_FLAG,      ///< feedback wether current frame mark a LTR
-  DECODER_OPTION_LTR_MARKED_FRAME_NUM,  ///< feedback frame num marked by current Frame
-  DECODER_OPTION_ERROR_CON_IDC,         ///< indicate decoder error concealment method
+  DECODER_OPTION_DATAFORMAT = 0,	/* Set color space of decoding output frame */
+  DECODER_OPTION_END_OF_STREAM,	/* Indicate bitstream of the final frame to be decoded */
+  DECODER_OPTION_VCL_NAL,        //feedback whether or not have VCL NAL in current AU for application layer
+  DECODER_OPTION_TEMPORAL_ID,      //feedback temporal id for application layer
+  DECODER_OPTION_FRAME_NUM,	//feedback current decoded frame number
+  DECODER_OPTION_IDR_PIC_ID,	// feedback current frame belong to which IDR period
+  DECODER_OPTION_LTR_MARKING_FLAG,	// feedback wether current frame mark a LTR
+  DECODER_OPTION_LTR_MARKED_FRAME_NUM,	// feedback frame num marked by current Frame
+  DECODER_OPTION_ERROR_CON_IDC, //not finished yet, indicate decoder error concealment status, in progress
   DECODER_OPTION_TRACE_LEVEL,
-  DECODER_OPTION_TRACE_CALLBACK,        ///< a void (*)(void* context, int level, const char* message) function which receives log messages
-  DECODER_OPTION_TRACE_CALLBACK_CONTEXT,///< context info of trace callbac
-
-  DECODER_OPTION_GET_STATISTICS
+  DECODER_OPTION_TRACE_CALLBACK, // a void (*)(void* context, int level, const char* message) function which receives log messages
+  DECODER_OPTION_TRACE_CALLBACK_CONTEXT,
 
 } DECODER_OPTION;
 
-/**
-* @brief Enumerate the type of error concealment methods
-*/
+//enuerate the types of error concealment methods
 typedef enum {
   ERROR_CON_DISABLE = 0,
   ERROR_CON_FRAME_COPY,
   ERROR_CON_SLICE_COPY,
-  ERROR_CON_FRAME_COPY_CROSS_IDR,
-  ERROR_CON_SLICE_COPY_CROSS_IDR,
-  ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE,
-  ERROR_CON_SLICE_MV_COPY_CROSS_IDR,
-  ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE
 } ERROR_CON_IDC;
-/**
-* @brief Feedback that whether or not have VCL NAL in current AU
-*/
-typedef enum {
+
+typedef enum { //feedback that whether or not have VCL NAL in current AU
   FEEDBACK_NON_VCL_NAL = 0,
   FEEDBACK_VCL_NAL,
   FEEDBACK_UNKNOWN_NAL
 } FEEDBACK_VCL_NAL_IN_AU;
 
-/**
-* @brief Type of layer being encoded
-*/
+/* Type of layer being encoded */
 typedef enum {
   NON_VIDEO_CODING_LAYER = 0,
   VIDEO_CODING_LAYER = 1
 } LAYER_TYPE;
 
-/**
-* @brief Spatial layer num
-*/
 typedef enum {
   SPATIAL_LAYER_0 = 0,
   SPATIAL_LAYER_1 = 1,
   SPATIAL_LAYER_2 = 2,
   SPATIAL_LAYER_3 = 3,
-  SPATIAL_LAYER_ALL = 4
+  SPATIAL_LAYER_ALL = 4,
 } LAYER_NUM;
 
-/**
-* @brief Enumerate the type of video bitstream which is provided to decoder
-*/
+//enumerate the type of video bitstream which is provided to decoder
 typedef enum {
   VIDEO_BITSTREAM_AVC               = 0,
   VIDEO_BITSTREAM_SVC               = 1,
-  VIDEO_BITSTREAM_DEFAULT           = VIDEO_BITSTREAM_SVC
+  VIDEO_BITSTREAM_DEFAULT           = VIDEO_BITSTREAM_SVC,
 } VIDEO_BITSTREAM_TYPE;
 
-/**
-* @brief Enumerate the type of key frame request
-*/
 typedef enum {
   NO_RECOVERY_REQUSET  = 0,
   LTR_RECOVERY_REQUEST = 1,
   IDR_RECOVERY_REQUEST = 2,
   NO_LTR_MARKING_FEEDBACK = 3,
   LTR_MARKING_SUCCESS = 4,
-  LTR_MARKING_FAILED = 5
+  LTR_MARKING_FAILED = 5,
 } KEY_FRAME_REQUEST_TYPE;
 
-/**
-* @brief Structure for LTR recover request
-*/
 typedef struct {
-  unsigned int uiFeedbackType;       ///< IDR request or LTR recovery request
-  unsigned int uiIDRPicId;           ///< distinguish request from different IDR
-  int          iLastCorrectFrameNum;
-  int          iCurrentFrameNum;     ///< specify current decoder frame_num.
+  unsigned int uiFeedbackType; //IDR request or LTR recovery request
+  unsigned int uiIDRPicId; // distinguish request from different IDR
+  int		  iLastCorrectFrameNum;
+  int		  iCurrentFrameNum; //specify current decoder frame_num.
 } SLTRRecoverRequest;
 
-/**
-* @brief Structure for LTR marking feedback
-*/
 typedef struct {
-  unsigned int  uiFeedbackType; ///< mark failed or successful
-  unsigned int  uiIDRPicId;     ///< distinguish request from different IDR
-  int           iLTRFrameNum;   ///< specify current decoder frame_num
+  unsigned int  uiFeedbackType; //mark failed or successful
+  unsigned int  uiIDRPicId; // distinguish request from different IDR
+  int			  iLTRFrameNum; //specify current decoder frame_num
 } SLTRMarkingFeedback;
 
-/**
-* @brief Structure for LTR configuration
-*/
 typedef struct {
-  bool   bEnableLongTermReference; ///< 1: on, 0: off
-  int    iLTRRefNum;               ///< TODO: not supported to set it arbitrary yet
-} SLTRConfig;
+  unsigned int
+  uiSliceMbNum[MAX_SLICES_NUM_TMP];  //here we use a tmp fixed value since MAX_SLICES_NUM is not defined here and its definition may be changed;
+  unsigned int		uiSliceNum;
+  unsigned int		uiSliceSizeConstraint;
+} SSliceArgument;//not all the elements in this argument will be used, how it will be used depends on uiSliceMode; see below
 
-/**
-* @brief Enumerate the type of rate control mode
-*/
 typedef enum {
-  RC_QUALITY_MODE = 0,     ///< quality mode
-  RC_BITRATE_MODE = 1,     ///< bitrate mode
-  RC_BUFFERBASED_MODE = 2, ///< no bitrate control,only using buffer status,adjust the video quality
-  RC_TIMESTAMP_MODE = 3, //rate control based timestamp
-  RC_BITRATE_MODE_POST_SKIP = 4, ///< this is in-building RC MODE, WILL BE DELETED after algorithm tuning!
-  RC_OFF_MODE = -1,         ///< rate control off mode
+  SM_SINGLE_SLICE         = 0, //	| SliceNum==1
+  SM_FIXEDSLCNUM_SLICE    = 1, //	| according to SliceNum		| Enabled dynamic slicing for multi-thread
+  SM_RASTER_SLICE         = 2, //	| according to SlicesAssign	| Need input of MB numbers each slice. In addition, if other constraint in SSliceArgument is presented, need to follow the constraints. Typically if MB num and slice size are both constrained, re-encoding may be involved.
+  SM_ROWMB_SLICE          = 3, //	| according to PictureMBHeight	| Typical of single row of mbs each slice?+ slice size constraint which including re-encoding
+  SM_DYN_SLICE            = 4, //	| according to SliceSize	| Dynamic slicing (have no idea about slice_nums until encoding current frame)
+  SM_AUTO_SLICE           = 5, //   | according to thread number
+  SM_RESERVED             = 6
+} SliceModeEnum;
+
+typedef enum {
+  RC_QUALITY_MODE = 0,      //Quality mode
+  RC_BITRATE_MODE = 1,   //Bitrate mode
+  RC_LOW_BW_MODE = 2, //bitrate limited mode
+  RC_BUFFERBASED_MODE = 3,//no bitrate control,only using buffer status,adjust the video quality
+  RC_OFF_MODE = -1,    // rate control off mode
 } RC_MODES;
 
-/**
-* @brief Enumerate the type of profile id
-*/
 typedef enum {
-  PRO_UNKNOWN   = 0,
-  PRO_BASELINE  = 66,
-  PRO_MAIN      = 77,
-  PRO_EXTENDED  = 88,
-  PRO_HIGH      = 100,
-  PRO_HIGH10    = 110,
-  PRO_HIGH422   = 122,
-  PRO_HIGH444   = 144,
-  PRO_CAVLC444  = 244,
+  PRO_UNKNOWN     = 0,
+  PRO_BASELINE	= 66,
+  PRO_MAIN		= 77,
+  PRO_EXTENDED	= 88,
+  PRO_HIGH		= 100,
+  PRO_HIGH10		= 110,
+  PRO_HIGH422		= 122,
+  PRO_HIGH444		= 144,
+  PRO_CAVLC444	= 244,
 
-  PRO_SCALABLE_BASELINE = 83,
-  PRO_SCALABLE_HIGH     = 86
+  PRO_SCALABLE_BASELINE	= 83,
+  PRO_SCALABLE_HIGH		= 86,
 } EProfileIdc;
 
-/**
-* @brief Enumerate the type of level id
-*/
 typedef enum {
   LEVEL_UNKNOWN,
   LEVEL_1_0,
@@ -307,435 +238,191 @@ typedef enum {
   LEVEL_5_2
 } ELevelIdc;
 
-/**
-* @brief Enumerate the type of wels log
-*/
+
 enum {
-  WELS_LOG_QUIET       = 0x00,          ///< quiet mode
-  WELS_LOG_ERROR       = 1 << 0,        ///< error log iLevel
-  WELS_LOG_WARNING     = 1 << 1,        ///< Warning log iLevel
-  WELS_LOG_INFO        = 1 << 2,        ///< information log iLevel
-  WELS_LOG_DEBUG       = 1 << 3,        ///< debug log, critical algo log
-  WELS_LOG_DETAIL      = 1 << 4,        ///< per packet/frame log
-  WELS_LOG_RESV        = 1 << 5,        ///< resversed log iLevel
+  WELS_LOG_QUIET		= 0x00,		// Quiet mode
+  WELS_LOG_ERROR		= 1 << 0,	// Error log iLevel
+  WELS_LOG_WARNING	= 1 << 1,	// Warning log iLevel
+  WELS_LOG_INFO		= 1 << 2,	// Information log iLevel
+  WELS_LOG_DEBUG		= 1 << 3,	// Debug log, critical algo log
+  WELS_LOG_DETAIL		= 1 << 4,	// per packet/frame log
+  WELS_LOG_RESV		= 1 << 5,	// Resversed log iLevel
   WELS_LOG_LEVEL_COUNT = 6,
-  WELS_LOG_DEFAULT     = WELS_LOG_WARNING   ///< default log iLevel in Wels codec
+  WELS_LOG_DEFAULT	= WELS_LOG_DEBUG	// Default log iLevel in Wels codec
 };
 
-/**
- * @brief Enumerate the type of slice mode
- */
-typedef enum {
-  SM_SINGLE_SLICE         = 0, ///< | SliceNum==1
-  SM_FIXEDSLCNUM_SLICE    = 1, ///< | according to SliceNum        | enabled dynamic slicing for multi-thread
-  SM_RASTER_SLICE         = 2, ///< | according to SlicesAssign    | need input of MB numbers each slice. In addition, if other constraint in SSliceArgument is presented, need to follow the constraints. Typically if MB num and slice size are both constrained, re-encoding may be involved.
-  SM_SIZELIMITED_SLICE           = 3, ///< | according to SliceSize       | slicing according to size, the slicing will be dynamic(have no idea about slice_nums until encoding current frame)
-  SM_RESERVED             = 4
-} SliceModeEnum;
-
-/**
- * @brief Structure for slice argument
- */
 typedef struct {
-  SliceModeEnum uiSliceMode;    ///< by default, uiSliceMode will be SM_SINGLE_SLICE
-  unsigned int  uiSliceNum;     ///< only used when uiSliceMode=1, when uiSliceNum=0 means auto design it with cpu core number
-  unsigned int  uiSliceMbNum[MAX_SLICES_NUM_TMP]; ///< only used when uiSliceMode=2; when =0 means setting one MB row a slice
-  unsigned int  uiSliceSizeConstraint; ///< now only used when uiSliceMode=4
-} SSliceArgument;
-
-/**
-* @brief Enumerate the type of video format
-*/
-typedef enum {
-  VF_COMPONENT,
-  VF_PAL,
-  VF_NTSC,
-  VF_SECAM,
-  VF_MAC,
-  VF_UNDEF,
-  VF_NUM_ENUM
-} EVideoFormatSPS;	// EVideoFormat is already defined/used elsewhere!
-
-/**
-* @brief Enumerate the type of color primaries
-*/
-typedef enum {
-  CP_RESERVED0,
-  CP_BT709,
-  CP_UNDEF,
-  CP_RESERVED3,
-  CP_BT470M,
-  CP_BT470BG,
-  CP_SMPTE170M,
-  CP_SMPTE240M,
-  CP_FILM,
-  CP_BT2020,
-  CP_NUM_ENUM
-} EColorPrimaries;
-
-/**
-* @brief Enumerate the type of transfer characteristics
-*/
-typedef enum {
-  TRC_RESERVED0,
-  TRC_BT709,
-  TRC_UNDEF,
-  TRC_RESERVED3,
-  TRC_BT470M,
-  TRC_BT470BG,
-  TRC_SMPTE170M,
-  TRC_SMPTE240M,
-  TRC_LINEAR,
-  TRC_LOG100,
-  TRC_LOG316,
-  TRC_IEC61966_2_4,
-  TRC_BT1361E,
-  TRC_IEC61966_2_1,
-  TRC_BT2020_10,
-  TRC_BT2020_12,
-  TRC_NUM_ENUM
-} ETransferCharacteristics;
-
-/**
-* @brief Enumerate the type of color matrix
-*/
-typedef enum {
-  CM_GBR,
-  CM_BT709,
-  CM_UNDEF,
-  CM_RESERVED3,
-  CM_FCC,
-  CM_BT470BG,
-  CM_SMPTE170M,
-  CM_SMPTE240M,
-  CM_YCGCO,
-  CM_BT2020NC,
-  CM_BT2020C,
-  CM_NUM_ENUM
-} EColorMatrix;
-
-/**
-* @brief  Structure for spatial layer configuration
-*/
-typedef struct {
-  int   iVideoWidth;           ///< width of picture in luminance samples of a layer
-  int   iVideoHeight;          ///< height of picture in luminance samples of a layer
-  float fFrameRate;            ///< frame rate specified for a layer
-  int   iSpatialBitrate;       ///< target bitrate for a spatial layer, in unit of bps
-  int   iMaxSpatialBitrate;    ///< maximum  bitrate for a spatial layer, in unit of bps
-  EProfileIdc  uiProfileIdc;   ///< value of profile IDC (PRO_UNKNOWN for auto-detection)
-  ELevelIdc    uiLevelIdc;     ///< value of profile IDC (0 for auto-detection)
-  int          iDLayerQp;      ///< value of level IDC (0 for auto-detection)
-
+  SliceModeEnum uiSliceMode; //by default, uiSliceMode will be SM_SINGLE_SLICE
   SSliceArgument sSliceArgument;
+} SSliceConfig;
 
-  // Note: members bVideoSignalTypePresent through uiColorMatrix below are also defined in SWelsSPS in parameter_sets.h.
-  bool			bVideoSignalTypePresent;	// false => do not write any of the following information to the header
-  unsigned char	uiVideoFormat;				// EVideoFormatSPS; 3 bits in header; 0-5 => component, kpal, ntsc, secam, mac, undef
-  bool			bFullRange;					// false => analog video data range [16, 235]; true => full data range [0,255]
-  bool			bColorDescriptionPresent;	// false => do not write any of the following three items to the header
-  unsigned char	uiColorPrimaries;			// EColorPrimaries; 8 bits in header; 0 - 9 => ???, bt709, undef, ???, bt470m, bt470bg,
-                                            //    smpte170m, smpte240m, film, bt2020
-  unsigned char	uiTransferCharacteristics;	// ETransferCharacteristics; 8 bits in header; 0 - 15 => ???, bt709, undef, ???, bt470m, bt470bg, smpte170m,
-										    //   smpte240m, linear, log100, log316, iec61966-2-4, bt1361e, iec61966-2-1, bt2020-10, bt2020-12
-  unsigned char	uiColorMatrix;				// EColorMatrix; 8 bits in header (corresponds to FFmpeg "colorspace"); 0 - 10 => GBR, bt709,
-										    //   undef, ???, fcc, bt470bg, smpte170m, smpte240m, YCgCo, bt2020nc, bt2020c
+typedef struct {
+  int	iVideoWidth;		// video size in cx specified for a layer
+  int	iVideoHeight;		// video size in cy specified for a layer
+  float	fFrameRate;		// frame rate specified for a layer
+  int	iSpatialBitrate;	// target bitrate for a spatial layer
+  int   iMaxSpatialBitrate;
+  EProfileIdc    uiProfileIdc;	// value of profile IDC (PRO_UNKNOWN for auto-detection)
+  ELevelIdc    uiLevelIdc;
+  int    iDLayerQp;
+
+  SSliceConfig sSliceCfg;
 } SSpatialLayerConfig;
 
-/**
-* @brief Encoder usage type
-*/
 typedef enum {
-  CAMERA_VIDEO_REAL_TIME,      ///< camera video for real-time communication
-  SCREEN_CONTENT_REAL_TIME,    ///< screen content signal
-  CAMERA_VIDEO_NON_REAL_TIME
+  CAMERA_VIDEO_REAL_TIME, //camera video signal
+  SCREEN_CONTENT_REAL_TIME,//screen content signal
 } EUsageType;
 
-/**
-* @brief Enumulate the complexity mode
-*/
 typedef enum {
-  LOW_COMPLEXITY,             ///< the lowest compleixty,the fastest speed,
-  MEDIUM_COMPLEXITY,          ///< medium complexity, medium speed,medium quality
-  HIGH_COMPLEXITY             ///< high complexity, lowest speed, high quality
+  LOW_COMPLEXITY, //the lowest compleixty,the fastest speed,
+  MEDIUM_COMPLEXITY, //medium complexity, medium speed,medium quality
+  HIGH_COMPLEXITY, //high complexity, lowest speed, high quality
 } ECOMPLEXITY_MODE;
-
-/**
- * @brief Enumulate for the stategy of SPS/PPS strategy
- */
-typedef enum {
-  CONSTANT_ID = 0,           ///< constant id in SPS/PPS
-  INCREASING_ID = 0x01,      ///< SPS/PPS id increases at each IDR
-  SPS_LISTING  = 0x02,       ///< using SPS in the existing list if possible
-  SPS_LISTING_AND_PPS_INCREASING  = 0x03,
-  SPS_PPS_LISTING  = 0x06,
-} EParameterSetStrategy;
-
 // TODO:  Refine the parameters definition.
-/**
-* @brief SVC Encoding Parameters
-*/
+// SVC Encoding Parameters
 typedef struct TagEncParamBase {
   EUsageType
-  iUsageType;                 ///< application type;1.CAMERA_VIDEO_REAL_TIME:camera video signal; 2.SCREEN_CONTENT_REAL_TIME:screen content signal;
+  iUsageType;	//application type;// CAMERA_VIDEO_REAL_TIME: //camera video signal; SCREEN_CONTENT_REAL_TIME: screen content signal;
 
-  int       iPicWidth;        ///< width of picture in luminance samples (the maximum of all layers if multiple spatial layers presents)
-  int       iPicHeight;       ///< height of picture in luminance samples((the maximum of all layers if multiple spatial layers presents)
-  int       iTargetBitrate;   ///< target bitrate desired, in unit of bps
-  RC_MODES  iRCMode;          ///< rate control mode
-  float     fMaxFrameRate;    ///< maximal input frame rate
+  int		iPicWidth;			// width of picture in samples
+  int		iPicHeight;			// height of picture in samples
+  int		iTargetBitrate;		// target bitrate desired
+  RC_MODES      iRCMode;                 // RC mode
+  float	    fMaxFrameRate;			// input maximal frame rate
 
 } SEncParamBase, *PEncParamBase;
 
-/**
-* @brief SVC Encoding Parameters extention
-*/
+
 typedef struct TagEncParamExt {
   EUsageType
-  iUsageType;                          ///< application type;1.CAMERA_VIDEO_REAL_TIME:camera video signal;2.SCREEN_CONTENT_REAL_TIME:screen content signal;
+  iUsageType;	//application type;// CAMERA_VIDEO_REAL_TIME: //camera video signal; SCREEN_CONTENT_REAL_TIME: screen content signal;
 
-  int       iPicWidth;                 ///< width of picture in luminance samples (the maximum of all layers if multiple spatial layers presents)
-  int       iPicHeight;                ///< height of picture in luminance samples((the maximum of all layers if multiple spatial layers presents)
-  int       iTargetBitrate;            ///< target bitrate desired, in unit of bps
-  RC_MODES  iRCMode;                   ///< rate control mode
-  float     fMaxFrameRate;             ///< maximal input frame rate
+  int		iPicWidth;			// width of picture in samples
+  int		iPicHeight;			// height of picture in samples
+  int		iTargetBitrate;		// target bitrate desired
+  RC_MODES      iRCMode;                 // RC mode
+  float	    fMaxFrameRate;			// input maximal frame rate
 
-  int       iTemporalLayerNum;         ///< temporal layer number, max temporal layer = 4
-  int       iSpatialLayerNum;          ///< spatial layer number,1<= iSpatialLayerNum <= MAX_SPATIAL_LAYER_NUM, MAX_SPATIAL_LAYER_NUM = 4
+  int		iTemporalLayerNum;	// layer number at temporal level
+  int		iSpatialLayerNum;	// layer number at spatial level
   SSpatialLayerConfig sSpatialLayers[MAX_SPATIAL_LAYER_NUM];
 
   ECOMPLEXITY_MODE iComplexityMode;
-  unsigned int      uiIntraPeriod;     ///< period of Intra frame
-  int               iNumRefFrame;      ///< number of reference frame used
-  EParameterSetStrategy
-  eSpsPpsIdStrategy;       ///< different stategy in adjust ID in SPS/PPS: 0- constant ID, 1-additional ID, 6-mapping and additional
-  bool    bPrefixNalAddingCtrl;        ///< false:not use Prefix NAL; true: use Prefix NAL
-  bool    bEnableSSEI;                 ///< false:not use SSEI; true: use SSEI -- TODO: planning to remove the interface of SSEI
-  bool    bSimulcastAVC;               ///< (when encoding more than 1 spatial layer) false: use SVC syntax for higher layers; true: use Simulcast AVC
-  int     iPaddingFlag;                ///< 0:disable padding;1:padding
-  int     iEntropyCodingModeFlag;      ///< 0:CAVLC  1:CABAC.
+  unsigned int		uiIntraPeriod;		// period of Intra frame
+  int		        iNumRefFrame;		// number of reference frame used
+  bool    bEnableSpsPpsIdAddition;
+  bool    bPrefixNalAddingCtrl;
+  bool	  bEnableSSEI;
+  int      iPaddingFlag;            // 0:disable padding;1:padding
+  int      iEntropyCodingModeFlag;
 
   /* rc control */
-  bool    bEnableFrameSkip;            ///< False: don't skip frame even if VBV buffer overflow.True: allow skipping frames to keep the bitrate within limits
-  int     iMaxBitrate;                 ///< the maximum bitrate, in unit of bps, set it to UNSPECIFIED_BIT_RATE if not needed
-  int     iMaxQp;                      ///< the maximum QP encoder supports
-  int     iMinQp;                      ///< the minmum QP encoder supports
-  unsigned int uiMaxNalSize;           ///< the maximum NAL size.  This value should be not 0 for dynamic slice mode
+  bool    bEnableFrameSkip; // allow skipping frames to keep the bitrate within limits
+  int     iMaxBitrate;        // max bitrate desired
+  int     iMaxQp;
+  int     iMinQp;
+  unsigned int uiMaxNalSize;
 
   /*LTR settings*/
-  bool     bEnableLongTermReference;   ///< 1: on, 0: off
-  int      iLTRRefNum;                 ///< the number of LTR(long term reference),TODO: not supported to set it arbitrary yet
-  unsigned int      iLtrMarkPeriod;    ///< the LTR marked period that is used in feedback.
+  bool     bEnableLongTermReference; // 0: on, 1: off
+  int	   iLTRRefNum;
+  unsigned int      iLtrMarkPeriod;
+
   /* multi-thread settings*/
   unsigned short
-  iMultipleThreadIdc;                  ///< 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; lager than 1: count number of threads;
-  bool  bUseLoadBalancing; ///< only used when uiSliceMode=1 or 3, will change slicing of a picture during the run-time of multi-thread encoding, so the result of each run may be different
+  iMultipleThreadIdc;		// 1	# 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
 
   /* Deblocking loop filter */
-  int       iLoopFilterDisableIdc;     ///< 0: on, 1: off, 2: on except for slice boundaries
-  int       iLoopFilterAlphaC0Offset;  ///< AlphaOffset: valid range [-6, 6], default 0
-  int       iLoopFilterBetaOffset;     ///< BetaOffset: valid range [-6, 6], default 0
+  int		iLoopFilterDisableIdc;	// 0: on, 1: off, 2: on except for slice boundaries
+  int		iLoopFilterAlphaC0Offset;// AlphaOffset: valid range [-6, 6], default 0
+  int		iLoopFilterBetaOffset;	// BetaOffset:	valid range [-6, 6], default 0
   /*pre-processing feature*/
-  bool    bEnableDenoise;              ///< denoise control
-  bool    bEnableBackgroundDetection;  ///< background detection control //VAA_BACKGROUND_DETECTION //BGD cmd
-  bool    bEnableAdaptiveQuant;        ///< adaptive quantization control
-  bool    bEnableFrameCroppingFlag;    ///< enable frame cropping flag: TRUE always in application
+  bool    bEnableDenoise;	    // denoise control
+  bool    bEnableBackgroundDetection;// background detection control //VAA_BACKGROUND_DETECTION //BGD cmd
+  bool    bEnableAdaptiveQuant; // adaptive quantization control
+  bool	  bEnableFrameCroppingFlag;// enable frame cropping flag: TRUE always in application
   bool    bEnableSceneChangeDetect;
-
-  bool    bIsLosslessLink;            ///<  LTR advanced setting
 } SEncParamExt;
 
-/**
-* @brief Define a new struct to show the property of video bitstream.
-*/
+//Define a new struct to show the property of video bitstream.
 typedef struct {
-  unsigned int          size;          ///< size of the struct
-  VIDEO_BITSTREAM_TYPE  eVideoBsType;  ///< video stream type (AVC/SVC)
+  unsigned int          size; //size of the struct
+  VIDEO_BITSTREAM_TYPE  eVideoBsType;
 } SVideoProperty;
 
-/**
-* @brief SVC Decoding Parameters, reserved here and potential applicable in the future
-*/
+/* SVC Decoding Parameters, reserved here and potential applicable in the future */
 typedef struct TagSVCDecodingParam {
-  char*     pFileNameRestructed;       ///< file name of reconstructed frame used for PSNR calculation based debug
+  char*		pFileNameRestructed;	// File name of restructed frame used for PSNR calculation based debug
 
-  unsigned int  uiCpuLoad;             ///< CPU load
-  unsigned char uiTargetDqLayer;       ///< setting target dq layer id
+  int				iOutputColorFormat;	// color space format to be outputed, EVideoFormatType specified in codec_def.h
+  unsigned int	uiCpuLoad;		// CPU load
+  unsigned char	uiTargetDqLayer;	// Setting target dq layer id
 
-  ERROR_CON_IDC eEcActiveIdc;          ///< whether active error concealment feature in decoder
-  bool bParseOnly;                     ///< decoder for parse only, no reconstruction. When it is true, SPS/PPS size should not exceed SPS_PPS_BS_SIZE (128). Otherwise, it will return error info
+  unsigned char	uiEcActiveFlag;		// Whether active error concealment feature in decoder
 
-  SVideoProperty   sVideoProperty;    ///< video stream property
+  SVideoProperty   sVideoProperty;
 } SDecodingParam, *PDecodingParam;
 
-/**
-* @brief Bitstream inforamtion of a layer being encoded
-*/
+/* Bitstream inforamtion of a layer being encoded */
 typedef struct {
   unsigned char uiTemporalId;
   unsigned char uiSpatialId;
   unsigned char uiQualityId;
-  EVideoFrameType eFrameType;
+
   unsigned char uiLayerType;
 
-  /**
-   * The sub sequence layers are ordered hierarchically based on their dependency on each other so that any picture in a layer shall not be
-   * predicted from any picture on any higher layer.
-  */
-  int   iSubSeqId;                ///< refer to D.2.11 Sub-sequence information SEI message semantics
-  int   iNalCount;              ///< count number of NAL coded already
-  int*  pNalLengthInByte;       ///< length of NAL size in byte from 0 to iNalCount-1
-  unsigned char*  pBsBuf;       ///< buffer of bitstream contained
+  int	iNalCount;					// Count number of NAL coded already
+  int*	pNalLengthInByte;	// Length of NAL size in byte from 0 to iNalCount-1
+  unsigned char*	pBsBuf;		// Buffer of bitstream contained
 } SLayerBSInfo, *PLayerBSInfo;
 
-/**
-* @brief Frame bit stream info
-*/
+
 typedef struct {
-  int           iLayerNum;
-  SLayerBSInfo  sLayerInfo[MAX_LAYER_NUM_OF_FRAME];
+  int		iTemporalId;	// Temporal ID
+  //The sub sequence layers are ordered hierarchically based on their dependency on each other so that any picture in a layer shall not be
+  //predicted from any picture on any higher layer.
+  int	  iSubSeqId;  //refer to D.2.11 Sub-sequence information SEI message semantics
+
+  int		iLayerNum;
+  SLayerBSInfo	sLayerInfo[MAX_LAYER_NUM_OF_FRAME];
 
   EVideoFrameType eFrameType;
-  int iFrameSizeInBytes;
   long long uiTimeStamp;
 } SFrameBSInfo, *PFrameBSInfo;
 
-/**
-*  @brief Structure for source picture
-*/
 typedef struct Source_Picture_s {
-  int       iColorFormat;          ///< color space type
-  int       iStride[4];            ///< stride for each plane pData
-  unsigned char*  pData[4];        ///< plane pData
-  int       iPicWidth;             ///< luma picture width in x coordinate
-  int       iPicHeight;            ///< luma picture height in y coordinate
-  long long uiTimeStamp;           ///< timestamp of the source picture, unit: millisecond
+  int		    iColorFormat;	// color space type
+  int  		iStride[4];		// stride for each plane pData
+  unsigned char*  pData[4];		// plane pData
+  int  		iPicWidth;				// luma picture width in x coordinate
+  int 		iPicHeight;				// luma picture height in y coordinate
+  long long uiTimeStamp;
 } SSourcePicture;
-/**
-* @brief Structure for bit rate info
-*/
+
 typedef struct TagBitrateInfo {
   LAYER_NUM iLayer;
-  int iBitrate;                    ///< the maximum bitrate
+  int iBitrate;    //the maximum bitrate
 } SBitrateInfo;
 
-/**
-* @brief Structure for dump layer info
-*/
 typedef struct TagDumpLayer {
   int iLayer;
   char* pFileName;
 } SDumpLayer;
 
-/**
-* @brief Structure for profile info in layer
-*
-*/
 typedef struct TagProfileInfo {
   int iLayer;
-  EProfileIdc uiProfileIdc;        ///< the profile info
+  EProfileIdc uiProfileIdc;    //the profile info
 } SProfileInfo;
 
-/**
-* @brief  Structure for level info in layer
-*
-*/
 typedef struct TagLevelInfo {
   int iLayer;
-  ELevelIdc uiLevelIdc;            ///< the level info
+  ELevelIdc uiLevelIdc;    //the level info
 } SLevelInfo;
-/**
-* @brief Structure for dilivery status
-*
-*/
+
 typedef struct TagDeliveryStatus {
-  bool bDeliveryFlag;              ///< 0: the previous frame isn't delivered,1: the previous frame is delivered
-  int iDropFrameType;              ///< the frame type that is dropped; reserved
-  int iDropFrameSize;              ///< the frame size that is dropped; reserved
+  int iDropNum;      //the number of video frames that are dropped continuously before delivery to encoder, which is used by screen content.
+  int iDropFrameType; // the frame type that is dropped
+  int iDropFrameSize; // the frame size that is dropped
 } SDeliveryStatus;
-
-/**
-* @brief The capability of decoder, for SDP negotiation
-*/
-typedef struct TagDecoderCapability {
-  int iProfileIdc;     ///< profile_idc
-  int iProfileIop;     ///< profile-iop
-  int iLevelIdc;       ///< level_idc
-  int iMaxMbps;        ///< max-mbps
-  int iMaxFs;          ///< max-fs
-  int iMaxCpb;         ///< max-cpb
-  int iMaxDpb;         ///< max-dpb
-  int iMaxBr;          ///< max-br
-  bool bRedPicCap;     ///< redundant-pic-cap
-} SDecoderCapability;
-
-/**
-* @brief to do
-*/
-typedef struct TagParserBsInfo {
-  int iNalNum;                                 ///< total NAL number in current AU
-  int iNalLenInByte [MAX_NAL_UNITS_IN_LAYER];  ///< each nal length
-  unsigned char* pDstBuff;                     ///< outputted dst buffer for parsed bitstream
-  int iSpsWidthInPixel;                        ///< required SPS width info
-  int iSpsHeightInPixel;                       ///< required SPS height info
-  unsigned long long uiInBsTimeStamp;               ///< input BS timestamp
-  unsigned long long uiOutBsTimeStamp;             ///< output BS timestamp
-} SParserBsInfo, *PParserBsInfo;
-
-/**
-* @brief Structure for encoder statistics
-*/
-typedef struct TagVideoEncoderStatistics {
-  unsigned int uiWidth;                        ///< the width of encoded frame
-  unsigned int uiHeight;                       ///< the height of encoded frame
-  //following standard, will be 16x aligned, if there are multiple spatial, this is of the highest
-  float fAverageFrameSpeedInMs;                ///< average_Encoding_Time
-
-  // rate control related
-  float fAverageFrameRate;                     ///< the average frame rate in, calculate since encoding starts, supposed that the input timestamp is in unit of ms
-  float fLatestFrameRate;                      ///< the frame rate in, in the last second, supposed that the input timestamp is in unit of ms (? useful for checking BR, but is it easy to calculate?
-  unsigned int uiBitRate;                      ///< sendrate in Bits per second, calculated within the set time-window
-  unsigned int uiAverageFrameQP;                    ///< the average QP of last encoded frame
-
-  unsigned int uiInputFrameCount;              ///< number of frames
-  unsigned int uiSkippedFrameCount;            ///< number of frames
-
-  unsigned int uiResolutionChangeTimes;        ///< uiResolutionChangeTimes
-  unsigned int uiIDRReqNum;                    ///< number of IDR requests
-  unsigned int uiIDRSentNum;                   ///< number of actual IDRs sent
-  unsigned int uiLTRSentNum;                   ///< number of LTR sent/marked
-
-  long long    iStatisticsTs;                  ///< Timestamp of updating the statistics
-} SEncoderStatistics; // in building, coming soon
-
-/**
-* @brief  Structure for decoder statistics
-*/
-typedef struct TagVideoDecoderStatistics {
-  unsigned int uiWidth;                        ///< the width of encode/decode frame
-  unsigned int uiHeight;                       ///< the height of encode/decode frame
-  float fAverageFrameSpeedInMs;                ///< average_Decoding_Time
-  float fActualAverageFrameSpeedInMs;          ///< actual average_Decoding_Time, including freezing pictures
-  unsigned int uiDecodedFrameCount;            ///< number of frames
-  unsigned int uiResolutionChangeTimes;        ///< uiResolutionChangeTimes
-  unsigned int uiIDRCorrectNum;                ///< number of correct IDR received
-  //EC on related
-  unsigned int
-  uiAvgEcRatio;                                ///< when EC is on, the average ratio of total EC areas, can be an indicator of reconstruction quality
-  unsigned int
-  uiAvgEcPropRatio;                            ///< when EC is on, the rough average ratio of propogate EC areas, can be an indicator of reconstruction quality
-  unsigned int uiEcIDRNum;                     ///< number of actual unintegrity IDR or not received but eced
-  unsigned int uiEcFrameNum;                   ///<
-  unsigned int uiIDRLostNum;                   ///< number of whole lost IDR
-  unsigned int uiFreezingIDRNum;               ///< number of freezing IDR with error (partly received), under resolution change
-  unsigned int uiFreezingNonIDRNum;            ///< number of freezing non-IDR with error
-  int iAvgLumaQp;                              ///< average luma QP. default: -1, no correct frame outputted
-  int iSpsReportErrorNum;                      ///< number of Sps Invalid report
-  int iSubSpsReportErrorNum;                   ///< number of SubSps Invalid report
-  int iPpsReportErrorNum;                      ///< number of Pps Invalid report
-  int iSpsNoExistNalNum;                       ///< number of Sps NoExist Nal
-  int iSubSpsNoExistNalNum;                    ///< number of SubSps NoExist Nal
-  int iPpsNoExistNalNum;                       ///< number of Pps NoExist Nal
-} SDecoderStatistics; // in building, coming soon
-
 #endif//WELS_VIDEO_CODEC_APPLICATION_DEFINITION_H__

codec/api/svc/codec_def.h

@@ -33,15 +33,9 @@
 #ifndef WELS_VIDEO_CODEC_DEFINITION_H__
 #define WELS_VIDEO_CODEC_DEFINITION_H__
 
-/**
-  * @file  codec_def.h
-*/
-
-/**
-* @brief Enumerate the type of video format
-*/
 typedef enum {
-  videoFormatRGB        = 1,             ///< rgb color formats
+  /*rgb color formats*/
+  videoFormatRGB        = 1,
   videoFormatRGBA       = 2,
   videoFormatRGB555     = 3,
   videoFormatRGB565     = 4,
@@ -50,66 +44,56 @@ typedef enum {
   videoFormatABGR       = 7,
   videoFormatARGB       = 8,
 
-  videoFormatYUY2       = 20,            ///< yuv color formats
+  /*yuv color formats*/
+  videoFormatYUY2       = 20,
   videoFormatYVYU       = 21,
   videoFormatUYVY       = 22,
-  videoFormatI420       = 23,            ///< the same as IYUV
+  videoFormatI420       = 23,                        //same as IYUV
   videoFormatYV12       = 24,
-  videoFormatInternal   = 25,            ///< only used in SVC decoder testbed
+  videoFormatInternal   = 25,                        // Only Used for SVC decoder testbed
 
-  videoFormatNV12       = 26,            ///< new format for output by DXVA decoding
+  videoFormatNV12		  = 26,						// new format for output by DXVA decoding
 
   videoFormatVFlip      = 0x80000000
 } EVideoFormatType;
 
-/**
-* @brief Enumerate  video frame type
-*/
 typedef enum {
-  videoFrameTypeInvalid,    ///< encoder not ready or parameters are invalidate
-  videoFrameTypeIDR,        ///< IDR frame in H.264
-  videoFrameTypeI,          ///< I frame type
-  videoFrameTypeP,          ///< P frame type
-  videoFrameTypeSkip,       ///< skip the frame based encoder kernel
-  videoFrameTypeIPMixed     ///< a frame where I and P slices are mixing, not supported yet
+  videoFrameTypeInvalid,		/* Encoder not ready or parameters are invalidate */
+  videoFrameTypeIDR,		/* This type is only available for H264 if this frame is key frame, then return this type */
+  videoFrameTypeI,		/* I frame type */
+  videoFrameTypeP,		/* P frame type */
+  videoFrameTypeSkip,		/* Skip the frame based encoder kernel */
+  videoFrameTypeIPMixed,		/* Frame type introduced I and P slices are mixing */
 } EVideoFrameType;
 
-/**
-* @brief Enumerate  return type
-*/
 typedef enum {
-  cmResultSuccess,          ///< successful
-  cmInitParaError,          ///< parameters are invalid
-  cmUnknownReason,
-  cmMallocMemeError,        ///< malloc a memory error
-  cmInitExpected,           ///< initial action is expected
-  cmUnsupportedData
+  cmResultSuccess,
+  cmInitParaError,                  /*Parameters are invalid */
+  cmUnkonwReason,
+  cmMallocMemeError,                /*Malloc a memory error*/
+  cmInitExpected,			  /*Initial action is expected*/
+  cmUnsupportedData,
 } CM_RETURN;
 
-/**
-* @brief Enumulate the nal unit type
-*/
+/* nal unit type */
 enum ENalUnitType {
-  NAL_UNKNOWN     = 0,
-  NAL_SLICE       = 1,
+  NAL_UNKNOWN = 0,
+  NAL_SLICE   = 1,
   NAL_SLICE_DPA   = 2,
   NAL_SLICE_DPB   = 3,
   NAL_SLICE_DPC   = 4,
-  NAL_SLICE_IDR   = 5,      ///< ref_idc != 0
-  NAL_SEI         = 6,      ///< ref_idc == 0
+  NAL_SLICE_IDR   = 5,    /* ref_idc != 0 */
+  NAL_SEI         = 6,    /* ref_idc == 0 */
   NAL_SPS         = 7,
   NAL_PPS         = 8
-                    ///< ref_idc == 0 for 6,9,10,11,12
+                    /* ref_idc == 0 for 6,9,10,11,12 */
 };
-
-/**
-* @brief NRI: eNalRefIdc
-*/
+/* NRI: eNalRefIdc */
 enum ENalPriority {
   NAL_PRIORITY_DISPOSABLE = 0,
   NAL_PRIORITY_LOW        = 1,
   NAL_PRIORITY_HIGH       = 2,
-  NAL_PRIORITY_HIGHEST    = 3
+  NAL_PRIORITY_HIGHEST    = 3,
 };
 
 #define IS_PARAMETER_SET_NAL(eNalRefIdc, eNalType) \
@@ -118,96 +102,87 @@ enum ENalPriority {
 #define IS_IDR_NAL(eNalRefIdc, eNalType) \
 ( (eNalRefIdc == NAL_PRIORITY_HIGHEST) && (eNalType == NAL_SLICE_IDR) )
 
-#define FRAME_NUM_PARAM_SET     (-1)
-#define FRAME_NUM_IDR           0
-
-/**
- * @brief eDeblockingIdc
- */
-enum {
-  DEBLOCKING_IDC_0 = 0,
-  DEBLOCKING_IDC_1 = 1,
-  DEBLOCKING_IDC_2 = 2
-};
-#define DEBLOCKING_OFFSET (6)
-#define DEBLOCKING_OFFSET_MINUS (-6)
+#define FRAME_NUM_PARAM_SET		(-1)
+#define FRAME_NUM_IDR			0
 
 /* Error Tools definition */
 typedef unsigned short ERR_TOOL;
-
-/**
- @brief to do
-*/
 enum {
-  ET_NONE = 0x00,           ///< NONE Error Tools
-  ET_IP_SCALE = 0x01,       ///< IP Scalable
-  ET_FMO = 0x02,            ///< Flexible Macroblock Ordering
-  ET_IR_R1 = 0x04,          ///< Intra Refresh in predifined 2% MB
-  ET_IR_R2 = 0x08,          ///< Intra Refresh in predifined 5% MB
-  ET_IR_R3 = 0x10,          ///< Intra Refresh in predifined 10% MB
-  ET_FEC_HALF = 0x20,       ///< Forward Error Correction in 50% redundency mode
-  ET_FEC_FULL = 0x40,       ///< Forward Error Correction in 100% redundency mode
-  ET_RFS = 0x80             ///< Reference Frame Selection
+  ET_NONE = 0x00,					// NONE Error Tools
+  ET_IP_SCALE = 0x01,				// IP Scalable
+  ET_FMO = 0x02,					// Flexible Macroblock Ordering
+  ET_IR_R1 = 0x04,				// Intra Refresh in predifined 2% MB
+  ET_IR_R2 = 0x08,				// Intra Refresh in predifined 5% MB
+  ET_IR_R3 = 0x10,				// Intra Refresh in predifined 10% MB
+  ET_FEC_HALF = 0x20,				// Forward Error Correction in 50% redundency mode
+  ET_FEC_FULL	= 0x40,				// Forward Error Correction in 100% redundency mode
+  ET_RFS = 0x80,					// Reference Frame Selection
 };
 
-/**
-* @brief Information of coded Slice(=NAL)(s)
-*/
+/* information of coded Slice(=NAL)(s) */
 typedef struct SliceInformation {
-  unsigned char* pBufferOfSlices;    ///< base buffer of coded slice(s)
-  int            iCodedSliceCount;   ///< number of coded slices
-  unsigned int*  pLengthOfSlices;    ///< array of slices length accordingly by number of slice
-  int            iFecType;           ///< FEC type[0, 50%FEC, 100%FEC]
-  unsigned char  uiSliceIdx;         ///< index of slice in frame [FMO: 0,..,uiSliceCount-1; No FMO: 0]
-  unsigned char  uiSliceCount;       ///< count number of slice in frame [FMO: 2-8; No FMO: 1]
-  char           iFrameIndex;        ///< index of frame[-1, .., idr_interval-1]
-  unsigned char  uiNalRefIdc;        ///< NRI, priority level of slice(NAL)
-  unsigned char  uiNalType;          ///< NAL type
+  unsigned char*	pBufferOfSlices;		// base buffer of coded slice(s)
+  int				iCodedSliceCount;	// number of coded slices
+  unsigned int*	pLengthOfSlices;		// array of slices length accordingly by number of slice
+  int				iFecType;			// FEC type[0, 50%FEC, 100%FEC]
+  unsigned char	uiSliceIdx;		// index of slice in frame [FMO: 0,..,uiSliceCount-1; No FMO: 0]
+  unsigned char	uiSliceCount;		// count number of slice in frame [FMO: 2-8; No FMO: 1]
+  char			iFrameIndex;		// index of frame[-1, .., idr_interval-1]
+  unsigned char	uiNalRefIdc;		// NRI, priority level of slice(NAL)
+  unsigned char	uiNalType;			// NAL type
   unsigned char
-  uiContainingFinalNal;              ///< whether final NAL is involved in buffer of coded slices, flag used in Pause feature in T27
+  uiContainingFinalNal;	// whether final NAL is involved in buffer of coded slices, flag used in Pause feature in T27
 } SliceInfo, *PSliceInfo;
 
-/**
-* @brief thresholds of the initial, maximal and minimal rate
-*/
+
+
+#define CIF_WIDTH		352
+#define CIF_HEIGHT		288
+#define QVGA_WIDTH		320
+#define QVGA_HEIGHT		240
+#define QCIF_WIDTH		176
+#define QCIF_HEIGHT		144
+#define SQCIF_WIDTH		128
+#define SQCIF_HEIGHT	96
+
+/* thresholds of the initial, maximal and minimal rate */
 typedef struct {
-  int   iWidth;                   ///< frame width
-  int   iHeight;                  ///< frame height
-  int   iThresholdOfInitRate;     ///< threshold of initial rate
-  int   iThresholdOfMaxRate;      ///< threshold of maximal rate
-  int   iThresholdOfMinRate;      ///< threshold of minimal rate
-  int   iMinThresholdFrameRate;   ///< min frame rate min
-  int   iSkipFrameRate;           ///< skip to frame rate min
-  int   iSkipFrameStep;           ///< how many frames to skip
+  int	iWidth;			// frame width
+  int	iHeight;			// frame height
+  int	iThresholdOfInitRate;	// threshold of initial rate
+  int	iThresholdOfMaxRate;	// threshold of maximal rate
+  int	iThresholdOfMinRate;	// threshold of minimal rate
+  int iMinThresholdFrameRate;		//min frame rate min
+  int	iSkipFrameRate;	//skip to frame rate min
+  int iSkipFrameStep;	//how many frames to skip
 } SRateThresholds, *PRateThresholds;
 
-/**
-* @brief  Structure for decoder memery
-*/
 typedef struct TagSysMemBuffer {
-  int iWidth;                    ///< width of decoded pic for display
-  int iHeight;                   ///< height of decoded pic for display
-  int iFormat;                   ///< type is "EVideoFormatType"
-  int iStride[2];                ///< stride of 2 component
+  int	iWidth;			//width of decoded pic for display
+  int iHeight;			//height of decoded pic for display
+  int iFormat; 		// type is "EVideoFormatType"
+  int iStride[2];		//stride of 2 component
 } SSysMEMBuffer;
 
-/**
-* @brief  Buffer info
-*/
 typedef struct TagBufferInfo {
-  int iBufferStatus;             ///< 0: one frame data is not ready; 1: one frame data is ready
-  unsigned long long uiInBsTimeStamp;     ///< input BS timestamp
-  unsigned long long uiOutYuvTimeStamp;     ///< output YUV timestamp, when bufferstatus is 1
+  int iBufferStatus;  // 0: one frame data is not ready; 1: one frame data is ready
   union {
-    SSysMEMBuffer sSystemBuffer; ///<  memory info for one picture
-  } UsrData;                     ///<  output buffer info
+    SSysMEMBuffer sSystemBuffer;
+  } UsrData;
 } SBufferInfo;
 
+/* Constants related to transmission rate at various resolutions */
+static const SRateThresholds ksRateThrMap[4] = {
+  // initial-maximal-minimal
+  {CIF_WIDTH, CIF_HEIGHT, 225000, 384000, 96000, 3, 1, 1},		// CIF
+  {QVGA_WIDTH, QVGA_HEIGHT, 192000, 320000, 80000, -1, -1, -1},	// QVGA
+  {QCIF_WIDTH, QCIF_HEIGHT, 150000, 256000, 64000, 8, 4, 2},		// QCIF
+  {SQCIF_WIDTH, SQCIF_HEIGHT, 120000, 192000, 48000, 5, 3, 1}	// SQCIF
+};
 
-/**
-* @brief In a GOP, multiple of the key frame number, derived from
-*        the number of layers(index or array below)
-*/
+
+// In a GOP, multiple of the key frame number, derived from
+// the number of layers(index or array below)
 static const char kiKeyNumMultiple[] = {
   1, 1, 2, 4, 8, 16,
 };

codec/api/svc/codec_ver.h

@@ -1,15 +0,0 @@
-//The current file is auto-generated by script: generate_codec_ver.sh
-#ifndef CODEC_VER_H
-#define CODEC_VER_H
-
-#include "codec_app_def.h"
-
-static const OpenH264Version g_stCodecVersion  = {1, 6, 0, 0};
-static const char* const g_strCodecVer  = "OpenH264 version:1.6.0.0";
-
-#define OPENH264_MAJOR (1)
-#define OPENH264_MINOR (6)
-#define OPENH264_REVISION (0)
-#define OPENH264_RESERVED (0)
-
-#endif  // CODEC_VER_H

codec/build/android/dec/src/com/wels/dec/WelsDecTest.java

@@ -3,7 +3,6 @@ package com.wels.dec;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Process;
 import android.util.Log;
 
 import android.view.KeyEvent;
@@ -16,136 +15,103 @@ import java.io.*;
 import java.util.Vector;
 
 public class WelsDecTest extends Activity {
-  /** Called when the activity is first created. */
-  private OnClickListener OnClickEvent;
-  private Button mBtnLoad, mBtnStartSW;
+    /** Called when the activity is first created. */
+    private OnClickListener OnClickEvent;
+    private Button mBtnLoad, mBtnStartSW;
 
-  final String   mStreamPath = "/sdcard/welsdec/";
-  Vector<String> mStreamFiles = new Vector<String>();
+    final String   mStreamPath = "/sdcard/wels-seq/";
+    Vector<String> mStreamFiles = new Vector<String>();
 
-  @Override
-  public void onCreate (Bundle savedInstanceState) {
-    super.onCreate (savedInstanceState);
-    final TextView  tv = new TextView (this);
-    System.out.println ("Here we go ...");
-    Log.i (TAG, "sdcard path:" + Environment.getExternalStorageDirectory().getAbsolutePath());
-    setContentView (R.layout.main);
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final TextView  tv = new TextView(this);
+        System.out.println("Here we go ...");
+        Log.i(TAG, "sdcard path:" + Environment.getExternalStorageDirectory().getAbsolutePath());
+        setContentView(R.layout.main);
 
-    mBtnLoad = (Button)findViewById (R.id.cfg);
-    mBtnStartSW = (Button)findViewById (R.id.buttonSW);
+        mBtnLoad = (Button)findViewById(R.id.cfg);
+        mBtnStartSW = (Button)findViewById(R.id.buttonSW);
 
-    OnClickEvent = new OnClickListener() {
-      public void onClick (View v) {
-        switch (v.getId()) {
-        case R.id.cfg: {
-          String cfgFile = mStreamPath + "BitStreams.txt";
-          try {
-            BufferedReader bufferedReader = new BufferedReader (new FileReader (cfgFile));
-            String text;
-            while ((text = bufferedReader.readLine()) != null) {
-              mStreamFiles.add (mStreamPath + text);
-              Log.i (TAG, mStreamPath + text);
+        OnClickEvent = new OnClickListener()
+        {
+            public void onClick(View v)
+            {
+                switch(v.getId())
+                {
+                case R.id.cfg:
+                {
+                    String cfgFile = mStreamPath + "BitStreams.txt";
+                    try {
+                        BufferedReader bufferedReader = new BufferedReader(new FileReader(cfgFile));
+                        String text;
+                        while((text = bufferedReader.readLine()) != null) {
+                            mStreamFiles.add(mStreamPath + text);
+                            Log.i(TAG, mStreamPath + text);
+                        }
+                        bufferedReader.close();
+                    } catch(IOException e) {
+                        Log.e("WELS_DEC", e.getMessage());
+                    }
+                }
+                break;
+                case R.id.buttonSW:
+                {
+                    System.out.println("decode sequence number = " + mStreamFiles.size());
+                    Log.i("WSE_DEC","after click");
+                    try {
+                        for (int k=0; k < mStreamFiles.size(); k++) {
+                            String inFile =  mStreamFiles.get(k);
+                            String outFile =  mStreamFiles.get(k) + ".yuv";
+                            Log.i(TAG, "input file:" + inFile+ "    output file:" + outFile);
+                            DoDecoderTest(inFile, outFile);
+                        }
+                    } catch (Exception e) {
+                        Log.e(TAG, e.getMessage());
+                    }
+                    mStreamFiles.clear();
+                    tv.setText( "Decoder is completed!" );
+                }
+                break;
+                }
             }
-            bufferedReader.close();
-          } catch (IOException e) {
-            Log.e ("WELS_DEC", e.getMessage());
-          }
-        }
-        break;
-        case R.id.buttonSW: {
-          System.out.println ("decode sequence number = " + mStreamFiles.size());
-          Log.i ("WSE_DEC", "after click");
-          try {
-            for (int k = 0; k < mStreamFiles.size(); k++) {
-              String inFile =  mStreamFiles.get (k);
-              String outFile =  mStreamFiles.get (k) + ".yuv";
-              Log.i (TAG, "input file:" + inFile + "    output file:" + outFile);
-              DoDecoderTest (inFile, outFile);
-            }
-          } catch (Exception e) {
-            Log.e (TAG, e.getMessage());
-          }
-          mStreamFiles.clear();
-          tv.setText ("Decoder is completed!");
-        }
-        break;
-        }
-      }
-    };
+        };
 
-    mBtnLoad.setOnClickListener (OnClickEvent);
-    mBtnStartSW.setOnClickListener (OnClickEvent);
+        mBtnLoad.setOnClickListener(OnClickEvent);
+        mBtnStartSW.setOnClickListener(OnClickEvent);
 
-    System.out.println ("Done!");
-    //if you want to run the demo manually, just comment following 2 lines
-    runAutoDec();
-  }
-  public void runAutoDec() {
-    Thread thread = new Thread() {
-
-      public void run() {
-        Log.i (TAG, "decoder performance test begin");
-
-        File bitstreams = new File (mStreamPath);
-        String[] list = bitstreams.list();
-        if (list == null || list.length == 0) {
-          Log.i (TAG, "have not find any coder resourse");
-          finish();
-        }
-        for (int i = 0; i < list.length; i++) {
-
-          String inFile = list[i];
-          inFile = mStreamPath + inFile;
-          String outFile = inFile + ".yuv";
-          DoDecoderTest (inFile, outFile);
-
-
-        }
-        Log.i (TAG, "decoder performance test finish");
-        finish();
-      }
-
-    };
-    thread.start();
-
-  }
-
-  @Override
-  public void onStart() {
-    Log.i ("WSE_DEC", "welsdecdemo onStart");
-    super.onStart();
-  }
-  @Override
-  public void onDestroy() {
-    super.onDestroy();
-
-    Log.i (TAG, "OnDestroy");
-
-    Process.killProcess (Process.myPid());
-
-  }
-
-  @Override
-  public boolean onKeyDown (int keyCode, KeyEvent event) {
-    switch (keyCode) {
-    case KeyEvent.KEYCODE_BACK:
-      return true;
-    default:
-      return super.onKeyDown (keyCode, event);
+        System.out.println("Done!");
     }
-  }
 
-  public native void  DoDecoderTest (String infilename, String outfilename);
-  private static final String TAG = "welsdec";
-  static {
-    try {
-      System.loadLibrary ("openh264");
-      System.loadLibrary ("stlport_shared");
-      System.loadLibrary ("welsdecdemo");
-      Log.v (TAG, "Load libwelsdec successful");
-    } catch (Exception e) {
-      Log.e (TAG, "Failed to load welsdec" + e.getMessage());
+    @Override
+    public void onStart()
+    {
+        Log.i("WSE_DEC","welsdecdemo onStart");
+        super.onStart();
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+        case KeyEvent.KEYCODE_BACK:
+            return true;
+        default:
+            return super.onKeyDown(keyCode, event);
+        }
+    }
+
+    public native void  DoDecoderTest(String infilename, String outfilename);
+    private static final String TAG = "welsdec";
+    static {
+        try {
+            System.loadLibrary("openh264");
+            System.loadLibrary("stlport_shared");
+            System.loadLibrary("welsdecdemo");
+            Log.v(TAG, "Load libwelsdec successful");
+        }
+        catch(Exception e) {
+            Log.e(TAG, "Failed to load welsdec"+e.getMessage());
+        }
     }
-  }
 }
 

codec/build/android/enc/jni/myjni.cpp

@@ -8,33 +8,12 @@
 
 extern "C" int EncMain (int argc, char* argv[]);
 extern "C"
-JNIEXPORT void JNICALL Java_com_wels_enc_WelsEncTest_DoEncoderAutoTest
-(JNIEnv* env, jobject thiz, jstring jsIncfgName, jstring jsInlayerName, jstring jsInyuvName, jstring jsOutbitName) {
-  /**************** Add the native codes/API *****************/
-  const char* argv[] = {
-    (char*) ("encConsole.exe"),
-    (char*) ((*env).GetStringUTFChars (jsIncfgName, NULL)),
-    (char*) ("-org"),
-    (char*) ((*env).GetStringUTFChars (jsInyuvName, NULL)),
-    (char*) ("-bf"),
-    (char*) ((*env).GetStringUTFChars (jsOutbitName, NULL)),
-    (char*) ("-numl"),
-    (char*) ("1"),
-    (char*) ("-lconfig"),
-    (char*) ("0"),
-    (char*) ((*env).GetStringUTFChars (jsInlayerName, NULL))
-  };
-  LOGI ("Start to run JNI module!+++");
-  EncMain (sizeof (argv) / sizeof (argv[0]), (char**)&argv[0]);
-  LOGI ("End to run JNI module!+++");
-}
-
 JNIEXPORT void JNICALL Java_com_wels_enc_WelsEncTest_DoEncoderTest
 (JNIEnv* env, jobject thiz, jstring jsFileNameIn) {
   /**************** Add the native codes/API *****************/
   char* argv[2];
   int  argc = 2;
-  argv[0] = (char*) ("encConsole.exe");
+  argv[0] = (char*) ("decConsole.exe");
   argv[1] = (char*) ((*env).GetStringUTFChars (jsFileNameIn, NULL));
   LOGI ("Start to run JNI module!+++");
   EncMain (argc, argv);

codec/build/android/enc/src/com/wels/enc/WelsEncTest.java

@@ -3,7 +3,6 @@ package com.wels.enc;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Process;
 import android.util.Log;
 
 import android.view.KeyEvent;
@@ -16,158 +15,104 @@ import java.io.*;
 import java.util.Vector;
 
 public class WelsEncTest extends Activity {
-  /** Called when the activity is first created. */
-  private OnClickListener OnClickEvent;
-  private Button mBtnLoad, mBtnStartSW;
+    /** Called when the activity is first created. */
+    private OnClickListener OnClickEvent;
+    private Button mBtnLoad, mBtnStartSW;
 
-  final String   mStreamPath = "/sdcard/welsenc/";
-  Vector<String> mCfgFiles = new Vector<String>();
+    final String   mStreamPath = "/sdcard/wels-seq/";
+    Vector<String> mCfgFiles = new Vector<String>();
 
-  @Override
-  public void onCreate (Bundle savedInstanceState) {
-    super.onCreate (savedInstanceState);
-    final TextView  tv = new TextView (this);
-    System.out.println ("Here we go ...");
-    Log.i (TAG, "sdcard path:" + Environment.getExternalStorageDirectory().getAbsolutePath());
-    setContentView (R.layout.main);
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final TextView  tv = new TextView(this);
+        System.out.println("Here we go ...");
+        Log.i(TAG, "sdcard path:" + Environment.getExternalStorageDirectory().getAbsolutePath());
+        setContentView(R.layout.main);
 
-    mBtnLoad = (Button)findViewById (R.id.cfg);
-    mBtnStartSW = (Button)findViewById (R.id.buttonSW);
+        mBtnLoad = (Button)findViewById(R.id.cfg);
+        mBtnStartSW = (Button)findViewById(R.id.buttonSW);
 
 
-    OnClickEvent = new OnClickListener() {
-      public void onClick (View v) {
-        switch (v.getId()) {
-        case R.id.cfg: {
-          String cfgFile = mStreamPath + "cfgs.txt";
-          try {
-            BufferedReader bufferedReader = new BufferedReader (new FileReader (cfgFile));
-            String text;
-            while ((text = bufferedReader.readLine()) != null) {
-              mCfgFiles.add (mStreamPath + text);
-              Log.i (TAG, mStreamPath + text);
+        OnClickEvent = new OnClickListener()
+        {
+            public void onClick(View v)
+            {
+                switch(v.getId())
+                {
+                case R.id.cfg:
+                {
+                    String cfgFile = mStreamPath + "cfgs.txt";
+                    try {
+                        BufferedReader bufferedReader = new BufferedReader(new FileReader(cfgFile));
+                        String text;
+                        while((text = bufferedReader.readLine()) != null) {
+                            mCfgFiles.add(mStreamPath + text);
+                            Log.i(TAG, mStreamPath + text);
+                        }
+                        bufferedReader.close();
+                    } catch(IOException e) {
+                        Log.e(TAG, e.getMessage());
+                    }
+                }
+                break;
+                case R.id.buttonSW:
+                {
+                    System.out.println("decode sequence number = " + mCfgFiles.size());
+                    Log.i(TAG,"after click");
+                    try {
+                        for (int k=0; k < mCfgFiles.size(); k++) {
+                            String cfgFile =  mCfgFiles.get(k);
+                            DoEncoderTest(cfgFile);
+                        }
+                    } catch (Exception e) {
+                        Log.e(TAG, e.getMessage());
+                    }
+                    mCfgFiles.clear();
+                    tv.setText( "Decoder is completed!" );
+                }
+                break;
+                }
             }
-            bufferedReader.close();
-          } catch (IOException e) {
-            Log.e (TAG, e.getMessage());
-          }
-        }
-        break;
-        case R.id.buttonSW: {
-          System.out.println ("encode sequence number = " + mCfgFiles.size());
-          Log.i (TAG, "after click");
-          try {
-            for (int k = 0; k < mCfgFiles.size(); k++) {
-              String cfgFile =  mCfgFiles.get (k);
-              DoEncoderTest (cfgFile);
-            }
-          } catch (Exception e) {
-            Log.e (TAG, e.getMessage());
-          }
-          mCfgFiles.clear();
-          tv.setText ("Encoder is completed!");
-        }
-        break;
-        }
-      }
-    };
+        };
 
-    mBtnLoad.setOnClickListener (OnClickEvent);
-    mBtnStartSW.setOnClickListener (OnClickEvent);
+        mBtnLoad.setOnClickListener(OnClickEvent);
+        mBtnStartSW.setOnClickListener(OnClickEvent);
 
-    System.out.println ("Done!");
-    //run the test automatically,if you not want to autotest, just comment this line
-    runAutoEnc();
-  }
-
-  public void runAutoEnc() {
-    Thread thread = new Thread() {
-
-      public void run() {
-        Log.i (TAG, "encoder performance test begin");
-        String inYuvfile = null, outBitfile = null, inOrgfile = null, inLayerfile = null;
-        File encCase = new File (mStreamPath);
-        String[] caseNum = encCase.list();
-        if (caseNum == null || caseNum.length == 0) {
-          Log.i (TAG, "have not find any encoder resourse");
-          finish();
-        }
-
-        for (int i = 0; i < caseNum.length; i++) {
-          String[] yuvName = null;
-          File yuvPath = null;
-          File encCaseNo = new File (mStreamPath + caseNum[i]);
-          String[] encFile = encCaseNo.list();
-
-          for (int k = 0; k < encFile.length; k++) {
-            if (encFile[k].compareToIgnoreCase ("welsenc.cfg") == 0)
-
-              inOrgfile = encCaseNo + File.separator + encFile[k];
-
-            else if (encFile[k].compareToIgnoreCase ("layer2.cfg") == 0)
-              inLayerfile = encCaseNo + File.separator + encFile[k];
-            else if (encFile[k].compareToIgnoreCase ("yuv") == 0) {
-              yuvPath = new File (encCaseNo + File.separator + encFile[k]);
-              yuvName = yuvPath.list();
-            }
-          }
-          for (int m = 0; m < yuvName.length; m++) {
-            inYuvfile = yuvPath + File.separator + yuvName[m];
-            outBitfile = inYuvfile + ".264";
-            Log.i (TAG, "enc yuv file:" + yuvName[m]);
-            DoEncoderAutoTest (inOrgfile, inLayerfile, inYuvfile, outBitfile);
-          }
-        }
-
-        Log.i (TAG, "encoder performance test finish");
-        finish();
-      }
-
-    };
-    thread.start();
-
-  }
-
-  @Override
-  public void onStart() {
-    Log.i (TAG, "welsencdemo onStart");
-    super.onStart();
-  }
-
-  @Override
-  public void onDestroy() {
-    super.onDestroy();
-
-    Log.i (TAG, "OnDestroy");
-
-    Process.killProcess (Process.myPid());
-
-  }
-
-  @Override
-  public boolean onKeyDown (int keyCode, KeyEvent event) {
-    switch (keyCode) {
-    case KeyEvent.KEYCODE_BACK:
-      return true;
-    default:
-      return super.onKeyDown (keyCode, event);
+        System.out.println("Done!");
     }
-  }
 
-  public native void  DoEncoderTest (String cfgFileName);
-  public native void  DoEncoderAutoTest (String cfgFileName, String layerFileName, String yuvFileName,
-                                         String outBitsName);
-  private static final String TAG = "welsenc";
-  static {
-    try {
-      System.loadLibrary ("openh264");
-      System.loadLibrary ("stlport_shared");
-      System.loadLibrary ("welsencdemo");
-      Log.v (TAG, "Load libwelsencdemo.so successful");
-    } catch (Exception e) {
-      Log.e (TAG, "Failed to load welsenc" + e.getMessage());
+    @Override
+    public void onStart()
+    {
+        Log.i(TAG,"welsdecdemo onStart");
+        super.onStart();
+    }
+
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+        case KeyEvent.KEYCODE_BACK:
+            return true;
+        default:
+            return super.onKeyDown(keyCode, event);
+        }
+    }
+
+    public native void  DoEncoderTest(String cfgFileName);
+    private static final String TAG = "welsenc";
+    static {
+        try {
+            System.loadLibrary("openh264");
+            System.loadLibrary("stlport_shared");
+            System.loadLibrary("welsencdemo");
+            Log.v(TAG, "Load libwelsencdemo.so successful");
+        }
+        catch(Exception e) {
+            Log.e(TAG, "Failed to load welsdec"+e.getMessage());
+        }
     }
-  }
 
 }
 

codec/build/generate_codec_ver.sh

@@ -1,62 +0,0 @@
-# Run this to update the codec_ver.h at changes of api
-
-#!/bin/sh
-#
-
-if [ "$1"x = ""x ]; then
-        echo "Please input the version number as: major_ver.minor_ver.patch.reserve"
-        exit 127
-fi
-
-codec_ver=`echo "$1" | egrep  "^([0-9]+[.]){3}[0-9]+$"`
-
-if [ $? -ne 0 ]; then
-        echo "Please input the version number as: major_ver.minor_ver.patch.reserve"
-        exit 127
-fi
-
-revision=`git show | head -n 1`
-revision=`echo $revision|cut -d' ' -f2|sed -e 's#[ ]*\(.*\)[ ]*#\1#'`
-revision=${revision:0:7}
-
-echo "//The current file is auto-generated by script: generate_codec_ver.sh" >>codec_ver.h
-echo "#ifndef CODEC_VER_H" >>codec_ver.h
-echo "#define CODEC_VER_H" >>codec_ver.h
-echo "" >>codec_ver.h
-
-echo "#include \"codec_app_def.h\"" >>codec_ver.h
-echo "" >>codec_ver.h
-
-fullver="$1"
-major="${1%%.*}"
-tmp=${1#*.}
-minor="${tmp%%.*}"
-tmp=${tmp#*.}
-revnr="${tmp%%.*}"
-tmp=${tmp#*.}
-resnr="${tmp%%.*}"
-
-echo "static const OpenH264Version g_stCodecVersion  = {$major, $minor, $revnr, $resnr};" >>codec_ver.h
-echo "static const char* const g_strCodecVer  = \"OpenH264 version:$fullver\";" >>codec_ver.h
-#if [ "$2"x = ""x ]; then
-#echo "static const char* const g_strCodecBuildNum = \"OpenH264 revision:$revision\";" >> codec_ver.h
-#else
-#echo "static const char* const g_strCodecBuildNum = \"OpenH264 build:$2, OpenH264 revision:$revision\";" >> codec_ver.h
-#fi
-echo "" >>codec_ver.h
-
-#define OPENH264_MAJOR 1, #define OPENH264_MINOR 2 #define OPENH264_REVISION 3 #define OPENH264_RESERVED 0
-echo "#define OPENH264_MAJOR ($major)" >>codec_ver.h
-echo "#define OPENH264_MINOR ($minor)" >>codec_ver.h
-echo "#define OPENH264_REVISION ($revnr)" >>codec_ver.h
-echo "#define OPENH264_RESERVED ($resnr)" >>codec_ver.h
-echo "" >>codec_ver.h
-
-echo "#endif  // CODEC_VER_H" >>codec_ver.h
-
-mv -f codec_ver.h ../api/svc/codec_ver.h
-
-# Ignore non-utf8 chars in the input
-export LC_ALL=C
-cat ../../openh264.rc.template | sed "s/\$MAJOR/$major/g" | sed "s/\$MINOR/$minor/g" | sed "s/\$REVISION/$revnr/g" | sed "s/\$RESERVED/$resnr/g" > openh264.rc.tmp
-mv openh264.rc.tmp ../../openh264.rc

codec/build/iOS/common/common.xcodeproj/project.pbxproj

@@ -7,9 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0DD32A861B467902009181A1 /* WelsThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DD32A851B467902009181A1 /* WelsThread.cpp */; };
-		0DD32A881B467911009181A1 /* WelsTaskThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DD32A871B467911009181A1 /* WelsTaskThread.cpp */; };
-		0DD32A941B468F77009181A1 /* WelsThreadPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DD32A931B468F77009181A1 /* WelsThreadPool.cpp */; };
 		4C3406C918D96EA600DFA14A /* arm_arch_common_macro.S in Sources */ = {isa = PBXBuildFile; fileRef = 4C3406B218D96EA600DFA14A /* arm_arch_common_macro.S */; };
 		4C3406CA18D96EA600DFA14A /* deblocking_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4C3406B318D96EA600DFA14A /* deblocking_neon.S */; };
 		4C3406CB18D96EA600DFA14A /* expand_picture_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4C3406B418D96EA600DFA14A /* expand_picture_neon.S */; };
@@ -22,17 +19,12 @@
 		4CE443D918B722CD0017DF25 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE443D818B722CD0017DF25 /* Foundation.framework */; };
 		53C1C9BC193F0FB000404D8F /* expand_pic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53C1C9BB193F0FB000404D8F /* expand_pic.cpp */; };
 		5BA8F2C019603F5F00011CE4 /* common_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5BA8F2BF19603F5F00011CE4 /* common_tables.cpp */; };
-		5BD896BA1A7B839B00D32B7D /* memory_align.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5BD896B91A7B839B00D32B7D /* memory_align.cpp */; };
-		5BDD15ED1A79027600B6CA2E /* mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5BDD15EC1A79027600B6CA2E /* mc.cpp */; };
 		F0B204F918FD23BF005DA23F /* copy_mb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F0B204F818FD23BF005DA23F /* copy_mb.cpp */; };
 		F556A8241906673900E156A8 /* arm_arch64_common_macro.S in Sources */ = {isa = PBXBuildFile; fileRef = F556A8221906673900E156A8 /* arm_arch64_common_macro.S */; };
 		F556A8251906673900E156A8 /* expand_picture_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = F556A8231906673900E156A8 /* expand_picture_aarch64_neon.S */; };
 		F5AC94FF193EB7D800F58154 /* deblocking_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = F5AC94FE193EB7D800F58154 /* deblocking_aarch64_neon.S */; };
 		F5B8D82D190757290037849A /* mc_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = F5B8D82C190757290037849A /* mc_aarch64_neon.S */; };
 		F5BB0BB8196BB5960072D50D /* copy_mb_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = F5BB0BB7196BB5960072D50D /* copy_mb_aarch64_neon.S */; };
-		F791965419D3B89D00F60C6B /* intra_pred_common_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = F791965319D3B89D00F60C6B /* intra_pred_common_aarch64_neon.S */; };
-		F791965619D3B8A600F60C6B /* intra_pred_common_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = F791965519D3B8A600F60C6B /* intra_pred_common_neon.S */; };
-		F791965919D3BE2200F60C6B /* intra_pred_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F791965819D3BE2200F60C6B /* intra_pred_common.cpp */; };
 		FAABAA1818E9354A00D4186F /* sad_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAABAA1718E9354A00D4186F /* sad_common.cpp */; };
 /* End PBXBuildFile section */
 
@@ -49,16 +41,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0DB71EF31BAB273500EABC51 /* WelsCircleQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsCircleQueue.h; sourceTree = "<group>"; };
-		0DD32A851B467902009181A1 /* WelsThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WelsThread.cpp; sourceTree = "<group>"; };
-		0DD32A871B467911009181A1 /* WelsTaskThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WelsTaskThread.cpp; sourceTree = "<group>"; };
-		0DD32A8E1B467B83009181A1 /* WelsLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsLock.h; sourceTree = "<group>"; };
-		0DD32A8F1B467C73009181A1 /* WelsTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsTask.h; sourceTree = "<group>"; };
-		0DD32A901B467C73009181A1 /* WelsTaskThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsTaskThread.h; sourceTree = "<group>"; };
-		0DD32A911B467C73009181A1 /* WelsThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsThread.h; sourceTree = "<group>"; };
-		0DD32A921B467C73009181A1 /* WelsThreadPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsThreadPool.h; sourceTree = "<group>"; };
-		0DD32A931B468F77009181A1 /* WelsThreadPool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WelsThreadPool.cpp; sourceTree = "<group>"; };
-		0DEA477E1BB36FE100ADD134 /* WelsList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsList.h; sourceTree = "<group>"; };
 		4C3406B218D96EA600DFA14A /* arm_arch_common_macro.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = arm_arch_common_macro.S; sourceTree = "<group>"; };
 		4C3406B318D96EA600DFA14A /* deblocking_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = deblocking_neon.S; sourceTree = "<group>"; };
 		4C3406B418D96EA600DFA14A /* expand_picture_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = expand_picture_neon.S; sourceTree = "<group>"; };
@@ -69,6 +51,7 @@
 		4C3406BA18D96EA600DFA14A /* deblocking_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deblocking_common.h; sourceTree = "<group>"; };
 		4C3406BD18D96EA600DFA14A /* ls_defines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ls_defines.h; sourceTree = "<group>"; };
 		4C3406BE18D96EA600DFA14A /* macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macros.h; sourceTree = "<group>"; };
+		4C3406BF18D96EA600DFA14A /* mc_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mc_common.h; sourceTree = "<group>"; };
 		4C3406C018D96EA600DFA14A /* measure_time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = measure_time.h; sourceTree = "<group>"; };
 		4C3406C118D96EA600DFA14A /* typedefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typedefs.h; sourceTree = "<group>"; };
 		4C3406C218D96EA600DFA14A /* WelsThreadLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelsThreadLib.h; sourceTree = "<group>"; };
@@ -82,13 +65,8 @@
 		4CE443E918B722CD0017DF25 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
 		53C1C9BA193F0F9E00404D8F /* expand_pic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expand_pic.h; sourceTree = "<group>"; };
 		53C1C9BB193F0FB000404D8F /* expand_pic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = expand_pic.cpp; sourceTree = "<group>"; };
-		5B9196F91A7F8BA40075D641 /* wels_const_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_const_common.h; sourceTree = "<group>"; };
 		5BA8F2BE19603F3500011CE4 /* wels_common_defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_common_defs.h; sourceTree = "<group>"; };
 		5BA8F2BF19603F5F00011CE4 /* common_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = common_tables.cpp; sourceTree = "<group>"; };
-		5BD896B81A7B837700D32B7D /* memory_align.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory_align.h; sourceTree = "<group>"; };
-		5BD896B91A7B839B00D32B7D /* memory_align.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory_align.cpp; sourceTree = "<group>"; };
-		5BDD15EB1A79026A00B6CA2E /* mc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mc.h; sourceTree = "<group>"; };
-		5BDD15EC1A79027600B6CA2E /* mc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mc.cpp; sourceTree = "<group>"; };
 		F0B204F718FD23B6005DA23F /* copy_mb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = copy_mb.h; sourceTree = "<group>"; };
 		F0B204F818FD23BF005DA23F /* copy_mb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = copy_mb.cpp; sourceTree = "<group>"; };
 		F556A8221906673900E156A8 /* arm_arch64_common_macro.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = arm_arch64_common_macro.S; path = arm64/arm_arch64_common_macro.S; sourceTree = "<group>"; };
@@ -96,10 +74,6 @@
 		F5AC94FE193EB7D800F58154 /* deblocking_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = deblocking_aarch64_neon.S; path = arm64/deblocking_aarch64_neon.S; sourceTree = "<group>"; };
 		F5B8D82C190757290037849A /* mc_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = mc_aarch64_neon.S; path = arm64/mc_aarch64_neon.S; sourceTree = "<group>"; };
 		F5BB0BB7196BB5960072D50D /* copy_mb_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = copy_mb_aarch64_neon.S; path = arm64/copy_mb_aarch64_neon.S; sourceTree = "<group>"; };
-		F791965319D3B89D00F60C6B /* intra_pred_common_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = intra_pred_common_aarch64_neon.S; path = arm64/intra_pred_common_aarch64_neon.S; sourceTree = "<group>"; };
-		F791965519D3B8A600F60C6B /* intra_pred_common_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = intra_pred_common_neon.S; sourceTree = "<group>"; };
-		F791965719D3BA9300F60C6B /* intra_pred_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intra_pred_common.h; sourceTree = "<group>"; };
-		F791965819D3BE2200F60C6B /* intra_pred_common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intra_pred_common.cpp; sourceTree = "<group>"; };
 		FAABAA1618E9353F00D4186F /* sad_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sad_common.h; sourceTree = "<group>"; };
 		FAABAA1718E9354A00D4186F /* sad_common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sad_common.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -119,7 +93,6 @@
 		4C3406B118D96EA600DFA14A /* arm */ = {
 			isa = PBXGroup;
 			children = (
-				F791965519D3B8A600F60C6B /* intra_pred_common_neon.S */,
 				4CC61F0818FF6B4B00E56EAB /* copy_mb_neon.S */,
 				4C3406B218D96EA600DFA14A /* arm_arch_common_macro.S */,
 				4C3406B318D96EA600DFA14A /* deblocking_neon.S */,
@@ -132,7 +105,6 @@
 		4C3406B618D96EA600DFA14A /* inc */ = {
 			isa = PBXGroup;
 			children = (
-				F791965719D3BA9300F60C6B /* intra_pred_common.h */,
 				F0B204F718FD23B6005DA23F /* copy_mb.h */,
 				FAABAA1618E9353F00D4186F /* sad_common.h */,
 				4C3406B718D96EA600DFA14A /* cpu.h */,
@@ -142,19 +114,10 @@
 				4C3406BA18D96EA600DFA14A /* deblocking_common.h */,
 				4C3406BD18D96EA600DFA14A /* ls_defines.h */,
 				4C3406BE18D96EA600DFA14A /* macros.h */,
-				5BDD15EB1A79026A00B6CA2E /* mc.h */,
+				4C3406BF18D96EA600DFA14A /* mc_common.h */,
 				4C3406C018D96EA600DFA14A /* measure_time.h */,
-				5BD896B81A7B837700D32B7D /* memory_align.h */,
 				4C3406C118D96EA600DFA14A /* typedefs.h */,
 				5BA8F2BE19603F3500011CE4 /* wels_common_defs.h */,
-				0DB71EF31BAB273500EABC51 /* WelsCircleQueue.h */,
-				0DEA477E1BB36FE100ADD134 /* WelsList.h */,
-				0DD32A8E1B467B83009181A1 /* WelsLock.h */,
-				0DD32A8F1B467C73009181A1 /* WelsTask.h */,
-				0DD32A901B467C73009181A1 /* WelsTaskThread.h */,
-				0DD32A911B467C73009181A1 /* WelsThread.h */,
-				0DD32A921B467C73009181A1 /* WelsThreadPool.h */,
-				5B9196F91A7F8BA40075D641 /* wels_const_common.h */,
 				4C3406C218D96EA600DFA14A /* WelsThreadLib.h */,
 			);
 			path = inc;
@@ -163,7 +126,6 @@
 		4C3406C318D96EA600DFA14A /* src */ = {
 			isa = PBXGroup;
 			children = (
-				F791965819D3BE2200F60C6B /* intra_pred_common.cpp */,
 				5BA8F2BF19603F5F00011CE4 /* common_tables.cpp */,
 				F0B204F818FD23BF005DA23F /* copy_mb.cpp */,
 				FAABAA1718E9354A00D4186F /* sad_common.cpp */,
@@ -171,11 +133,6 @@
 				4C3406C518D96EA600DFA14A /* crt_util_safe_x.cpp */,
 				53C1C9BB193F0FB000404D8F /* expand_pic.cpp */,
 				4C3406C618D96EA600DFA14A /* deblocking_common.cpp */,
-				5BDD15EC1A79027600B6CA2E /* mc.cpp */,
-				5BD896B91A7B839B00D32B7D /* memory_align.cpp */,
-				0DD32A871B467911009181A1 /* WelsTaskThread.cpp */,
-				0DD32A931B468F77009181A1 /* WelsThreadPool.cpp */,
-				0DD32A851B467902009181A1 /* WelsThread.cpp */,
 				4C3406C818D96EA600DFA14A /* WelsThreadLib.cpp */,
 			);
 			path = src;
@@ -222,7 +179,6 @@
 		F556A81D1906669F00E156A8 /* arm64 */ = {
 			isa = PBXGroup;
 			children = (
-				F791965319D3B89D00F60C6B /* intra_pred_common_aarch64_neon.S */,
 				F5BB0BB7196BB5960072D50D /* copy_mb_aarch64_neon.S */,
 				F5AC94FE193EB7D800F58154 /* deblocking_aarch64_neon.S */,
 				F5B8D82C190757290037849A /* mc_aarch64_neon.S */,
@@ -283,25 +239,17 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0DD32A941B468F77009181A1 /* WelsThreadPool.cpp in Sources */,
 				F5B8D82D190757290037849A /* mc_aarch64_neon.S in Sources */,
 				4C3406C918D96EA600DFA14A /* arm_arch_common_macro.S in Sources */,
 				F556A8241906673900E156A8 /* arm_arch64_common_macro.S in Sources */,
-				5BDD15ED1A79027600B6CA2E /* mc.cpp in Sources */,
 				F5AC94FF193EB7D800F58154 /* deblocking_aarch64_neon.S in Sources */,
 				4C3406CE18D96EA600DFA14A /* crt_util_safe_x.cpp in Sources */,
-				F791965919D3BE2200F60C6B /* intra_pred_common.cpp in Sources */,
-				5BD896BA1A7B839B00D32B7D /* memory_align.cpp in Sources */,
-				0DD32A881B467911009181A1 /* WelsTaskThread.cpp in Sources */,
 				4C3406CF18D96EA600DFA14A /* deblocking_common.cpp in Sources */,
 				5BA8F2C019603F5F00011CE4 /* common_tables.cpp in Sources */,
-				0DD32A861B467902009181A1 /* WelsThread.cpp in Sources */,
-				F791965419D3B89D00F60C6B /* intra_pred_common_aarch64_neon.S in Sources */,
 				4C3406D118D96EA600DFA14A /* WelsThreadLib.cpp in Sources */,
 				4C3406CC18D96EA600DFA14A /* mc_neon.S in Sources */,
 				F5BB0BB8196BB5960072D50D /* copy_mb_aarch64_neon.S in Sources */,
 				4C3406CB18D96EA600DFA14A /* expand_picture_neon.S in Sources */,
-				F791965619D3B8A600F60C6B /* intra_pred_common_neon.S in Sources */,
 				4CC61F0918FF6B4B00E56EAB /* copy_mb_neon.S in Sources */,
 				53C1C9BC193F0FB000404D8F /* expand_pic.cpp in Sources */,
 				4C3406CD18D96EA600DFA14A /* cpu.cpp in Sources */,
@@ -346,7 +294,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
@@ -377,7 +325,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -406,11 +354,8 @@
 					HAVE_NEON,
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../../api/svc",
-				);
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -438,11 +383,7 @@
 					HAVE_NEON,
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../../api/svc",
-				);
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

codec/build/iOS/dec/demo/demo.xcodeproj/project.pbxproj

@@ -42,20 +42,6 @@
 			remoteGlobalIDString = 4CE4427918B6FC360017DF25;
 			remoteInfo = welsdec;
 		};
-		541044A6199888F800B44931 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 4CE444FA18B72AD70017DF25 /* welsdec.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 4CE4427818B6FC360017DF25;
-			remoteInfo = welsdec;
-		};
-		541044A8199888F800B44931 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 4CE444F018B72A8F0017DF25 /* common.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 4CE443D418B722CD0017DF25;
-			remoteInfo = common;
-		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -67,7 +53,7 @@
 		F0E6634D1810EFA5000C888E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		F0E663511810EFA5000C888E /* demo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "demo-Info.plist"; sourceTree = "<group>"; };
 		F0E663531810EFA5000C888E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F0E663551810EFA5000C888E /* main.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; path = main.m; sourceTree = "<group>"; };
+		F0E663551810EFA5000C888E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		F0E663581810EFA5000C888E /* DEMOAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DEMOAppDelegate.h; sourceTree = "<group>"; };
 		F0E663591810EFA5000C888E /* DEMOAppDelegate.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; path = DEMOAppDelegate.m; sourceTree = "<group>"; };
 		F0E6635B1810EFA5000C888E /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
@@ -220,8 +206,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				541044A7199888F800B44931 /* PBXTargetDependency */,
-				541044A9199888F800B44931 /* PBXTargetDependency */,
 			);
 			name = demo;
 			productName = demo;
@@ -315,19 +299,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		541044A7199888F800B44931 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = welsdec;
-			targetProxy = 541044A6199888F800B44931 /* PBXContainerItemProxy */;
-		};
-		541044A9199888F800B44931 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = common;
-			targetProxy = 541044A8199888F800B44931 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		F0E663521810EFA5000C888E /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
@@ -381,7 +352,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -406,7 +377,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -427,7 +398,6 @@
 					APPLE_IOS,
 				);
 				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
 					"\"$(SRCROOT)/../../../../api/svc\"",
 					"\"$(SRCROOT)/../../../../common/inc\"",
 				);
@@ -447,7 +417,6 @@
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_PREPROCESSOR_DEFINITIONS = APPLE_IOS;
 				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
 					"\"$(SRCROOT)/../../../../api/svc\"",
 					"\"$(SRCROOT)/../../../../common/inc\"",
 				);

codec/build/iOS/dec/demo/demo/DEMOViewController.m

@@ -47,7 +47,7 @@ extern int DecMain(int argc, char * argv[]);
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    // Do any additional setup after loading the view, typically from a nib.
+	// Do any additional setup after loading the view, typically from a nib.
     //Add the testing codes
     self.resFileArray = [[NSMutableArray alloc] init];
     self.selectedRow = 0;

codec/build/iOS/dec/demo/demo/main.m

@@ -34,91 +34,9 @@
 
 #import "DEMOAppDelegate.h"
 
-extern int DecMain (int argc, char* argv[]);
-
-//redirect NSLog and stdout to logfile
-void redirectLogToDocumentFile() {
-  NSArray* path = NSSearchPathForDirectoriesInDomains (NSDocumentDirectory, NSUserDomainMask, YES);
-  NSString* document = [path objectAtIndex:0];
-  NSString* fileName = [NSString stringWithFormat:@"decPerf.log"];
-  NSString* logPath = [document stringByAppendingPathComponent:fileName];
-
-  NSFileManager* defaultManager = [NSFileManager defaultManager];
-  [defaultManager removeItemAtPath:logPath error:nil];
-
-  freopen ([logPath cStringUsingEncoding:NSASCIIStringEncoding], "a+", stdout);
-  freopen ([logPath cStringUsingEncoding:NSASCIIStringEncoding], "a+", stderr);
-}
-
-
-//run auto test to get encoder performance
-int AutoTestDec() {
-
-
-  NSString* document = [[NSString alloc] init];
-  NSArray* paths = NSSearchPathForDirectoriesInDomains (NSDocumentDirectory, NSUserDomainMask, YES);
-  if ([paths count] == 0) {
-    NSLog (@"could not find document path");
-    return 2;
-  }
-  document = [paths objectAtIndex:0];
-
-
-  NSString* decFilePath = [document stringByAppendingString:@"/DecoderPerfTestRes"];
-  NSFileManager* manage = [NSFileManager defaultManager];
-
-  NSString* outYuvPath = [decFilePath stringByAppendingString:@"/yuv"];
-  [manage removeItemAtPath:outYuvPath error:nil];
-  [manage createDirectoryAtPath:outYuvPath withIntermediateDirectories:YES attributes:nil error: nil];
-
-
-  NSArray* bitstreams = [manage subpathsAtPath:decFilePath];
-  if (bitstreams == nil) {
-    NSLog (@"could not find any bitstream under decoderperfpath");
-    return 1;
-  }
-
-  redirectLogToDocumentFile(); //output to console, just comment this line
-
-  for (int caseNO = 0; caseNO < [bitstreams count]; caseNO++) {
-
-    NSString* caseName = [bitstreams objectAtIndex:caseNO];
-    if ([caseName  isEqual: @"yuv"]) {
-      break;
+int main(int argc, char *argv[])
+{
+    @autoreleasepool {
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([DEMOAppDelegate class]));
     }
-    NSString* bitstream = [decFilePath stringByAppendingString:@"/"];
-    bitstream = [bitstream stringByAppendingString:caseName];
-    NSString* yuvFileName = [caseName stringByAppendingString:@".yuv"];
-    NSString* tmpyuvFileName = [outYuvPath stringByAppendingString:@"/"];
-    yuvFileName = [tmpyuvFileName stringByAppendingString:yuvFileName];
-
-    [manage createFileAtPath:yuvFileName contents:nil attributes:nil];
-
-    const char* argvv[] = {
-      "decConsole.exe",
-      [bitstream UTF8String],
-      [yuvFileName UTF8String]
-    };
-    DecMain (sizeof (argvv) / sizeof (argvv[0]), (char**)&argvv[0]);
-    [manage removeItemAtPath:yuvFileName error:nil];//FOR limited devices spaces
-    fflush (stdout); // flush the content of stdout instantly
-  }
-
-
-  return 0;
-}
-
-int main (int argc, char* argv[]) {
-  //***For auto testing of decoder performance, call auto test here, if you not want to do auto test, you can comment it manualy
-
-  if (AutoTestDec() == 0)
-    NSLog (@"Auto testing running sucessfully");
-  else
-    NSLog (@"Auto testing running failed");
-  abort();
-  //********
-
-  @autoreleasepool {
-    return UIApplicationMain (argc, argv, nil, NSStringFromClass ([DEMOAppDelegate class]));
-  }
 }

codec/build/iOS/dec/welsdec/welsdec.xcodeproj/project.pbxproj

@@ -20,6 +20,8 @@
 		4CE4469318BC5EAB0017DF25 /* fmo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467018BC5EAA0017DF25 /* fmo.cpp */; };
 		4CE4469418BC5EAB0017DF25 /* get_intra_predictor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467118BC5EAA0017DF25 /* get_intra_predictor.cpp */; };
 		4CE4469518BC5EAB0017DF25 /* manage_dec_ref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467218BC5EAA0017DF25 /* manage_dec_ref.cpp */; };
+		4CE4469618BC5EAB0017DF25 /* mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467318BC5EAA0017DF25 /* mc.cpp */; };
+		4CE4469718BC5EAB0017DF25 /* mem_align.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467418BC5EAA0017DF25 /* mem_align.cpp */; };
 		4CE4469818BC5EAB0017DF25 /* memmgr_nal_unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467518BC5EAA0017DF25 /* memmgr_nal_unit.cpp */; };
 		4CE4469918BC5EAB0017DF25 /* mv_pred.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467618BC5EAA0017DF25 /* mv_pred.cpp */; };
 		4CE4469A18BC5EAB0017DF25 /* parse_mb_syn_cavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4467718BC5EAA0017DF25 /* parse_mb_syn_cavlc.cpp */; };
@@ -28,9 +30,7 @@
 		4CE4469F18BC5EAB0017DF25 /* welsDecoderExt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4468518BC5EAB0017DF25 /* welsDecoderExt.cpp */; };
 		4CE447AC18BC6BE90017DF25 /* block_add_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4CE447A718BC6BE90017DF25 /* block_add_neon.S */; };
 		4CE447AE18BC6BE90017DF25 /* intra_pred_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4CE447A918BC6BE90017DF25 /* intra_pred_neon.S */; };
-		6A3E814219D79AE900C19C1F /* cabac_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A3E814119D79AE900C19C1F /* cabac_decoder.cpp */; };
-		6A3E814419D7A40600C19C1F /* parse_mb_syn_cabac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A3E814319D7A40600C19C1F /* parse_mb_syn_cabac.cpp */; };
-		6C749B6A197CC6E600A111F9 /* block_add_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 6C749B69197CC6E600A111F9 /* block_add_aarch64_neon.S */; };
+		9ABF4382193EB60900A6BD61 /* expand_pic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9ABF4381193EB60900A6BD61 /* expand_pic.cpp */; };
 		9AED66561946A1DE009A3567 /* welsCodecTrace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AED66551946A1DE009A3567 /* welsCodecTrace.cpp */; };
 		9AED66591946A203009A3567 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AED66581946A203009A3567 /* utils.cpp */; };
 		F0B204FC18FD23D8005DA23F /* error_concealment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F0B204FB18FD23D8005DA23F /* error_concealment.cpp */; };
@@ -49,11 +49,11 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		04FE0680196FD8BE0004D7CE /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../../../common/inc/version.h; sourceTree = "<group>"; };
 		4CBC1B80194AC4E100214D9E /* intra_pred_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = intra_pred_aarch64_neon.S; path = arm64/intra_pred_aarch64_neon.S; sourceTree = "<group>"; };
 		4CE4427918B6FC360017DF25 /* libwelsdec.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwelsdec.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CE4427C18B6FC360017DF25 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		4CE4428D18B6FC360017DF25 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
+		4CE4464518BC5EAA0017DF25 /* as264_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = as264_common.h; sourceTree = "<group>"; };
 		4CE4464618BC5EAA0017DF25 /* au_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = au_parser.h; sourceTree = "<group>"; };
 		4CE4464718BC5EAA0017DF25 /* bit_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bit_stream.h; sourceTree = "<group>"; };
 		4CE4464818BC5EAA0017DF25 /* deblocking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deblocking.h; sourceTree = "<group>"; };
@@ -69,6 +69,8 @@
 		4CE4465318BC5EAA0017DF25 /* get_intra_predictor.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = get_intra_predictor.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
 		4CE4465418BC5EAA0017DF25 /* manage_dec_ref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = manage_dec_ref.h; sourceTree = "<group>"; };
 		4CE4465518BC5EAA0017DF25 /* mb_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mb_cache.h; sourceTree = "<group>"; };
+		4CE4465618BC5EAA0017DF25 /* mc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mc.h; sourceTree = "<group>"; };
+		4CE4465718BC5EAA0017DF25 /* mem_align.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mem_align.h; sourceTree = "<group>"; };
 		4CE4465818BC5EAA0017DF25 /* memmgr_nal_unit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memmgr_nal_unit.h; sourceTree = "<group>"; };
 		4CE4465918BC5EAA0017DF25 /* mv_pred.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mv_pred.h; sourceTree = "<group>"; };
 		4CE4465A18BC5EAA0017DF25 /* nal_prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nal_prefix.h; sourceTree = "<group>"; };
@@ -93,6 +95,8 @@
 		4CE4467018BC5EAA0017DF25 /* fmo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fmo.cpp; sourceTree = "<group>"; };
 		4CE4467118BC5EAA0017DF25 /* get_intra_predictor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_intra_predictor.cpp; sourceTree = "<group>"; };
 		4CE4467218BC5EAA0017DF25 /* manage_dec_ref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = manage_dec_ref.cpp; sourceTree = "<group>"; };
+		4CE4467318BC5EAA0017DF25 /* mc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mc.cpp; sourceTree = "<group>"; tabWidth = 1; usesTabs = 0; wrapsLines = 1; };
+		4CE4467418BC5EAA0017DF25 /* mem_align.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mem_align.cpp; sourceTree = "<group>"; };
 		4CE4467518BC5EAA0017DF25 /* memmgr_nal_unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memmgr_nal_unit.cpp; sourceTree = "<group>"; };
 		4CE4467618BC5EAA0017DF25 /* mv_pred.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mv_pred.cpp; sourceTree = "<group>"; };
 		4CE4467718BC5EAA0017DF25 /* parse_mb_syn_cavlc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parse_mb_syn_cavlc.cpp; sourceTree = "<group>"; };
@@ -103,11 +107,8 @@
 		4CE4468518BC5EAB0017DF25 /* welsDecoderExt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = welsDecoderExt.cpp; sourceTree = "<group>"; };
 		4CE447A718BC6BE90017DF25 /* block_add_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = block_add_neon.S; sourceTree = "<group>"; };
 		4CE447A918BC6BE90017DF25 /* intra_pred_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = intra_pred_neon.S; sourceTree = "<group>"; };
-		6A3E814019D79AD900C19C1F /* cabac_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cabac_decoder.h; sourceTree = "<group>"; };
-		6A3E814119D79AE900C19C1F /* cabac_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cabac_decoder.cpp; sourceTree = "<group>"; };
-		6A3E814319D7A40600C19C1F /* parse_mb_syn_cabac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parse_mb_syn_cabac.cpp; sourceTree = "<group>"; };
-		6A3E814519D7A40D00C19C1F /* parse_mb_syn_cabac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parse_mb_syn_cabac.h; sourceTree = "<group>"; };
-		6C749B69197CC6E600A111F9 /* block_add_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = block_add_aarch64_neon.S; path = arm64/block_add_aarch64_neon.S; sourceTree = "<group>"; };
+		9ABF4380193EB5F700A6BD61 /* expand_pic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = expand_pic.h; path = ../../../common/inc/expand_pic.h; sourceTree = "<group>"; };
+		9ABF4381193EB60900A6BD61 /* expand_pic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = expand_pic.cpp; path = ../../../common/src/expand_pic.cpp; sourceTree = "<group>"; };
 		9AED66551946A1DE009A3567 /* welsCodecTrace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = welsCodecTrace.cpp; path = ../../../common/src/welsCodecTrace.cpp; sourceTree = "<group>"; };
 		9AED66571946A1EB009A3567 /* welsCodecTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = welsCodecTrace.h; path = ../../../common/inc/welsCodecTrace.h; sourceTree = "<group>"; };
 		9AED66581946A203009A3567 /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = utils.cpp; path = ../../../common/src/utils.cpp; sourceTree = "<group>"; };
@@ -131,7 +132,6 @@
 		4CBC1B7F194AC4A400214D9E /* arm64 */ = {
 			isa = PBXGroup;
 			children = (
-				6C749B69197CC6E600A111F9 /* block_add_aarch64_neon.S */,
 				4CBC1B80194AC4E100214D9E /* intra_pred_aarch64_neon.S */,
 			);
 			name = arm64;
@@ -187,10 +187,10 @@
 		4CE4464418BC5EAA0017DF25 /* inc */ = {
 			isa = PBXGroup;
 			children = (
-				6A3E814519D7A40D00C19C1F /* parse_mb_syn_cabac.h */,
-				6A3E814019D79AD900C19C1F /* cabac_decoder.h */,
 				9AED665A1946A21D009A3567 /* utils.h */,
+				9ABF4380193EB5F700A6BD61 /* expand_pic.h */,
 				F0B204FA18FD23CF005DA23F /* error_concealment.h */,
+				4CE4464518BC5EAA0017DF25 /* as264_common.h */,
 				4CE4464618BC5EAA0017DF25 /* au_parser.h */,
 				4CE4464718BC5EAA0017DF25 /* bit_stream.h */,
 				4CE4464818BC5EAA0017DF25 /* deblocking.h */,
@@ -206,6 +206,8 @@
 				4CE4465318BC5EAA0017DF25 /* get_intra_predictor.h */,
 				4CE4465418BC5EAA0017DF25 /* manage_dec_ref.h */,
 				4CE4465518BC5EAA0017DF25 /* mb_cache.h */,
+				4CE4465618BC5EAA0017DF25 /* mc.h */,
+				4CE4465718BC5EAA0017DF25 /* mem_align.h */,
 				4CE4465818BC5EAA0017DF25 /* memmgr_nal_unit.h */,
 				4CE4465918BC5EAA0017DF25 /* mv_pred.h */,
 				4CE4465A18BC5EAA0017DF25 /* nal_prefix.h */,
@@ -226,9 +228,8 @@
 		4CE4466618BC5EAA0017DF25 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				6A3E814319D7A40600C19C1F /* parse_mb_syn_cabac.cpp */,
-				6A3E814119D79AE900C19C1F /* cabac_decoder.cpp */,
 				9AED66581946A203009A3567 /* utils.cpp */,
+				9ABF4381193EB60900A6BD61 /* expand_pic.cpp */,
 				F0B204FB18FD23D8005DA23F /* error_concealment.cpp */,
 				4CE4466718BC5EAA0017DF25 /* au_parser.cpp */,
 				4CE4466818BC5EAA0017DF25 /* bit_stream.cpp */,
@@ -241,6 +242,8 @@
 				4CE4467018BC5EAA0017DF25 /* fmo.cpp */,
 				4CE4467118BC5EAA0017DF25 /* get_intra_predictor.cpp */,
 				4CE4467218BC5EAA0017DF25 /* manage_dec_ref.cpp */,
+				4CE4467318BC5EAA0017DF25 /* mc.cpp */,
+				4CE4467418BC5EAA0017DF25 /* mem_align.cpp */,
 				4CE4467518BC5EAA0017DF25 /* memmgr_nal_unit.cpp */,
 				4CE4467618BC5EAA0017DF25 /* mv_pred.cpp */,
 				4CE4467718BC5EAA0017DF25 /* parse_mb_syn_cavlc.cpp */,
@@ -262,7 +265,6 @@
 		4CE4467C18BC5EAA0017DF25 /* inc */ = {
 			isa = PBXGroup;
 			children = (
-				04FE0680196FD8BE0004D7CE /* version.h */,
 				9AED66571946A1EB009A3567 /* welsCodecTrace.h */,
 				4CE4467E18BC5EAA0017DF25 /* welsDecoderExt.h */,
 			);
@@ -339,23 +341,23 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6A3E814419D7A40600C19C1F /* parse_mb_syn_cabac.cpp in Sources */,
 				4CE4469B18BC5EAB0017DF25 /* pic_queue.cpp in Sources */,
 				4CE4469F18BC5EAB0017DF25 /* welsDecoderExt.cpp in Sources */,
 				4CE4469318BC5EAB0017DF25 /* fmo.cpp in Sources */,
 				4CE4469118BC5EAB0017DF25 /* decoder_data_tables.cpp in Sources */,
+				4CE4469718BC5EAB0017DF25 /* mem_align.cpp in Sources */,
+				9ABF4382193EB60900A6BD61 /* expand_pic.cpp in Sources */,
 				4CE4469518BC5EAB0017DF25 /* manage_dec_ref.cpp in Sources */,
 				4CE4468A18BC5EAB0017DF25 /* au_parser.cpp in Sources */,
 				4CE4469918BC5EAB0017DF25 /* mv_pred.cpp in Sources */,
-				6A3E814219D79AE900C19C1F /* cabac_decoder.cpp in Sources */,
 				4CE447AC18BC6BE90017DF25 /* block_add_neon.S in Sources */,
-				6C749B6A197CC6E600A111F9 /* block_add_aarch64_neon.S in Sources */,
 				4CE4469418BC5EAB0017DF25 /* get_intra_predictor.cpp in Sources */,
 				9AED66561946A1DE009A3567 /* welsCodecTrace.cpp in Sources */,
 				F0B204FC18FD23D8005DA23F /* error_concealment.cpp in Sources */,
 				4CBC1B81194AC4E100214D9E /* intra_pred_aarch64_neon.S in Sources */,
 				4CE4469018BC5EAB0017DF25 /* decoder_core.cpp in Sources */,
 				4CE447AE18BC6BE90017DF25 /* intra_pred_neon.S in Sources */,
+				4CE4469618BC5EAB0017DF25 /* mc.cpp in Sources */,
 				4CE4469C18BC5EAB0017DF25 /* rec_mb.cpp in Sources */,
 				4CE4468B18BC5EAB0017DF25 /* bit_stream.cpp in Sources */,
 				4CE4468D18BC5EAB0017DF25 /* decode_mb_aux.cpp in Sources */,
@@ -402,7 +404,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
@@ -433,7 +435,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -462,12 +464,13 @@
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
 				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
 					"$(SRCROOT)/../../../../common/inc",
 					"$(SRCROOT)/../../../../api/svc",
 					"$(SRCROOT)/../../../../common/arm",
 					"$(SRCROOT)/../../../../common/arm64",
 				);
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -496,12 +499,13 @@
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
 				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
 					"$(SRCROOT)/../../../../common/inc",
 					"$(SRCROOT)/../../../../api/svc",
 					"$(SRCROOT)/../../../../common/arm",
 					"$(SRCROOT)/../../../../common/arm64",
 				);
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

codec/build/iOS/enc/encDemo/encDemo.xcodeproj/project.pbxproj

@@ -426,7 +426,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../../api/svc\"",
+					"\"$(SRCROOT)/../../../../processing/interface\"",
+					"\"$(SRCROOT)/../../../../encoder/core/inc\"",
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -459,7 +465,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../../api/svc\"",
+					"\"$(SRCROOT)/../../../../processing/interface\"",
+					"\"$(SRCROOT)/../../../../encoder/core/inc\"",
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -476,8 +488,6 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/../../../../api/svc\"",
 					"\"$(SRCROOT)/../../../../common/inc\"",
-					"\"$(SRCROOT)/../../../../processing/interface\"",
-					"\"$(SRCROOT)/../../../../encoder/core/inc\"",
 				);
 				INFOPLIST_FILE = "encDemo/encDemo-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -495,8 +505,6 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/../../../../api/svc\"",
 					"\"$(SRCROOT)/../../../../common/inc\"",
-					"\"$(SRCROOT)/../../../../processing/interface\"",
-					"\"$(SRCROOT)/../../../../encoder/core/inc\"",
 				);
 				INFOPLIST_FILE = "encDemo/encDemo-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";

codec/build/iOS/enc/encDemo/encDemo/ViewController.m

@@ -70,8 +70,6 @@ extern int EncMain(int argc, char **argv);
         [bsfile UTF8String],
         "-numl",
         "1",
-        "-lconfig",
-        "0",
         [dlayerCfg UTF8String],
     };
     NSLog(@"WELS_INFO: enc config file: %@", encCfg);

codec/build/iOS/enc/encDemo/encDemo/main.m

@@ -35,141 +35,9 @@
 
 #import "AppDelegate.h"
 
-extern int EncMain (int argc, char** argv);
-
-//redirect NSLog and stdout to logfile
-void redirectLogToDocumentFile() {
-  NSArray* path = NSSearchPathForDirectoriesInDomains (NSDocumentDirectory, NSUserDomainMask, YES);
-  NSString* document = [path objectAtIndex:0];
-  NSString* fileName = [NSString stringWithFormat:@"encPerf.log"];
-  NSString* logPath = [document stringByAppendingPathComponent:fileName];
-
-  NSFileManager* defaultManager = [NSFileManager defaultManager];
-  [defaultManager removeItemAtPath:logPath error:nil];
-
-  freopen ([logPath cStringUsingEncoding:NSASCIIStringEncoding], "a+", stdout);
-  freopen ([logPath cStringUsingEncoding:NSASCIIStringEncoding], "a+", stderr);
-}
-
-//to judge whether the path is needed case path
-bool IsOneDeptDir (NSString* path) {
-  BOOL isDir = NO;
-  BOOL isOneDeptDir = NO;
-  NSFileManager* fileManager = [NSFileManager defaultManager];
-  NSArray* dirPathArray = [fileManager subpathsAtPath:path];
-  if ([dirPathArray count] == 0 || dirPathArray == nil)
-    isOneDeptDir = NO;
-  else {
-    for (NSString * dirPath in dirPathArray) {
-      NSString* tmpPath = [path stringByAppendingString:@"/"];
-      tmpPath = [tmpPath stringByAppendingString:dirPath];
-      [fileManager fileExistsAtPath:tmpPath isDirectory:&isDir];
-      if (isDir) {
-        isOneDeptDir = YES;
-        break;
-      }
+int main(int argc, char * argv[])
+{
+    @autoreleasepool {
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
     }
-  }
-  return isOneDeptDir;
-}
-
-//run auto test to get encoder performance
-int AutoTestEnc() {
-  NSString* document = [[NSString alloc] init];
-  NSArray* paths = NSSearchPathForDirectoriesInDomains (NSDocumentDirectory, NSUserDomainMask, YES);
-  if ([paths count] == 0) {
-    NSLog (@"could not find document path");
-    return 2;
-  }
-  document = [paths objectAtIndex:0];
-
-  NSString* encFilePath = [document stringByAppendingString:@"/EncoderPerfTestRes"];
-  NSFileManager* manage = [NSFileManager defaultManager];
-
-  NSArray* cases = [manage subpathsAtPath:encFilePath];
-  if (cases == nil) {
-    NSLog (@"could not find any test case under encoderperftest");
-    return 1;
-
-  }
-  redirectLogToDocumentFile();
-  NSMutableArray* dirArray = [[NSMutableArray alloc] init];
-  for (NSString * casePath in cases) {
-
-    NSString* path = [encFilePath stringByAppendingPathComponent:casePath];
-    if (IsOneDeptDir (path)) {
-      [dirArray addObject:casePath];
-    }
-
-  }
-  for (int caseNO = 0; caseNO < [dirArray count]; caseNO++) {
-
-    NSString* caseName = [dirArray objectAtIndex:caseNO];
-    NSString* caseFilePath = [encFilePath stringByAppendingString:@"/"];
-    caseFilePath = [caseFilePath stringByAppendingString:caseName];
-    [manage changeCurrentDirectoryPath:[caseFilePath stringByExpandingTildeInPath]];
-
-    NSString* welscfg = [caseFilePath stringByAppendingString:@"/welsenc.cfg"];
-    NSString* layercfg = [caseFilePath stringByAppendingString:@"/layer2.cfg"];
-    NSString* yuvFilePath = [caseFilePath stringByAppendingString:@"/yuv"];
-    NSString* bitFilePath = [caseFilePath stringByAppendingString:@"/bit"];
-    [manage removeItemAtPath:bitFilePath error:nil];
-    [manage createDirectoryAtPath:bitFilePath withIntermediateDirectories:YES attributes:nil error:nil];
-
-
-    NSArray* files = [manage subpathsAtPath:yuvFilePath];
-
-    [manage changeCurrentDirectoryPath:[bitFilePath stringByExpandingTildeInPath]];
-
-    for (int i = 0; i < [files count]; i++) {
-      NSString* yuvFileName = [files objectAtIndex:i];
-      NSString* bitFileName = [yuvFileName stringByAppendingString:@".264"];
-
-      NSString*  bitFileNamePath = [bitFilePath stringByAppendingString:@"/"];
-      bitFileName = [bitFileNamePath stringByAppendingString:bitFileName];
-
-
-      [manage createFileAtPath:bitFileName contents:nil attributes:nil];
-      [manage changeCurrentDirectoryPath:[yuvFilePath stringByExpandingTildeInPath]];
-      const char* argvv[] = {
-        "dummy",
-        [welscfg UTF8String],
-        "-org",
-        [yuvFileName UTF8String],
-        "-bf",
-        [bitFileName UTF8String],
-        "-numl",
-        "1",
-          "-lconfig",
-          "0",
-        [layercfg UTF8String]
-      };
-
-      NSLog (@"WELS_INFO: enc config file: %@", welscfg);
-      NSLog (@"WELS_INFO: enc yuv file: %@", yuvFileName);
-      EncMain (sizeof (argvv) / sizeof (argvv[0]), (char**)&argvv[0]);
-      fflush (stdout); // flush the content of stdout instantly
-    }
-
-  }
-
-
-  return 0;
-}
-
-
-int main (int argc, char* argv[]) {
-
-
-  //***For auto testing of encoder performance, call auto test here, if you not want to do auto test, you can comment it manualy
-
-  if (AutoTestEnc() == 0)
-    NSLog (@"Auto testing running sucessfully");
-  else
-    NSLog (@"Auto testing running failed");
-  abort();
-  //************************
-  @autoreleasepool {
-    return UIApplicationMain (argc, argv, nil, NSStringFromClass ([AppDelegate class]));
-  }
 }

codec/build/iOS/enc/welsenc/welsenc.xcodeproj/project.pbxproj

@@ -7,10 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0D6970BE1CA5BCFB001D88F8 /* paraset_strategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0D6970BC1CA5BCFB001D88F8 /* paraset_strategy.cpp */; };
-		0DD32A961B4A478B009181A1 /* wels_task_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DD32A951B4A478B009181A1 /* wels_task_base.cpp */; };
-		0DD32A991B4A4997009181A1 /* wels_task_management.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DD32A981B4A4997009181A1 /* wels_task_management.cpp */; };
-		0DD32A9C1B4A4E8F009181A1 /* wels_task_encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DD32A9B1B4A4E8F009181A1 /* wels_task_encoder.cpp */; };
 		4C23BC60195A77E0003B81FC /* intra_pred_sad_3_opt_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4C23BC5F195A77E0003B81FC /* intra_pred_sad_3_opt_aarch64_neon.S */; };
 		4C34066D18C57D0400DFA14A /* intra_pred_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4C34066618C57D0400DFA14A /* intra_pred_neon.S */; };
 		4C34066E18C57D0400DFA14A /* intra_pred_sad_3_opt_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4C34066718C57D0400DFA14A /* intra_pred_sad_3_opt_neon.S */; };
@@ -28,10 +24,13 @@
 		4CE4471318BC605C0017DF25 /* encoder_data_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E218BC605C0017DF25 /* encoder_data_tables.cpp */; };
 		4CE4471418BC605C0017DF25 /* encoder_ext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E318BC605C0017DF25 /* encoder_ext.cpp */; };
 		4CE4471618BC605C0017DF25 /* get_intra_predictor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E518BC605C0017DF25 /* get_intra_predictor.cpp */; };
+		4CE4471718BC605C0017DF25 /* mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E618BC605C0017DF25 /* mc.cpp */; };
 		4CE4471818BC605C0017DF25 /* md.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E718BC605C0017DF25 /* md.cpp */; };
+		4CE4471918BC605C0017DF25 /* memory_align.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E818BC605C0017DF25 /* memory_align.cpp */; };
 		4CE4471A18BC605C0017DF25 /* mv_pred.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E918BC605C0017DF25 /* mv_pred.cpp */; };
 		4CE4471B18BC605C0017DF25 /* nal_encap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EA18BC605C0017DF25 /* nal_encap.cpp */; };
 		4CE4471C18BC605C0017DF25 /* picture_handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EB18BC605C0017DF25 /* picture_handle.cpp */; };
+		4CE4471D18BC605C0017DF25 /* property.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EC18BC605C0017DF25 /* property.cpp */; };
 		4CE4471E18BC605C0017DF25 /* ratectl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446ED18BC605C0017DF25 /* ratectl.cpp */; };
 		4CE4471F18BC605C0017DF25 /* ref_list_mgr_svc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EE18BC605C0017DF25 /* ref_list_mgr_svc.cpp */; };
 		4CE4472018BC605C0017DF25 /* sample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EF18BC605C0017DF25 /* sample.cpp */; };
@@ -46,14 +45,10 @@
 		4CE4472918BC605C0017DF25 /* svc_set_mb_syn_cavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446F818BC605C0017DF25 /* svc_set_mb_syn_cavlc.cpp */; };
 		4CE4472B18BC605C0017DF25 /* wels_preprocess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446FA18BC605C0017DF25 /* wels_preprocess.cpp */; };
 		4CE4472E18BC605C0017DF25 /* welsEncoderExt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4470618BC605C0017DF25 /* welsEncoderExt.cpp */; };
-		6CA38DA31991CACE003EAAE0 /* svc_motion_estimation.S in Sources */ = {isa = PBXBuildFile; fileRef = 6CA38DA21991CACE003EAAE0 /* svc_motion_estimation.S */; };
-		6CA38DA51991D31A003EAAE0 /* svc_motion_estimation_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 6CA38DA41991D31A003EAAE0 /* svc_motion_estimation_aarch64_neon.S */; };
 		9AED665019469FC1009A3567 /* welsCodecTrace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AED664C19469FC1009A3567 /* welsCodecTrace.cpp */; };
 		9AED66661946A2B3009A3567 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AED66651946A2B3009A3567 /* utils.cpp */; };
 		F5617A50196A833A006E2B20 /* reconstruct_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = F5617A4F196A833A006E2B20 /* reconstruct_aarch64_neon.S */; };
 		F5BE8005196B913200ED02ED /* memory_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = F5BE8004196B913200ED02ED /* memory_aarch64_neon.S */; };
-		F7E9994519EBD1E9009B1021 /* svc_set_mb_syn_cabac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7E9994419EBD1E9009B1021 /* svc_set_mb_syn_cabac.cpp */; };
-		F7E9994919EBD1F8009B1021 /* set_mb_syn_cabac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7E9994819EBD1F8009B1021 /* set_mb_syn_cabac.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -69,15 +64,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		04FE0684196FD9370004D7CE /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../../../common/inc/version.h; sourceTree = "<group>"; };
-		0D6970BC1CA5BCFB001D88F8 /* paraset_strategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = paraset_strategy.cpp; sourceTree = "<group>"; };
-		0D6970BF1CA5BD26001D88F8 /* paraset_strategy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = paraset_strategy.h; sourceTree = "<group>"; };
-		0DD32A951B4A478B009181A1 /* wels_task_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wels_task_base.cpp; sourceTree = "<group>"; };
-		0DD32A971B4A47D0009181A1 /* wels_task_base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_task_base.h; sourceTree = "<group>"; };
-		0DD32A981B4A4997009181A1 /* wels_task_management.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wels_task_management.cpp; sourceTree = "<group>"; };
-		0DD32A9A1B4A49AC009181A1 /* wels_task_management.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_task_management.h; sourceTree = "<group>"; };
-		0DD32A9B1B4A4E8F009181A1 /* wels_task_encoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wels_task_encoder.cpp; sourceTree = "<group>"; };
-		0DD32A9D1B4A4E9C009181A1 /* wels_task_encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wels_task_encoder.h; sourceTree = "<group>"; };
 		4C23BC5F195A77E0003B81FC /* intra_pred_sad_3_opt_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = intra_pred_sad_3_opt_aarch64_neon.S; path = arm64/intra_pred_sad_3_opt_aarch64_neon.S; sourceTree = "<group>"; };
 		4C34066618C57D0400DFA14A /* intra_pred_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = intra_pred_neon.S; sourceTree = "<group>"; };
 		4C34066718C57D0400DFA14A /* intra_pred_sad_3_opt_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = intra_pred_sad_3_opt_neon.S; sourceTree = "<group>"; };
@@ -92,6 +78,7 @@
 		4CE4432518B6FFA00017DF25 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
 		4CE446AA18BC605C0017DF25 /* as264_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = as264_common.h; sourceTree = "<group>"; };
 		4CE446AB18BC605C0017DF25 /* au_set.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = au_set.h; sourceTree = "<group>"; };
+		4CE446AC18BC605C0017DF25 /* bit_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bit_stream.h; sourceTree = "<group>"; };
 		4CE446AE18BC605C0017DF25 /* deblocking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deblocking.h; sourceTree = "<group>"; };
 		4CE446AF18BC605C0017DF25 /* decode_mb_aux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode_mb_aux.h; sourceTree = "<group>"; };
 		4CE446B018BC605C0017DF25 /* dq_map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dq_map.h; sourceTree = "<group>"; };
@@ -101,14 +88,18 @@
 		4CE446B518BC605C0017DF25 /* extern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = extern.h; sourceTree = "<group>"; };
 		4CE446B618BC605C0017DF25 /* get_intra_predictor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = get_intra_predictor.h; sourceTree = "<group>"; };
 		4CE446B718BC605C0017DF25 /* mb_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mb_cache.h; sourceTree = "<group>"; };
+		4CE446B818BC605C0017DF25 /* mc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mc.h; sourceTree = "<group>"; };
 		4CE446B918BC605C0017DF25 /* md.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md.h; sourceTree = "<group>"; };
+		4CE446BA18BC605C0017DF25 /* memory_align.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory_align.h; sourceTree = "<group>"; };
 		4CE446BB18BC605C0017DF25 /* mt_defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mt_defs.h; sourceTree = "<group>"; };
 		4CE446BC18BC605C0017DF25 /* mv_pred.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mv_pred.h; sourceTree = "<group>"; };
 		4CE446BD18BC605C0017DF25 /* nal_encap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nal_encap.h; sourceTree = "<group>"; };
+		4CE446BE18BC605C0017DF25 /* nal_prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nal_prefix.h; sourceTree = "<group>"; };
 		4CE446BF18BC605C0017DF25 /* param_svc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = param_svc.h; sourceTree = "<group>"; };
 		4CE446C018BC605C0017DF25 /* parameter_sets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parameter_sets.h; sourceTree = "<group>"; };
 		4CE446C118BC605C0017DF25 /* picture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture.h; sourceTree = "<group>"; };
 		4CE446C218BC605C0017DF25 /* picture_handle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture_handle.h; sourceTree = "<group>"; };
+		4CE446C318BC605C0017DF25 /* property.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = property.h; sourceTree = "<group>"; };
 		4CE446C418BC605C0017DF25 /* rc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rc.h; sourceTree = "<group>"; };
 		4CE446C518BC605C0017DF25 /* ref_list_mgr_svc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ref_list_mgr_svc.h; sourceTree = "<group>"; };
 		4CE446C618BC605C0017DF25 /* sample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample.h; sourceTree = "<group>"; };
@@ -139,10 +130,13 @@
 		4CE446E218BC605C0017DF25 /* encoder_data_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encoder_data_tables.cpp; sourceTree = "<group>"; };
 		4CE446E318BC605C0017DF25 /* encoder_ext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encoder_ext.cpp; sourceTree = "<group>"; };
 		4CE446E518BC605C0017DF25 /* get_intra_predictor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_intra_predictor.cpp; sourceTree = "<group>"; };
+		4CE446E618BC605C0017DF25 /* mc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mc.cpp; sourceTree = "<group>"; };
 		4CE446E718BC605C0017DF25 /* md.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = md.cpp; sourceTree = "<group>"; };
+		4CE446E818BC605C0017DF25 /* memory_align.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory_align.cpp; sourceTree = "<group>"; };
 		4CE446E918BC605C0017DF25 /* mv_pred.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mv_pred.cpp; sourceTree = "<group>"; };
 		4CE446EA18BC605C0017DF25 /* nal_encap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nal_encap.cpp; sourceTree = "<group>"; };
 		4CE446EB18BC605C0017DF25 /* picture_handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = picture_handle.cpp; sourceTree = "<group>"; };
+		4CE446EC18BC605C0017DF25 /* property.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = property.cpp; sourceTree = "<group>"; };
 		4CE446ED18BC605C0017DF25 /* ratectl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ratectl.cpp; sourceTree = "<group>"; };
 		4CE446EE18BC605C0017DF25 /* ref_list_mgr_svc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ref_list_mgr_svc.cpp; sourceTree = "<group>"; };
 		4CE446EF18BC605C0017DF25 /* sample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sample.cpp; sourceTree = "<group>"; };
@@ -159,19 +153,12 @@
 		4CE446FE18BC605C0017DF25 /* welsEncoderExt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = welsEncoderExt.h; sourceTree = "<group>"; };
 		4CE4470418BC605C0017DF25 /* wels_enc_export.def */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = wels_enc_export.def; sourceTree = "<group>"; };
 		4CE4470618BC605C0017DF25 /* welsEncoderExt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = welsEncoderExt.cpp; sourceTree = "<group>"; };
-		6CA38DA21991CACE003EAAE0 /* svc_motion_estimation.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = svc_motion_estimation.S; sourceTree = "<group>"; };
-		6CA38DA41991D31A003EAAE0 /* svc_motion_estimation_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = svc_motion_estimation_aarch64_neon.S; path = arm64/svc_motion_estimation_aarch64_neon.S; sourceTree = "<group>"; };
-		98FE4C1A1AB0200C0031E2B4 /* golomb_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = golomb_common.h; path = ../../../common/inc/golomb_common.h; sourceTree = "<group>"; };
 		9AED664819469FAF009A3567 /* welsCodecTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = welsCodecTrace.h; path = ../../../common/inc/welsCodecTrace.h; sourceTree = "<group>"; };
 		9AED664C19469FC1009A3567 /* welsCodecTrace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = welsCodecTrace.cpp; path = ../../../common/src/welsCodecTrace.cpp; sourceTree = "<group>"; };
 		9AED66651946A2B3009A3567 /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = utils.cpp; path = ../../../common/src/utils.cpp; sourceTree = "<group>"; };
 		9AED66671946A2C4009A3567 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utils.h; path = ../../../common/inc/utils.h; sourceTree = "<group>"; };
 		F5617A4F196A833A006E2B20 /* reconstruct_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = reconstruct_aarch64_neon.S; path = arm64/reconstruct_aarch64_neon.S; sourceTree = "<group>"; };
 		F5BE8004196B913200ED02ED /* memory_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = memory_aarch64_neon.S; path = arm64/memory_aarch64_neon.S; sourceTree = "<group>"; };
-		F7E9994419EBD1E9009B1021 /* svc_set_mb_syn_cabac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svc_set_mb_syn_cabac.cpp; sourceTree = "<group>"; };
-		F7E9994819EBD1F8009B1021 /* set_mb_syn_cabac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = set_mb_syn_cabac.cpp; sourceTree = "<group>"; };
-		F7E9997E19EBD3C6009B1021 /* set_mb_syn_cabac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = set_mb_syn_cabac.h; sourceTree = "<group>"; };
-		F7E9997F19EBD3CE009B1021 /* svc_set_mb_syn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svc_set_mb_syn.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -189,7 +176,6 @@
 		4C34066418C57D0400DFA14A /* arm */ = {
 			isa = PBXGroup;
 			children = (
-				6CA38DA21991CACE003EAAE0 /* svc_motion_estimation.S */,
 				4C34066618C57D0400DFA14A /* intra_pred_neon.S */,
 				4C34066718C57D0400DFA14A /* intra_pred_sad_3_opt_neon.S */,
 				4C34066918C57D0400DFA14A /* memory_neon.S */,
@@ -202,7 +188,6 @@
 		4CB8F2B219235FAC005D6386 /* arm64 */ = {
 			isa = PBXGroup;
 			children = (
-				6CA38DA41991D31A003EAAE0 /* svc_motion_estimation_aarch64_neon.S */,
 				F5BE8004196B913200ED02ED /* memory_aarch64_neon.S */,
 				F5617A4F196A833A006E2B20 /* reconstruct_aarch64_neon.S */,
 				4C23BC5F195A77E0003B81FC /* intra_pred_sad_3_opt_aarch64_neon.S */,
@@ -262,13 +247,11 @@
 		4CE446A918BC605C0017DF25 /* inc */ = {
 			isa = PBXGroup;
 			children = (
-				98FE4C1A1AB0200C0031E2B4 /* golomb_common.h */,
-				F7E9997F19EBD3CE009B1021 /* svc_set_mb_syn.h */,
-				F7E9997E19EBD3C6009B1021 /* set_mb_syn_cabac.h */,
 				9AED66671946A2C4009A3567 /* utils.h */,
 				4CDBFB9D18E5068D0025A767 /* wels_transpose_matrix.h */,
 				4CE446AA18BC605C0017DF25 /* as264_common.h */,
 				4CE446AB18BC605C0017DF25 /* au_set.h */,
+				4CE446AC18BC605C0017DF25 /* bit_stream.h */,
 				4CE446AE18BC605C0017DF25 /* deblocking.h */,
 				4CE446AF18BC605C0017DF25 /* decode_mb_aux.h */,
 				4CE446B018BC605C0017DF25 /* dq_map.h */,
@@ -278,15 +261,18 @@
 				4CE446B518BC605C0017DF25 /* extern.h */,
 				4CE446B618BC605C0017DF25 /* get_intra_predictor.h */,
 				4CE446B718BC605C0017DF25 /* mb_cache.h */,
+				4CE446B818BC605C0017DF25 /* mc.h */,
 				4CE446B918BC605C0017DF25 /* md.h */,
+				4CE446BA18BC605C0017DF25 /* memory_align.h */,
 				4CE446BB18BC605C0017DF25 /* mt_defs.h */,
 				4CE446BC18BC605C0017DF25 /* mv_pred.h */,
 				4CE446BD18BC605C0017DF25 /* nal_encap.h */,
+				4CE446BE18BC605C0017DF25 /* nal_prefix.h */,
 				4CE446BF18BC605C0017DF25 /* param_svc.h */,
 				4CE446C018BC605C0017DF25 /* parameter_sets.h */,
-				0D6970BF1CA5BD26001D88F8 /* paraset_strategy.h */,
 				4CE446C118BC605C0017DF25 /* picture.h */,
 				4CE446C218BC605C0017DF25 /* picture_handle.h */,
+				4CE446C318BC605C0017DF25 /* property.h */,
 				4CE446C418BC605C0017DF25 /* rc.h */,
 				4CE446C518BC605C0017DF25 /* ref_list_mgr_svc.h */,
 				4CE446C618BC605C0017DF25 /* sample.h */,
@@ -309,9 +295,6 @@
 				4CE446D918BC605C0017DF25 /* wels_const.h */,
 				4CE446DA18BC605C0017DF25 /* wels_func_ptr_def.h */,
 				4CE446DB18BC605C0017DF25 /* wels_preprocess.h */,
-				0DD32A971B4A47D0009181A1 /* wels_task_base.h */,
-				0DD32A9D1B4A4E9C009181A1 /* wels_task_encoder.h */,
-				0DD32A9A1B4A49AC009181A1 /* wels_task_management.h */,
 			);
 			path = inc;
 			sourceTree = "<group>";
@@ -319,8 +302,6 @@
 		4CE446DC18BC605C0017DF25 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				F7E9994819EBD1F8009B1021 /* set_mb_syn_cabac.cpp */,
-				F7E9994419EBD1E9009B1021 /* svc_set_mb_syn_cabac.cpp */,
 				9AED66651946A2B3009A3567 /* utils.cpp */,
 				4CE446DD18BC605C0017DF25 /* au_set.cpp */,
 				4CE446DE18BC605C0017DF25 /* deblocking.cpp */,
@@ -330,11 +311,13 @@
 				4CE446E218BC605C0017DF25 /* encoder_data_tables.cpp */,
 				4CE446E318BC605C0017DF25 /* encoder_ext.cpp */,
 				4CE446E518BC605C0017DF25 /* get_intra_predictor.cpp */,
+				4CE446E618BC605C0017DF25 /* mc.cpp */,
 				4CE446E718BC605C0017DF25 /* md.cpp */,
+				4CE446E818BC605C0017DF25 /* memory_align.cpp */,
 				4CE446E918BC605C0017DF25 /* mv_pred.cpp */,
 				4CE446EA18BC605C0017DF25 /* nal_encap.cpp */,
-				0D6970BC1CA5BCFB001D88F8 /* paraset_strategy.cpp */,
 				4CE446EB18BC605C0017DF25 /* picture_handle.cpp */,
+				4CE446EC18BC605C0017DF25 /* property.cpp */,
 				4CE446ED18BC605C0017DF25 /* ratectl.cpp */,
 				4CE446EE18BC605C0017DF25 /* ref_list_mgr_svc.cpp */,
 				4CE446EF18BC605C0017DF25 /* sample.cpp */,
@@ -348,9 +331,6 @@
 				4CE446F718BC605C0017DF25 /* svc_motion_estimate.cpp */,
 				4CE446F818BC605C0017DF25 /* svc_set_mb_syn_cavlc.cpp */,
 				4CE446FA18BC605C0017DF25 /* wels_preprocess.cpp */,
-				0DD32A951B4A478B009181A1 /* wels_task_base.cpp */,
-				0DD32A9B1B4A4E8F009181A1 /* wels_task_encoder.cpp */,
-				0DD32A981B4A4997009181A1 /* wels_task_management.cpp */,
 			);
 			path = src;
 			sourceTree = "<group>";
@@ -367,7 +347,6 @@
 		4CE446FC18BC605C0017DF25 /* inc */ = {
 			isa = PBXGroup;
 			children = (
-				04FE0684196FD9370004D7CE /* version.h */,
 				9AED664819469FAF009A3567 /* welsCodecTrace.h */,
 				4CE446FE18BC605C0017DF25 /* welsEncoderExt.h */,
 			);
@@ -439,10 +418,9 @@
 				4CE4471118BC605C0017DF25 /* encode_mb_aux.cpp in Sources */,
 				4CE4472718BC605C0017DF25 /* svc_mode_decision.cpp in Sources */,
 				4CE4472818BC605C0017DF25 /* svc_motion_estimate.cpp in Sources */,
+				4CE4471D18BC605C0017DF25 /* property.cpp in Sources */,
 				4CE4471018BC605C0017DF25 /* decode_mb_aux.cpp in Sources */,
 				4CE4472018BC605C0017DF25 /* sample.cpp in Sources */,
-				6CA38DA31991CACE003EAAE0 /* svc_motion_estimation.S in Sources */,
-				0DD32A9C1B4A4E8F009181A1 /* wels_task_encoder.cpp in Sources */,
 				4CE4471318BC605C0017DF25 /* encoder_data_tables.cpp in Sources */,
 				4C34067118C57D0400DFA14A /* pixel_neon.S in Sources */,
 				9AED665019469FC1009A3567 /* welsCodecTrace.cpp in Sources */,
@@ -458,11 +436,12 @@
 				4CE4470E18BC605C0017DF25 /* au_set.cpp in Sources */,
 				F5BE8005196B913200ED02ED /* memory_aarch64_neon.S in Sources */,
 				4CBC1B83194ACBB400214D9E /* intra_pred_aarch64_neon.S in Sources */,
-				F7E9994519EBD1E9009B1021 /* svc_set_mb_syn_cabac.cpp in Sources */,
+				4CE4471718BC605C0017DF25 /* mc.cpp in Sources */,
 				F5617A50196A833A006E2B20 /* reconstruct_aarch64_neon.S in Sources */,
 				4CE4472918BC605C0017DF25 /* svc_set_mb_syn_cavlc.cpp in Sources */,
 				4CE4471818BC605C0017DF25 /* md.cpp in Sources */,
 				4CE4471B18BC605C0017DF25 /* nal_encap.cpp in Sources */,
+				4CE4471918BC605C0017DF25 /* memory_align.cpp in Sources */,
 				4CE4472418BC605C0017DF25 /* svc_enc_slice_segment.cpp in Sources */,
 				4CE4472318BC605C0017DF25 /* svc_base_layer_md.cpp in Sources */,
 				4CB8F2B419235FC5005D6386 /* pixel_aarch64_neon.S in Sources */,
@@ -474,13 +453,8 @@
 				4CE4471218BC605C0017DF25 /* encoder.cpp in Sources */,
 				4CE4471618BC605C0017DF25 /* get_intra_predictor.cpp in Sources */,
 				4CE4472E18BC605C0017DF25 /* welsEncoderExt.cpp in Sources */,
-				6CA38DA51991D31A003EAAE0 /* svc_motion_estimation_aarch64_neon.S in Sources */,
-				0DD32A991B4A4997009181A1 /* wels_task_management.cpp in Sources */,
 				4CE4471418BC605C0017DF25 /* encoder_ext.cpp in Sources */,
 				4C34067218C57D0400DFA14A /* reconstruct_neon.S in Sources */,
-				0DD32A961B4A478B009181A1 /* wels_task_base.cpp in Sources */,
-				F7E9994919EBD1F8009B1021 /* set_mb_syn_cabac.cpp in Sources */,
-				0D6970BE1CA5BCFB001D88F8 /* paraset_strategy.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -518,7 +492,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
@@ -549,7 +523,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -579,13 +553,14 @@
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
 				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
 					"$(SRCROOT)/../../../../common/inc",
 					"$(SRCROOT)/../../../../processing/interface",
 					"$(SRCROOT)/../../../../api/svc",
 					"$(SRCROOT)/../../../../common/arm",
 					"$(SRCROOT)/../../../../common/arm64",
 				);
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -616,13 +591,13 @@
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
 				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
 					"$(SRCROOT)/../../../../common/inc",
 					"$(SRCROOT)/../../../../processing/interface",
 					"$(SRCROOT)/../../../../api/svc",
 					"$(SRCROOT)/../../../../common/arm",
 					"$(SRCROOT)/../../../../common/arm64",
 				);
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

codec/build/iOS/openh264/openh264.xcodeproj/project.pbxproj

@@ -278,7 +278,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
 				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 			};
@@ -309,7 +309,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};

codec/build/iOS/processing/processing.xcodeproj/project.pbxproj

@@ -7,9 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		4CC6094F197E009D00BE8B8B /* down_sample_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6094E197E009D00BE8B8B /* down_sample_aarch64_neon.S */; };
-		4CC6095A1980F34F00BE8B8B /* vaa_calc_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4CC609591980F34F00BE8B8B /* vaa_calc_aarch64_neon.S */; };
-		4CD0FE36199082AD00375C9A /* pixel_sad_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4CD0FE35199082AD00375C9A /* pixel_sad_aarch64_neon.S */; };
 		54994780196A3F3900BA3D87 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5499477F196A3F3900BA3D87 /* Foundation.framework */; };
 		549947DF196A3FB400BA3D87 /* AdaptiveQuantization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 549947A9196A3FB400BA3D87 /* AdaptiveQuantization.cpp */; };
 		549947E0196A3FB400BA3D87 /* adaptive_quantization.S in Sources */ = {isa = PBXBuildFile; fileRef = 549947AC196A3FB400BA3D87 /* adaptive_quantization.S */; };
@@ -17,6 +14,7 @@
 		549947E2196A3FB400BA3D87 /* pixel_sad_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 549947AE196A3FB400BA3D87 /* pixel_sad_neon.S */; };
 		549947E3196A3FB400BA3D87 /* vaa_calc_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 549947AF196A3FB400BA3D87 /* vaa_calc_neon.S */; };
 		549947E4196A3FB400BA3D87 /* BackgroundDetection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 549947B1196A3FB400BA3D87 /* BackgroundDetection.cpp */; };
+		549947E5196A3FB400BA3D87 /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 549947B4196A3FB400BA3D87 /* common.cpp */; };
 		549947E6196A3FB400BA3D87 /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 549947B6196A3FB400BA3D87 /* memory.cpp */; };
 		549947E7196A3FB400BA3D87 /* WelsFrameWork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 549947BB196A3FB400BA3D87 /* WelsFrameWork.cpp */; };
 		549947E8196A3FB400BA3D87 /* WelsFrameWorkEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 549947BD196A3FB400BA3D87 /* WelsFrameWorkEx.cpp */; };
@@ -32,8 +30,6 @@
 		549947F2196A3FB400BA3D87 /* ScrollDetectionFuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 549947D5196A3FB400BA3D87 /* ScrollDetectionFuncs.cpp */; };
 		549947F3196A3FB400BA3D87 /* vaacalcfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 549947D8196A3FB400BA3D87 /* vaacalcfuncs.cpp */; };
 		549947F4196A3FB400BA3D87 /* vaacalculation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 549947D9196A3FB400BA3D87 /* vaacalculation.cpp */; };
-		6C749B78197E2A2000A111F9 /* adaptive_quantization_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 6C749B77197E2A2000A111F9 /* adaptive_quantization_aarch64_neon.S */; };
-		F791965B19D3BF6B00F60C6B /* intra_pred_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F791965A19D3BF6B00F60C6B /* intra_pred_common.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -49,9 +45,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		4CC6094E197E009D00BE8B8B /* down_sample_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = down_sample_aarch64_neon.S; path = arm64/down_sample_aarch64_neon.S; sourceTree = "<group>"; };
-		4CC609591980F34F00BE8B8B /* vaa_calc_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = vaa_calc_aarch64_neon.S; path = arm64/vaa_calc_aarch64_neon.S; sourceTree = "<group>"; };
-		4CD0FE35199082AD00375C9A /* pixel_sad_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = pixel_sad_aarch64_neon.S; path = arm64/pixel_sad_aarch64_neon.S; sourceTree = "<group>"; };
 		5499477C196A3F3900BA3D87 /* libprocessing.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libprocessing.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		5499477F196A3F3900BA3D87 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		54994790196A3F3900BA3D87 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -64,6 +57,7 @@
 		549947AF196A3FB400BA3D87 /* vaa_calc_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = vaa_calc_neon.S; sourceTree = "<group>"; };
 		549947B1196A3FB400BA3D87 /* BackgroundDetection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackgroundDetection.cpp; sourceTree = "<group>"; };
 		549947B2196A3FB400BA3D87 /* BackgroundDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackgroundDetection.h; sourceTree = "<group>"; };
+		549947B4196A3FB400BA3D87 /* common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = common.cpp; sourceTree = "<group>"; };
 		549947B5196A3FB400BA3D87 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = "<group>"; };
 		549947B6196A3FB400BA3D87 /* memory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory.cpp; sourceTree = "<group>"; };
 		549947B7196A3FB400BA3D87 /* memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory.h; sourceTree = "<group>"; };
@@ -95,8 +89,6 @@
 		549947D8196A3FB400BA3D87 /* vaacalcfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vaacalcfuncs.cpp; sourceTree = "<group>"; };
 		549947D9196A3FB400BA3D87 /* vaacalculation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vaacalculation.cpp; sourceTree = "<group>"; };
 		549947DA196A3FB400BA3D87 /* vaacalculation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vaacalculation.h; sourceTree = "<group>"; };
-		6C749B77197E2A2000A111F9 /* adaptive_quantization_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = adaptive_quantization_aarch64_neon.S; path = arm64/adaptive_quantization_aarch64_neon.S; sourceTree = "<group>"; };
-		F791965A19D3BF6B00F60C6B /* intra_pred_common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = intra_pred_common.cpp; path = ../../../common/src/intra_pred_common.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -111,17 +103,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		4CC6094D197E008B00BE8B8B /* arm64 */ = {
-			isa = PBXGroup;
-			children = (
-				4CD0FE35199082AD00375C9A /* pixel_sad_aarch64_neon.S */,
-				6C749B77197E2A2000A111F9 /* adaptive_quantization_aarch64_neon.S */,
-				4CC609591980F34F00BE8B8B /* vaa_calc_aarch64_neon.S */,
-				4CC6094E197E009D00BE8B8B /* down_sample_aarch64_neon.S */,
-			);
-			name = arm64;
-			sourceTree = "<group>";
-		};
 		54994773196A3F3900BA3D87 = {
 			isa = PBXGroup;
 			children = (
@@ -161,7 +142,6 @@
 		549947A7196A3FB400BA3D87 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				4CC6094D197E008B00BE8B8B /* arm64 */,
 				549947A8196A3FB400BA3D87 /* adaptivequantization */,
 				549947AB196A3FB400BA3D87 /* arm */,
 				549947B0196A3FB400BA3D87 /* backgrounddetection */,
@@ -210,7 +190,7 @@
 		549947B3196A3FB400BA3D87 /* common */ = {
 			isa = PBXGroup;
 			children = (
-				F791965A19D3BF6B00F60C6B /* intra_pred_common.cpp */,
+				549947B4196A3FB400BA3D87 /* common.cpp */,
 				549947B5196A3FB400BA3D87 /* common.h */,
 				549947B6196A3FB400BA3D87 /* memory.cpp */,
 				549947B7196A3FB400BA3D87 /* memory.h */,
@@ -346,27 +326,23 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6C749B78197E2A2000A111F9 /* adaptive_quantization_aarch64_neon.S in Sources */,
 				549947F4196A3FB400BA3D87 /* vaacalculation.cpp in Sources */,
 				549947E9196A3FB400BA3D87 /* ComplexityAnalysis.cpp in Sources */,
 				549947E3196A3FB400BA3D87 /* vaa_calc_neon.S in Sources */,
 				549947EE196A3FB400BA3D87 /* imagerotate.cpp in Sources */,
+				549947E5196A3FB400BA3D87 /* common.cpp in Sources */,
 				549947EA196A3FB400BA3D87 /* denoise.cpp in Sources */,
 				549947E7196A3FB400BA3D87 /* WelsFrameWork.cpp in Sources */,
 				549947F1196A3FB400BA3D87 /* ScrollDetection.cpp in Sources */,
 				549947E4196A3FB400BA3D87 /* BackgroundDetection.cpp in Sources */,
 				549947F3196A3FB400BA3D87 /* vaacalcfuncs.cpp in Sources */,
-				4CD0FE36199082AD00375C9A /* pixel_sad_aarch64_neon.S in Sources */,
 				549947E0196A3FB400BA3D87 /* adaptive_quantization.S in Sources */,
 				549947EB196A3FB400BA3D87 /* denoise_filter.cpp in Sources */,
 				549947ED196A3FB400BA3D87 /* downsamplefuncs.cpp in Sources */,
 				549947E6196A3FB400BA3D87 /* memory.cpp in Sources */,
 				549947E2196A3FB400BA3D87 /* pixel_sad_neon.S in Sources */,
 				549947F0196A3FB400BA3D87 /* SceneChangeDetection.cpp in Sources */,
-				4CC6094F197E009D00BE8B8B /* down_sample_aarch64_neon.S in Sources */,
-				4CC6095A1980F34F00BE8B8B /* vaa_calc_aarch64_neon.S in Sources */,
 				549947F2196A3FB400BA3D87 /* ScrollDetectionFuncs.cpp in Sources */,
-				F791965B19D3BF6B00F60C6B /* intra_pred_common.cpp in Sources */,
 				549947EF196A3FB400BA3D87 /* imagerotatefuncs.cpp in Sources */,
 				549947DF196A3FB400BA3D87 /* AdaptiveQuantization.cpp in Sources */,
 				549947EC196A3FB400BA3D87 /* downsample.cpp in Sources */,
@@ -413,8 +389,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
-				ONLY_ACTIVE_ARCH = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -444,7 +420,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -458,7 +434,7 @@
 				GCC_PREFIX_HEADER = "";
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=arm64]" = (
 					APPLE_IOS,
-					HAVE_NEON_AARCH64,
+					HAVE_NEON_ARCH64,
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7]" = (
 					APPLE_IOS,
@@ -477,9 +453,11 @@
 					"$(SRCROOT)/../../../common/arm64",
 					"$(SRCROOT)/../../../common/arm",
 				);
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				VALID_ARCHS = "armv7 armv7s arm64";
 			};
 			name = Debug;
 		};
@@ -491,7 +469,7 @@
 				GCC_PREFIX_HEADER = "";
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=arm64]" = (
 					APPLE_IOS,
-					HAVE_NEON_AARCH64,
+					HAVE_NEON_ARCH64,
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7]" = (
 					APPLE_IOS,
@@ -509,9 +487,11 @@
 					"$(SRCROOT)/../../../common/arm64",
 					"$(SRCROOT)/../../../common/arm",
 				);
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				VALID_ARCHS = "armv7 armv7s arm64";
 			};
 			name = Release;
 		};

codec/build/win32/.gitignore

@@ -3,9 +3,6 @@
 *.ncb
 *.suo
 
-Win32
-x64
-
 # Files generated by upgrading the project files
 *.vcxproj*
 Backup

codec/build/win32/dec/WelsDecPlus.vcproj

@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win32\Release"
+			IntermediateDirectory=".\..\..\..\obj\decoder\plus\Release"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -53,6 +53,9 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
+				AssemblerListingLocation=".\..\..\..\obj\decoder\plus\Release/"
+				ObjectFile=".\..\..\..\obj\decoder\plus\Release/"
+				ProgramDataBaseFileName=".\..\..\..\obj\decoder\plus\Release/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -74,6 +77,9 @@
 				LinkIncremental="1"
 				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)\welsdec.map"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsdec.lib"
@@ -90,6 +96,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
+				OutputFile=".\..\..\..\..\bin\win32\Release/WelsDecPlus.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -103,8 +110,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win64\Release"
+			IntermediateDirectory=".\..\..\..\obj\decoder\plus\Release"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -136,6 +143,9 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
+				AssemblerListingLocation=".\..\..\..\obj\decoder\plus\Release/"
+				ObjectFile=".\..\..\..\obj\decoder\plus\Release/"
+				ProgramDataBaseFileName=".\..\..\..\obj\decoder\plus\Release/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -157,6 +167,9 @@
 				LinkIncremental="1"
 				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)\welsdec.map"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsdec.lib"
@@ -173,6 +186,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
+				OutputFile=".\..\..\..\..\bin\win32\Release/WelsDecPlus.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -186,8 +200,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+			IntermediateDirectory=".\..\..\..\obj\decoder\plus\debug"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -217,6 +231,9 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				AssemblerListingLocation=".\..\..\..\obj\decoder\plus\debug/"
+				ObjectFile=".\..\..\..\obj\decoder\plus\debug/"
+				ProgramDataBaseFileName=".\..\..\..\obj\decoder\plus\debug/"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
@@ -238,6 +255,7 @@
 				LinkIncremental="2"
 				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsdec.lib"
@@ -254,6 +272,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
+				OutputFile=".\..\..\..\..\bin\win32\Debug/WelsDecPlus.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -267,8 +286,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+			IntermediateDirectory=".\..\..\..\obj\decoder\plus\debug"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -298,6 +317,9 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				AssemblerListingLocation=".\..\..\..\obj\decoder\plus\debug/"
+				ObjectFile=".\..\..\..\obj\decoder\plus\debug/"
+				ProgramDataBaseFileName=".\..\..\..\obj\decoder\plus\debug/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -319,6 +341,7 @@
 				LinkIncremental="2"
 				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsdec.lib"
@@ -335,6 +358,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
+				OutputFile=".\..\..\..\..\bin\win32\Debug/WelsDecPlus.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -351,43 +375,51 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
+			Name="SW"
 			>
-			<File
-				RelativePath="..\..\..\common\inc\welsCodecTrace.h"
+			<Filter
+				Name="Resource Files"
+				Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 				>
-			</File>
-			<File
-				RelativePath="..\..\..\decoder\plus\inc\welsDecoderExt.h"
+				<File
+					RelativePath="..\..\..\decoder\plus\res\welsdec.rc"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Source Files"
+				Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\..\..\..\openh264.rc"
+				<File
+					RelativePath="..\..\..\decoder\plus\src\wels_dec_export.def"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\src\welsCodecTrace.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\decoder\plus\src\welsDecoderExt.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Header Files"
+				Filter="h;hpp;hxx;hm;inl"
 				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\decoder\plus\src\wels_dec_export.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\common\src\welsCodecTrace.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\decoder\plus\src\welsDecoderExt.cpp"
-				>
-			</File>
+				<File
+					RelativePath="..\..\..\decoder\core\inc\mem_align.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\common\inc\welsCodecTrace.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\decoder\plus\inc\welsDecoderExt.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>

codec/build/win32/dec/decConsole.vcproj

@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win32\Release"
+			IntermediateDirectory=".\..\..\..\obj\decConsole\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -52,6 +52,9 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
+				AssemblerListingLocation=".\..\..\..\obj\decConsole\Release/"
+				ObjectFile=".\..\..\..\obj\decConsole\Release/"
+				ProgramDataBaseFileName=".\..\..\..\obj\decConsole\Release/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -71,7 +74,8 @@
 				AdditionalDependencies="$(OutDir)\welsdec.lib"
 				OutputFile="$(OutDir)\decConsole.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\decConsole.pdb"
+				GenerateMapFile="false"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
@@ -102,8 +106,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win64\Release"
+			IntermediateDirectory=".\..\..\..\obj\decConsole\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -134,6 +138,9 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
+				AssemblerListingLocation=".\..\..\..\obj\decConsole\Release/"
+				ObjectFile=".\..\..\..\obj\decConsole\Release/"
+				ProgramDataBaseFileName=".\..\..\..\obj\decConsole\Release/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -153,7 +160,8 @@
 				AdditionalDependencies="$(OutDir)\welsdec.lib"
 				OutputFile="$(OutDir)\decConsole.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\decConsole.pdb"
+				GenerateMapFile="false"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
@@ -184,8 +192,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+			IntermediateDirectory=".\..\..\..\obj\decConsole\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -215,6 +223,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				AssemblerListingLocation=".\..\..\..\obj\decConsole\Debug/"
+				ObjectFile=".\..\..\..\obj\decConsole\Debug/"
+				ProgramDataBaseFileName=".\..\..\..\obj\decConsole\Debug/"
+				BrowseInformation="1"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
@@ -235,6 +247,7 @@
 				OutputFile="$(OutDir)\decConsoled.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\decConsoled.pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
@@ -265,8 +278,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+			IntermediateDirectory=".\..\..\..\obj\decConsole\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -296,6 +309,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				AssemblerListingLocation=".\..\..\..\obj\decConsole\Debug/"
+				ObjectFile=".\..\..\..\obj\decConsole\Debug/"
+				ProgramDataBaseFileName=".\..\..\..\obj\decConsole\Debug/"
+				BrowseInformation="1"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -316,6 +333,7 @@
 				OutputFile="$(OutDir)\decConsoled.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\decConsoled.pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"

codec/build/win32/enc/WelsEncCore.vcproj

@@ -23,8 +23,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+			IntermediateDirectory=".\..\..\..\obj\encoder\core\Debug"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -57,6 +57,9 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				AssemblerListingLocation=".\..\..\..\obj\encoder\core\Debug/"
+				ObjectFile=".\..\..\..\obj\encoder\core\Debug/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encoder\core\Debug/"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
@@ -95,8 +98,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+			IntermediateDirectory=".\..\..\..\obj\encoder\core\Debug"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -130,6 +133,9 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				AssemblerListingLocation=".\..\..\..\obj\encoder\core\Debug/"
+				ObjectFile=".\..\..\..\obj\encoder\core\Debug/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encoder\core\Debug/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -168,8 +174,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win32\Release"
+			IntermediateDirectory=".\..\..\..\obj\encoder\core\Release"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -205,6 +211,9 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
+				AssemblerListingLocation=".\..\..\..\obj\encoder\core\Release/"
+				ObjectFile=".\..\..\..\obj\encoder\core\Release/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encoder\core\Release/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -243,8 +252,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win64\Release"
+			IntermediateDirectory=".\..\..\..\obj\encoder\core\Release"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -281,6 +290,9 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
+				AssemblerListingLocation=".\..\..\..\obj\encoder\core\Release/"
+				ObjectFile=".\..\..\..\obj\encoder\core\Release/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encoder\core\Release/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -382,11 +394,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\common\src\intra_pred_common.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\common\src\mc.cpp"
+				RelativePath="..\..\..\encoder\core\src\mc.cpp"
 				>
 			</File>
 			<File
@@ -394,7 +402,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\common\src\memory_align.cpp"
+				RelativePath="..\..\..\encoder\core\src\memory_align.cpp"
 				>
 			</File>
 			<File
@@ -406,11 +414,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\encoder\core\src\paraset_strategy.cpp"
+				RelativePath="..\..\..\encoder\core\src\picture_handle.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\encoder\core\src\picture_handle.cpp"
+				RelativePath="..\..\..\encoder\core\src\property.cpp"
 				>
 			</File>
 			<File
@@ -429,10 +437,6 @@
 				RelativePath="..\..\..\encoder\core\src\sample.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\encoder\core\src\set_mb_syn_cabac.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\encoder\core\src\set_mb_syn_cavlc.cpp"
 				>
@@ -465,10 +469,6 @@
 				RelativePath="..\..\..\encoder\core\src\svc_motion_estimate.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\encoder\core\src\svc_set_mb_syn_cabac.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\encoder\core\src\svc_set_mb_syn_cavlc.cpp"
 				>
@@ -477,34 +477,10 @@
 				RelativePath="..\..\..\common\src\utils.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\encoder\core\src\wels_task_base.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\encoder\core\src\wels_task_encoder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\encoder\core\src\wels_task_management.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\common\src\WelsTaskThread.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\common\src\WelsThread.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\common\src\WelsThreadLib.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\common\src\WelsThreadPool.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -518,6 +494,10 @@
 				RelativePath="..\..\..\encoder\core\inc\au_set.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\bit_stream.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\common\inc\copy_mb.h"
 				>
@@ -570,10 +550,6 @@
 				RelativePath="..\..\..\encoder\core\inc\get_intra_predictor.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\common\inc\golomb_common.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\common\inc\ls_defines.h"
 				>
@@ -587,7 +563,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\common\inc\mc.h"
+				RelativePath="..\..\..\encoder\core\inc\mc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\mc_common.h"
 				>
 			</File>
 			<File
@@ -599,7 +579,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\common\inc\memory_align.h"
+				RelativePath="..\..\..\encoder\core\inc\memory_align.h"
 				>
 			</File>
 			<File
@@ -614,6 +594,10 @@
 				RelativePath="..\..\..\encoder\core\inc\nal_encap.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\nal_prefix.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\encoder\core\inc\param_svc.h"
 				>
@@ -622,10 +606,6 @@
 				RelativePath="..\..\..\encoder\core\inc\parameter_sets.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\encoder\core\inc\paraset_strategy.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\encoder\core\inc\picture.h"
 				>
@@ -634,6 +614,10 @@
 				RelativePath="..\..\..\encoder\core\inc\picture_handle.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\property.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\encoder\core\inc\rc.h"
 				>
@@ -650,10 +634,6 @@
 				RelativePath="..\..\..\encoder\core\inc\sample.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\encoder\core\inc\set_mb_syn_cabac.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\encoder\core\inc\set_mb_syn_cavlc.h"
 				>
@@ -707,11 +687,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\encoder\core\inc\svc_set_mb_syn.h"
+				RelativePath="..\..\..\encoder\core\inc\svc_set_mb_syn_cavlc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\encoder\core\inc\svc_set_mb_syn_cavlc.h"
+				RelativePath="..\..\..\encoder\core\inc\trace.h"
 				>
 			</File>
 			<File
@@ -731,17 +711,13 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\common\inc\wels_common_defs.h"
+				RelativePath="..\..\..\encoder\core\inc\wels_common_defs.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\..\encoder\core\inc\wels_const.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\common\inc\wels_const_common.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\encoder\core\inc\wels_func_ptr_def.h"
 				>
@@ -763,7 +739,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
@@ -781,7 +757,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
@@ -803,7 +779,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						CommandLine="nasm  -I$(InputDir) -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
@@ -835,46 +811,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\..\common\x86\dct.asm"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName)_common.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName)_common.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName)_common.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName)_common.obj"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\..\..\encoder\core\x86\dct.asm"
 				>
@@ -1035,46 +971,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\..\common\x86\intra_pred_com.asm"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName).obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName).obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName).obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName).obj"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\..\..\encoder\core\x86\matrix_transpose.asm"
 				>
@@ -1443,7 +1339,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX  -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
@@ -1461,7 +1357,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX  -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>

codec/build/win32/enc/WelsEncPlus.vcproj

@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+			IntermediateDirectory=".\..\..\..\obj\encoder\plus\Debug"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -51,6 +51,9 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				AssemblerListingLocation=".\..\..\..\obj\encoder\plus\Debug/"
+				ObjectFile=".\..\..\..\obj\encoder\plus\Debug/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encoder\plus\Debug/"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
@@ -72,6 +75,9 @@
 				LinkIncremental="2"
 				ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\welsenc.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)\welsenc.map"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsenc.lib"
@@ -102,8 +108,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+			IntermediateDirectory=".\..\..\..\obj\encoder\plus\Debug"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -133,6 +139,9 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				AssemblerListingLocation=".\..\..\..\obj\encoder\plus\Debug/"
+				ObjectFile=".\..\..\..\obj\encoder\plus\Debug/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encoder\plus\Debug/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -154,6 +163,9 @@
 				LinkIncremental="2"
 				ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\welsenc.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)\welsenc.map"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsenc.lib"
@@ -184,8 +196,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win32\Release"
+			IntermediateDirectory=".\..\..\..\obj\encoder\plus\Release"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -218,6 +230,9 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
+				AssemblerListingLocation=".\..\..\..\obj\encoder\plus\Release/"
+				ObjectFile=".\..\..\..\obj\encoder\plus\Release/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encoder\plus\Release/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -239,6 +254,10 @@
 				LinkIncremental="1"
 				ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\welsenc.pdb"
+				GenerateMapFile="false"
+				MapFileName=""
+				MapExports="false"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsenc.lib"
@@ -269,8 +288,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win64\Release"
+			IntermediateDirectory=".\..\..\..\obj\encoder\plus\Release"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -303,6 +322,9 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
+				AssemblerListingLocation=".\..\..\..\obj\encoder\plus\Release/"
+				ObjectFile=".\..\..\..\obj\encoder\plus\Release/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encoder\plus\Release/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -324,6 +346,10 @@
 				LinkIncremental="1"
 				ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\welsenc.pdb"
+				GenerateMapFile="false"
+				MapFileName=""
+				MapExports="false"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsenc.lib"
@@ -395,7 +421,7 @@
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath="..\..\..\..\openh264.rc"
+				RelativePath="..\..\..\encoder\plus\res\welsenc.rc"
 				>
 			</File>
 		</Filter>

codec/build/win32/enc/encConsole.vcproj

@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+			IntermediateDirectory=".\..\..\..\obj\encConsole\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -51,6 +51,9 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				AssemblerListingLocation=".\..\..\..\obj\encConsole\Debug/"
+				ObjectFile=".\..\..\..\obj\encConsole\Debug/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encConsole\Debug/"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
@@ -71,6 +74,9 @@
 				OutputFile="$(OutDir)\encConsole.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\encConsole.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)\encConsole.map"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
@@ -101,8 +107,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+			IntermediateDirectory=".\..\..\..\obj\encConsole\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -132,6 +138,9 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				AssemblerListingLocation=".\..\..\..\obj\encConsole\Debug/"
+				ObjectFile=".\..\..\..\obj\encConsole\Debug/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encConsole\Debug/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -152,6 +161,9 @@
 				OutputFile="$(OutDir)\encConsole.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\encConsole.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)\encConsole.map"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
@@ -182,8 +194,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win32\Release"
+			IntermediateDirectory=".\..\..\..\obj\encConsole\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -214,6 +226,9 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
+				AssemblerListingLocation=".\..\..\..\obj\encConsole\Release/"
+				ObjectFile=".\..\..\..\obj\encConsole\Release/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encConsole\Release/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -234,6 +249,9 @@
 				OutputFile="$(OutDir)\encConsole.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\encConsole.pdb"
+				GenerateMapFile="false"
+				MapExports="false"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
@@ -264,8 +282,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\..\..\bin\win64\Release"
+			IntermediateDirectory=".\..\..\..\obj\encConsole\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -296,6 +314,9 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
+				AssemblerListingLocation=".\..\..\..\obj\encConsole\Release/"
+				ObjectFile=".\..\..\..\obj\encConsole\Release/"
+				ProgramDataBaseFileName=".\..\..\..\obj\encConsole\Release/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -316,6 +337,9 @@
 				OutputFile="$(OutDir)\encConsole.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\encConsole.pdb"
+				GenerateMapFile="false"
+				MapExports="false"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"

codec/build/windowsphone/.gitignore

@@ -1,29 +0,0 @@
-# Files generated by Visual Studio 2008
-*.user
-*.ncb
-*.suo
-*.opensdf
-
-Win32
-x64
-ARM
-Debug
-Release
-
-# Files generated by upgrading the project files
-Backup
-Generated Files
-UpgradeLog.htm
-
-# Files generated by Visual Studio 2013
-*.sdf
-ipch
-Draft
-
-# Files used in App
-Bin
-obj
-res
-*.dll
-*.yuv
-*.264

codec/build/windowsphone/all/CodecApp.sln

@@ -1,76 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodecApp", "CodecApp\CodecApp.csproj", "{5424CF29-908E-417E-93F3-F1CD81E5372C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CodecRTComponent", "CodecRTComponent.vcxproj", "{FE5BF241-F4EA-4B94-B36A-23511E5908EC}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|Win32 = Debug|Win32
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|Win32 = Release|Win32
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|ARM.ActiveCfg = Debug|ARM
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|ARM.Build.0 = Debug|ARM
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|ARM.Deploy.0 = Debug|ARM
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Win32.ActiveCfg = Debug|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Win32.Build.0 = Debug|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Win32.Deploy.0 = Debug|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|x86.ActiveCfg = Debug|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|x86.Build.0 = Debug|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|x86.Deploy.0 = Debug|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|ARM.ActiveCfg = Release|ARM
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|ARM.Build.0 = Release|ARM
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|ARM.Deploy.0 = Release|ARM
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Mixed Platforms.Build.0 = Release|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Mixed Platforms.Deploy.0 = Release|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Win32.ActiveCfg = Release|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Win32.Build.0 = Release|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Win32.Deploy.0 = Release|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|x86.ActiveCfg = Release|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|x86.Build.0 = Release|x86
-		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|x86.Deploy.0 = Release|x86
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|ARM.ActiveCfg = Debug|ARM
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|ARM.Build.0 = Debug|ARM
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|Win32.Build.0 = Debug|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|x86.ActiveCfg = Debug|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|x86.Build.0 = Debug|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|Any CPU.ActiveCfg = Release|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|ARM.ActiveCfg = Release|ARM
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|ARM.Build.0 = Release|ARM
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|Win32.ActiveCfg = Release|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|Win32.Build.0 = Release|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|x86.ActiveCfg = Release|Win32
-		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

codec/build/windowsphone/all/CodecApp/App.xaml

@@ -1,20 +0,0 @@
-<Application
-    x:Class="CodecApp.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
-    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone">
-
-    <!--Application Resources-->
-    <Application.Resources>
-        <local:LocalizedStrings xmlns:local="clr-namespace:CodecApp" x:Key="LocalizedStrings"/>
-    </Application.Resources>
-
-    <Application.ApplicationLifetimeObjects>
-        <!--Required object that handles lifetime events for the application-->
-        <shell:PhoneApplicationService
-            Launching="Application_Launching" Closing="Application_Closing"
-            Activated="Application_Activated" Deactivated="Application_Deactivated"/>
-    </Application.ApplicationLifetimeObjects>
-
-</Application>

codec/build/windowsphone/all/CodecApp/App.xaml.cs

@@ -1,223 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Resources;
-using System.Windows;
-using System.Windows.Markup;
-using System.Windows.Navigation;
-using Microsoft.Phone.Controls;
-using Microsoft.Phone.Shell;
-using CodecApp.Resources;
-
-namespace CodecApp
-{
-    public partial class App : Application
-    {
-        /// <summary>
-        /// Provides easy access to the root frame of the Phone Application.
-        /// </summary>
-        /// <returns>The root frame of the Phone Application.</returns>
-        public static PhoneApplicationFrame RootFrame { get; private set; }
-
-        /// <summary>
-        /// Constructor for the Application object.
-        /// </summary>
-        public App()
-        {
-            // Global handler for uncaught exceptions.
-            UnhandledException += Application_UnhandledException;
-
-            // Standard XAML initialization
-            InitializeComponent();
-
-            // Phone-specific initialization
-            InitializePhoneApplication();
-
-            // Language display initialization
-            InitializeLanguage();
-
-            // Show graphics profiling information while debugging.
-            if (Debugger.IsAttached)
-            {
-                // Display the current frame rate counters.
-                Application.Current.Host.Settings.EnableFrameRateCounter = true;
-
-                // Show the areas of the app that are being redrawn in each frame.
-                //Application.Current.Host.Settings.EnableRedrawRegions = true;
-
-                // Enable non-production analysis visualization mode,
-                // which shows areas of a page that are handed off to GPU with a colored overlay.
-                //Application.Current.Host.Settings.EnableCacheVisualization = true;
-
-                // Prevent the screen from turning off while under the debugger by disabling
-                // the application's idle detection.
-                // Caution:- Use this under debug mode only. Application that disables user idle detection will continue to run
-                // and consume battery power when the user is not using the phone.
-                PhoneApplicationService.Current.UserIdleDetectionMode = IdleDetectionMode.Disabled;
-            }
-
-        }
-
-        // Code to execute when the application is launching (eg, from Start)
-        // This code will not execute when the application is reactivated
-        private void Application_Launching(object sender, LaunchingEventArgs e)
-        {
-        }
-
-        // Code to execute when the application is activated (brought to foreground)
-        // This code will not execute when the application is first launched
-        private void Application_Activated(object sender, ActivatedEventArgs e)
-        {
-        }
-
-        // Code to execute when the application is deactivated (sent to background)
-        // This code will not execute when the application is closing
-        private void Application_Deactivated(object sender, DeactivatedEventArgs e)
-        {
-        }
-
-        // Code to execute when the application is closing (eg, user hit Back)
-        // This code will not execute when the application is deactivated
-        private void Application_Closing(object sender, ClosingEventArgs e)
-        {
-        }
-
-        // Code to execute if a navigation fails
-        private void RootFrame_NavigationFailed(object sender, NavigationFailedEventArgs e)
-        {
-            if (Debugger.IsAttached)
-            {
-                // A navigation has failed; break into the debugger
-                Debugger.Break();
-            }
-        }
-
-        // Code to execute on Unhandled Exceptions
-        private void Application_UnhandledException(object sender, ApplicationUnhandledExceptionEventArgs e)
-        {
-            if (Debugger.IsAttached)
-            {
-                // An unhandled exception has occurred; break into the debugger
-                Debugger.Break();
-            }
-        }
-
-        #region Phone application initialization
-
-        // Avoid double-initialization
-        private bool phoneApplicationInitialized = false;
-
-        // Do not add any additional code to this method
-        private void InitializePhoneApplication()
-        {
-            if (phoneApplicationInitialized)
-                return;
-
-            // Create the frame but don't set it as RootVisual yet; this allows the splash
-            // screen to remain active until the application is ready to render.
-            RootFrame = new PhoneApplicationFrame();
-            RootFrame.Navigated += CompleteInitializePhoneApplication;
-
-            // Handle navigation failures
-            RootFrame.NavigationFailed += RootFrame_NavigationFailed;
-
-            // Handle reset requests for clearing the backstack
-            RootFrame.Navigated += CheckForResetNavigation;
-
-            // Ensure we don't initialize again
-            phoneApplicationInitialized = true;
-        }
-
-        // Do not add any additional code to this method
-        private void CompleteInitializePhoneApplication(object sender, NavigationEventArgs e)
-        {
-            // Set the root visual to allow the application to render
-            if (RootVisual != RootFrame)
-                RootVisual = RootFrame;
-
-            // Remove this handler since it is no longer needed
-            RootFrame.Navigated -= CompleteInitializePhoneApplication;
-        }
-
-        private void CheckForResetNavigation(object sender, NavigationEventArgs e)
-        {
-            // If the app has received a 'reset' navigation, then we need to check
-            // on the next navigation to see if the page stack should be reset
-            if (e.NavigationMode == NavigationMode.Reset)
-                RootFrame.Navigated += ClearBackStackAfterReset;
-        }
-
-        private void ClearBackStackAfterReset(object sender, NavigationEventArgs e)
-        {
-            // Unregister the event so it doesn't get called again
-            RootFrame.Navigated -= ClearBackStackAfterReset;
-
-            // Only clear the stack for 'new' (forward) and 'refresh' navigations
-            if (e.NavigationMode != NavigationMode.New && e.NavigationMode != NavigationMode.Refresh)
-                return;
-
-            // For UI consistency, clear the entire page stack
-            while (RootFrame.RemoveBackEntry() != null)
-            {
-                ; // do nothing
-            }
-        }
-
-        #endregion
-
-        // Initialize the app's font and flow direction as defined in its localized resource strings.
-        //
-        // To ensure that the font of your application is aligned with its supported languages and that the
-        // FlowDirection for each of those languages follows its traditional direction, ResourceLanguage
-        // and ResourceFlowDirection should be initialized in each resx file to match these values with that
-        // file's culture. For example:
-        //
-        // AppResources.es-ES.resx
-        //    ResourceLanguage's value should be "es-ES"
-        //    ResourceFlowDirection's value should be "LeftToRight"
-        //
-        // AppResources.ar-SA.resx
-        //     ResourceLanguage's value should be "ar-SA"
-        //     ResourceFlowDirection's value should be "RightToLeft"
-        //
-        // For more info on localizing Windows Phone apps see http://go.microsoft.com/fwlink/?LinkId=262072.
-        //
-        private void InitializeLanguage()
-        {
-            try
-            {
-                // Set the font to match the display language defined by the
-                // ResourceLanguage resource string for each supported language.
-                //
-                // Fall back to the font of the neutral language if the Display
-                // language of the phone is not supported.
-                //
-                // If a compiler error is hit then ResourceLanguage is missing from
-                // the resource file.
-                RootFrame.Language = XmlLanguage.GetLanguage(AppResources.ResourceLanguage);
-
-                // Set the FlowDirection of all elements under the root frame based
-                // on the ResourceFlowDirection resource string for each
-                // supported language.
-                //
-                // If a compiler error is hit then ResourceFlowDirection is missing from
-                // the resource file.
-                FlowDirection flow = (FlowDirection)Enum.Parse(typeof(FlowDirection), AppResources.ResourceFlowDirection);
-                RootFrame.FlowDirection = flow;
-            }
-            catch
-            {
-                // If an exception is caught here it is most likely due to either
-                // ResourceLangauge not being correctly set to a supported language
-                // code or ResourceFlowDirection is set to a value other than LeftToRight
-                // or RightToLeft.
-
-                if (Debugger.IsAttached)
-                {
-                    Debugger.Break();
-                }
-
-                throw;
-            }
-        }
-    }
-}

codec/build/windowsphone/all/CodecApp/CodecApp.csproj

@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.20506</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5424CF29-908E-417E-93F3-F1CD81E5372C}</ProjectGuid>
-    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CodecApp</RootNamespace>
-    <AssemblyName>CodecApp</AssemblyName>
-    <TargetFrameworkIdentifier>WindowsPhone</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
-    <SilverlightVersion>
-    </SilverlightVersion>
-    <SilverlightApplication>true</SilverlightApplication>
-    <SupportedCultures>
-    </SupportedCultures>
-    <XapOutputs>true</XapOutputs>
-    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
-    <XapFilename>CodecApp_$(Configuration)_$(Platform).xap</XapFilename>
-    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
-    <SilverlightAppEntry>CodecApp.App</SilverlightAppEntry>
-    <ValidateXaml>true</ValidateXaml>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
-    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
-    <TargetFrameworkProfile />
-    <DefaultLanguage>en-US</DefaultLanguage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>Bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>Bin\Release</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>Bin\x86\Debug</OutputPath>
-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>Bin\x86\Release</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>Bin\ARM\Debug</OutputPath>
-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>Bin\ARM\Release</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget />
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="LocalizedStrings.cs" />
-    <Compile Include="MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources\AppResources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>AppResources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </ApplicationDefinition>
-    <Page Include="MainPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Assets\BadgeLogo.png" />
-    <Content Include="Assets\Logo.png" />
-    <Content Include="Assets\SplashScreen.png" />
-    <Content Include="Assets\SquareTile150x150.png" />
-    <Content Include="Assets\SquareTile71x71.png" />
-    <Content Include="Assets\StoreLogo.png" />
-    <Content Include="Assets\WideLogo.png" />
-    <Content Include="BAMQ1_JVC_C.264">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="BA1_FT_C.264">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="BA_MW_D.264">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <None Include="CiscoVT2people_160x96_6fps.yuv">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="layer2.cfg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-    <None Include="Properties\AppManifest.xml" />
-    <None Include="Properties\WMAppManifest.xml">
-      <SubType>Designer</SubType>
-    </None>
-    <Content Include="openh264.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="welsenc.cfg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Assets\AlignmentGrid.png" />
-    <Content Include="Assets\ApplicationIcon.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\Tiles\FlipCycleTileLarge.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\Tiles\FlipCycleTileMedium.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\Tiles\FlipCycleTileSmall.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\Tiles\IconicTileMediumLarge.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\Tiles\IconicTileSmall.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\AppResources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>AppResources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\CodecRTComponent.vcxproj">
-      <Project>{fe5bf241-f4ea-4b94-b36a-23511e5908ec}</Project>
-      <Name>CodecRTComponent</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions />
-  <PropertyGroup>
-    <PreBuildEvent>copy  /y   ..\..\..\..\..\..\..\..\bin\$(Platform)\$(Configuration)\openh264.dll    ..\..\..\
-copy  /y   ..\..\..\..\..\..\..\..\res\*.yuv    ..\..\..\
-copy  /y   ..\..\..\..\..\..\..\..\res\B*.264    ..\..\..\
-</PreBuildEvent>
-  </PropertyGroup>
-</Project>

codec/build/windowsphone/all/CodecApp/LocalizedStrings.cs

@@ -1,14 +0,0 @@
-using CodecApp.Resources;
-
-namespace CodecApp
-{
-    /// <summary>
-    /// Provides access to string resources.
-    /// </summary>
-    public class LocalizedStrings
-    {
-        private static AppResources _localizedResources = new AppResources();
-
-        public AppResources LocalizedResources { get { return _localizedResources; } }
-    }
-}

codec/build/windowsphone/all/CodecApp/MainPage.xaml

@@ -1,66 +0,0 @@
-<phone:PhoneApplicationPage
-    x:Class="CodecApp.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
-    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    FontFamily="{StaticResource PhoneFontFamilyNormal}"
-    FontSize="{StaticResource PhoneFontSizeNormal}"
-    Foreground="{StaticResource PhoneForegroundBrush}"
-    SupportedOrientations="Portrait" Orientation="Portrait"
-    shell:SystemTray.IsVisible="True">
-
-    <!--LayoutRoot is the root grid where all page content is placed-->
-    <Grid x:Name="LayoutRoot" Background="Transparent">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <!-- LOCALIZATION NOTE:
-            To localize the displayed strings copy their values to appropriately named
-            keys in the app's neutral language resource file (AppResources.resx) then
-            replace the hard-coded text value between the attributes' quotation marks
-            with the binding clause whose path points to that string name.
-
-            For example:
-
-                Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}"
-
-            This binding points to the template's string resource named "ApplicationTitle".
-
-            Adding supported languages in the Project Properties tab will create a
-            new resx file per language that can carry the translated values of your
-            UI strings. The binding in these examples will cause the value of the
-            attributes to be drawn from the .resx file that matches the
-            CurrentUICulture of the app at run time.
-         -->
-
-        <!--TitlePanel contains the name of the application and page title-->
-        <StackPanel x:Name="TitlePanel" Grid.Row="0" Margin="12,17,0,28">
-            <TextBlock Text="MY APPLICATION" Style="{StaticResource PhoneTextNormalStyle}" Margin="12,0"/>
-            <TextBlock Text="page name" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
-        </StackPanel>
-
-        <!--ContentPanel - place additional content here-->
-        <Grid x:Name="ContentPanel" Grid.Row="1" Margin="14,10,10,-10">
-            <Button Content="CallEncoder" HorizontalAlignment="Left" Margin="49,10,0,0" VerticalAlignment="Top" Width="340" Click="Button_Click_CallEncoder"/>
-            <Button Content="CallDecoder" HorizontalAlignment="Left" Margin="63,297,0,0" VerticalAlignment="Top" Width="326" Click="Button_Click__CallDecoder"/>
-            <TextBox x:Name="DecoderInfo" HorizontalAlignment="Left" Height="183" Margin="37,374,0,0" TextWrapping="Wrap" Text="Decoder info" VerticalAlignment="Top" Width="397"/>
-            <TextBox x:Name="EncoderInfo" HorizontalAlignment="Left" Height="191" Margin="37,82,0,0" TextWrapping="Wrap" Text="Encoder info" VerticalAlignment="Top" Width="397"/>
-
-        </Grid>
-
-        <!--Uncomment to see an alignment grid to help ensure your controls are
-            aligned on common boundaries.  The image has a top margin of -32px to
-            account for the System Tray. Set this to 0 (or remove the margin altogether)
-            if the System Tray is hidden.
-
-            Before shipping remove this XAML and the image itself.-->
-        <!--<Image Source="/Assets/AlignmentGrid.png" VerticalAlignment="Top" Height="800" Width="480" Margin="0,-32,0,0" Grid.Row="0" Grid.RowSpan="2" IsHitTestVisible="False" />-->
-    </Grid>
-
-</phone:PhoneApplicationPage>

codec/build/windowsphone/all/CodecApp/MainPage.xaml.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Navigation;
-using Microsoft.Phone.Controls;
-using Microsoft.Phone.Shell;
-using CodecApp.Resources;
-using CodecRTComponent;
-
-namespace CodecApp {
-public partial class MainPage : PhoneApplicationPage {
-  // Constructor
-  private CodecRunTimeComponent vRTCCodec;
-  // Constructor
-  public MainPage() {
-    InitializeComponent();
-
-    vRTCCodec = new CodecRunTimeComponent();
-    // Sample code to localize the ApplicationBar
-    //BuildLocalizedApplicationBar();
-  }
-
-  private void Button_Click_CallEncoder (object sender, RoutedEventArgs e) {
-    int iRetVal         = 0;
-    float fFPS          = 0.0F;
-    double dEncoderTime = 0.0;
-    int iEncodedFrame   = 0;
-    string sEncoderInfo = "Encoder performance: \n";
-
-    iRetVal = vRTCCodec.Encode();
-
-    if (0 == iRetVal) {
-      fFPS = vRTCCodec.GetEncFPS();
-      dEncoderTime = vRTCCodec.GetEncTime();
-      iEncodedFrame = vRTCCodec.GetEncodedFrameNum();
-      sEncoderInfo += "FPS         : " + fFPS.ToString() + "\n";
-      sEncoderInfo += "EncTime(sec): " + dEncoderTime.ToString() + "\n";
-      sEncoderInfo += "EncodedNum  : " + iEncodedFrame.ToString() + "\n";
-      EncoderInfo.Text = sEncoderInfo;
-    } else {
-      EncoderInfo.Text = "ebcoded failed!...";
-    }
-  }
-
-  private void Button_Click__CallDecoder (object sender, RoutedEventArgs e) {
-    int iRetVal = 0;
-    float fFPS = 0.0F;
-    double dDecoderTime = 0.0;
-    int iDecodedFrame = 0;
-    string sDecoderInfo = "Decoder performance: \n";
-
-    iRetVal = vRTCCodec.Decode();
-
-    if (0 == iRetVal) {
-      fFPS = vRTCCodec.GetDecFPS();
-      dDecoderTime = vRTCCodec.GetDecTime();
-      iDecodedFrame = vRTCCodec.GetDecodedFrameNum();
-      sDecoderInfo += "FPS         : " + fFPS.ToString() + "\n";
-      sDecoderInfo += "DecTime(sec): " + dDecoderTime.ToString() + "\n";
-      sDecoderInfo += "DecodedNum  : " + iDecodedFrame.ToString() + "\n";
-      DecoderInfo.Text = sDecoderInfo;
-    } else {
-      DecoderInfo.Text = "decoded failed!...";
-    }
-  }
-
-  // Sample code for building a localized ApplicationBar
-  //private void BuildLocalizedApplicationBar()
-  //{
-  //    // Set the page's ApplicationBar to a new instance of ApplicationBar.
-  //    ApplicationBar = new ApplicationBar();
-
-  //    // Create a new button and set the text value to the localized string from AppResources.
-  //    ApplicationBarIconButton appBarButton = new ApplicationBarIconButton(new Uri("/Assets/AppBar/appbar.add.rest.png", UriKind.Relative));
-  //    appBarButton.Text = AppResources.AppBarButtonText;
-  //    ApplicationBar.Buttons.Add(appBarButton);
-
-  //    // Create a new menu item with the localized string from AppResources.
-  //    ApplicationBarMenuItem appBarMenuItem = new ApplicationBarMenuItem(AppResources.AppBarMenuItemText);
-  //    ApplicationBar.MenuItems.Add(appBarMenuItem);
-  //}
-}
-}

codec/build/windowsphone/all/CodecApp/Package.appxmanifest

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
-
-  <Identity Name="f99aa5a5-a6ee-47ec-a093-390b78afba3c"
-            Publisher="CN=Openh264"
-            Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="5424cf29-908e-417e-93f3-f1cd81e5372c" PhonePublisherId="cb9bed24-05fd-451a-8736-6dad92946a6e"/>
-
-  <Properties>
-    <DisplayName>CodecApp</DisplayName>
-    <PublisherDisplayName>Openh264</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Prerequisites>
-    <OSMinVersion>6.3.1</OSMinVersion>
-    <OSMaxVersionTested>6.3.1</OSMaxVersionTested>
-  </Prerequisites>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="x5424cf29y908ey417ey93f3yf1cd81e5372cx"
-        Executable="AGHost.exe"
-        EntryPoint="MainPage.xaml">
-      <m3:VisualElements
-          DisplayName="CodecApp"
-          Square150x150Logo="Assets\SquareTile150x150.png"
-          Square44x44Logo="Assets\Logo.png"
-          Description="CodecApp"
-          ForegroundText="light"
-          BackgroundColor="#464646">
-        <m3:DefaultTile Square71x71Logo="Assets\SquareTile71x71.png"/>
-        <m3:SplashScreen Image="Assets\Splashscreen.png" />
-      </m3:VisualElements>
-      <Extensions>
-        <Extension Category="windows.backgroundTasks" EntryPoint="AgHost.BackgroundTask">
-          <BackgroundTasks>
-          <Task Type="systemEvent" />
-          </BackgroundTasks>
-        </Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-  <Capabilities>
-  </Capabilities>
-  <Extensions>
-    <Extension Category="windows.activatableClass.inProcessServer">
-      <InProcessServer>
-        <Path>AgHostSvcs.dll</Path>
-        <ActivatableClass ActivatableClassId="AgHost.BackgroundTask" ThreadingModel="both" />
-      </InProcessServer>
-    </Extension>
-  </Extensions>
-</Package>

codec/build/windowsphone/all/CodecApp/Properties/AppManifest.xml

@@ -1,6 +0,0 @@
-<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
->
-    <Deployment.Parts>
-    </Deployment.Parts>
-</Deployment>

codec/build/windowsphone/all/CodecApp/Properties/AssemblyInfo.cs

@@ -1,37 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Resources;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle ("CodecApp")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("CodecApp")]
-[assembly: AssemblyCopyright ("Copyright ©  2015")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible (false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid ("2bac46db-63e8-4c33-9be3-8e6b4638045c")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-[assembly: AssemblyVersion ("1.0.0.0")]
-[assembly: AssemblyFileVersion ("1.0.0.0")]
-[assembly: NeutralResourcesLanguageAttribute ("en-US")]

codec/build/windowsphone/all/CodecApp/Properties/WMAppManifest.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Deployment xmlns="http://schemas.microsoft.com/windowsphone/2014/deployment" AppPlatformVersion="8.1">
-  <DefaultLanguage xmlns="" code="en-US" />
-  <App xmlns="" ProductID="{5424cf29-908e-417e-93f3-f1cd81e5372c}" Title="CodecApp" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="CodecApp author" Description="Sample description" Publisher="CodecApp" PublisherID="{cb9bed24-05fd-451a-8736-6dad92946a6e}">
-    <IconPath IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconPath>
-    <Capabilities>
-      <Capability Name="ID_CAP_NETWORKING" />
-      <Capability Name="ID_CAP_MEDIALIB_AUDIO" />
-      <Capability Name="ID_CAP_MEDIALIB_PLAYBACK" />
-      <Capability Name="ID_CAP_SENSORS" />
-      <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
-    </Capabilities>
-    <Tasks>
-      <DefaultTask Name="_default" NavigationPage="MainPage.xaml" />
-    </Tasks>
-    <Tokens>
-      <PrimaryToken TokenID="CodecAppToken" TaskName="_default">
-        <TemplateFlip>
-          <SmallImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileSmall.png</SmallImageURI>
-          <Count>0</Count>
-          <BackgroundImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileMedium.png</BackgroundImageURI>
-          <Title>CodecApp</Title>
-          <BackContent></BackContent>
-          <BackBackgroundImageURI></BackBackgroundImageURI>
-          <BackTitle></BackTitle>
-          <DeviceLockImageURI></DeviceLockImageURI>
-          <HasLarge></HasLarge>
-        </TemplateFlip>
-      </PrimaryToken>
-    </Tokens>
-    <ScreenResolutions>
-      <ScreenResolution Name="ID_RESOLUTION_WVGA" />
-      <ScreenResolution Name="ID_RESOLUTION_WXGA" />
-      <ScreenResolution Name="ID_RESOLUTION_HD720P" />
-    </ScreenResolutions>
-  </App>
-</Deployment>

codec/build/windowsphone/all/CodecApp/Resources/AppResources.Designer.cs

@@ -1,110 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace CodecApp.Resources {
-using System;
-
-
-/// <summary>
-///   A strongly-typed resource class, for looking up localized strings, etc.
-/// </summary>
-// This class was auto-generated by the StronglyTypedResourceBuilder
-// class via a tool like ResGen or Visual Studio.
-// To add or remove a member, edit your .ResX file then rerun ResGen
-// with the /str option, or rebuild your VS project.
-[global::System.CodeDom.Compiler.GeneratedCodeAttribute ("System.Resources.Tools.StronglyTypedResourceBuilder",
-    "4.0.0.0")]
-[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-public class AppResources {
-
-  private static global::System.Resources.ResourceManager resourceMan;
-
-  private static global::System.Globalization.CultureInfo resourceCulture;
-
-  [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute ("Microsoft.Performance",
-      "CA1811:AvoidUncalledPrivateCode")]
-  internal AppResources() {
-  }
-
-  /// <summary>
-  ///   Returns the cached ResourceManager instance used by this class.
-  /// </summary>
-  [global::System.ComponentModel.EditorBrowsableAttribute (global::System.ComponentModel.EditorBrowsableState.Advanced)]
-  public static global::System.Resources.ResourceManager ResourceManager {
-    get {
-      if (object.ReferenceEquals (resourceMan, null)) {
-        global::System.Resources.ResourceManager temp = new
-        global::System.Resources.ResourceManager ("CodecApp.Resources.AppResources", typeof (AppResources).Assembly);
-        resourceMan = temp;
-      }
-      return resourceMan;
-    }
-  }
-
-  /// <summary>
-  ///   Overrides the current thread's CurrentUICulture property for all
-  ///   resource lookups using this strongly typed resource class.
-  /// </summary>
-  [global::System.ComponentModel.EditorBrowsableAttribute (global::System.ComponentModel.EditorBrowsableState.Advanced)]
-  public static global::System.Globalization.CultureInfo Culture {
-    get {
-      return resourceCulture;
-    } set {
-      resourceCulture = value;
-    }
-  }
-
-  /// <summary>
-  ///   Looks up a localized string similar to add.
-  /// </summary>
-  public static string AppBarButtonText {
-    get {
-      return ResourceManager.GetString ("AppBarButtonText", resourceCulture);
-    }
-  }
-
-  /// <summary>
-  ///   Looks up a localized string similar to Menu Item.
-  /// </summary>
-  public static string AppBarMenuItemText {
-    get {
-      return ResourceManager.GetString ("AppBarMenuItemText", resourceCulture);
-    }
-  }
-
-  /// <summary>
-  ///   Looks up a localized string similar to MY APPLICATION.
-  /// </summary>
-  public static string ApplicationTitle {
-    get {
-      return ResourceManager.GetString ("ApplicationTitle", resourceCulture);
-    }
-  }
-
-  /// <summary>
-  ///   Looks up a localized string similar to LeftToRight.
-  /// </summary>
-  public static string ResourceFlowDirection {
-    get {
-      return ResourceManager.GetString ("ResourceFlowDirection", resourceCulture);
-    }
-  }
-
-  /// <summary>
-  ///   Looks up a localized string similar to en-US.
-  /// </summary>
-  public static string ResourceLanguage {
-    get {
-      return ResourceManager.GetString ("ResourceLanguage", resourceCulture);
-    }
-  }
-}
-}

codec/build/windowsphone/all/CodecApp/Resources/AppResources.resx

@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="ResourceFlowDirection" xml:space="preserve">
-    <value>LeftToRight</value>
-    <comment>Controls the FlowDirection for all elements in the RootFrame. Set to the traditional direction of this resource file's language</comment>
-  </data>
-  <data name="ResourceLanguage" xml:space="preserve">
-    <value>en-US</value>
-    <comment>Controls the Language and ensures that the font for all elements in the RootFrame aligns with the app's language. Set to the language code of this resource file's language.</comment>
-  </data>
-  <data name="ApplicationTitle" xml:space="preserve">
-    <value>MY APPLICATION</value>
-  </data>
-  <data name="AppBarButtonText" xml:space="preserve">
-    <value>add</value>
-  </data>
-  <data name="AppBarMenuItemText" xml:space="preserve">
-    <value>Menu Item</value>
-  </data>
-</root>

codec/build/windowsphone/all/CodecApp/layer2.cfg

@@ -1,39 +0,0 @@
-# Layer Configuration File
-
-
-#============================== INPUT / OUTPUT ==============================
-FrameWidth     160                     # Input  frame width
-FrameHeight    96                    # Input  frame height
-FrameRateOut    12                     # Output frame rate [Hz]
-ReconFile       rec_layer2.yuv          # Reconstructed file
-
-#============================== CODING ==============================
-ProfileIdc      66          # value of profile_idc (or 0 for auto detection)
-
-InitialQP       24			# Quantization parameters for base quality layer
-#================================ RATE CONTROL ===============================
-SpatialBitrate		600		# Unit: kbps, controled by DisableRC also
-MaxSpatialBitrate   800     # Unit: kbps, max bitrate for current layer
-#============================== MultiSlice Slice Argument ==============================
-# for S/M Slice(s) mode settings
-SliceMode			0		# 0: sigle slice mode; >0: multiple slices mode, see below;
-SliceSize			1500
-SliceNum			1		# multiple slices number specified
-
-SlicesAssign0		960		# count number of MBs in slice #0
-SlicesAssign1		0		# count number of MBs in slice #1
-SlicesAssign2		0		# count number of MBs in slice #2
-SlicesAssign3		0		# count number of MBs in slice #3 -- seting here is for better testing
-SlicesAssign4		0		# count number of MBs in slice #4
-SlicesAssign5		0		# count number of MBs in slice #5
-SlicesAssign6		0		# count number of MBs in slice #6
-SlicesAssign7		0		# count number of MBs in slice #7
-
-### DESIGN OF SLICE MODE ####
-# 0 SM_SINGLE_SLICE			| SliceNum==1
-# 1 SM_FIXEDSLCNUM_SLICE	| according to SliceNum			| Enabled dynamic slicing for multi-thread
-# 2 SM_RASTER_SLICE			| according to SlicesAssign		| Need input of MB numbers each slice. In addition, if other constraint in slice_argument is presented, need to follow the constraints. Typically if MB num and slice size are both constrained, re-encoding may be involved.
-# 3 SM_ROWMB_SLICE			| according to PictureMBHeight	| Typical of single row of mbs each slice?+ slice size constraint which including re-encoding
-# 4 SM_DYN_SLICE			| according to SliceSize		| Dynamic slicing (have no idea about slice_nums until encoding current frame)
-# 5 SM_AUTO_SLICE			| according to thread number	| the number of slices is decided by the number of threads,SliceNum is ignored
-

codec/build/windowsphone/all/CodecApp/welsenc.cfg

@@ -1,62 +0,0 @@
-# Cisco Scalable H.264/AVC Extension Encoder Configuration File
-
-#============================== GENERAL ==============================
-UsageType        0            #0: camera video 1:screen content
-SourceWidth      160         #input video width
-SourceHeight     96          #input video height
-InputFile       CiscoVT2people_160x96_6fps.yuv # Input  file
-OutputFile              test.264               # Bitstream file
-MaxFrameRate            30                     # Maximum frame rate [Hz]
-FramesToBeEncoded       - 1                    # Number of frames (at input frame rate)
-
-TemporalLayerNum       2                     # temporal layer number(1--4)
-IntraPeriod            0                    # Intra Period ( multipler of GoP size or -1)
-EnableSpsPpsIDAddition  1
-
-EnableFrameCropping     1                # enable frame cropping flag
-EntropyCodingModeFlag   0                #0:cavlc 1:cabac
-MaxNalSize            0            # Unit:Byte, Maximum Nal size
-#============================== LOOP FILTER ==============================
-LoopFilterDisableIDC       0                   # Loop filter idc (0: on, 1: off,
-# 2: on except for slice boundaries,
-# 3: two stage. slice boundries on in second stage
-# 4: Luma on but Chroma off (w.r.t. idc=0)
-# 5: Luma on except on slice boundaries, but Chroma off in enh. layer (w.r.t. idc=2)
-# 6: Luma on in two stage. slice boundries on in second stage, but Chroma off (w.r.t. idc=3)
-    LoopFilterAlphaC0Offset	0                      # AlphaOffset(-6..+6): valid range
-    LoopFilterBetaOffset	0                      # BetaOffset (-6..+6): valid range
-#============================== SOFTWARE IMPLEMENTATION ==============================
-    MultipleThreadIdc			    1
-# 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
-
-#============================== RATE CONTROL ==============================
-    RCMode			        0
-# 0: quality mode;  1: bitrate mode;                                             # 2: buffer based mode,can't control bitrate; -1: rc off mode;
-    TargetBitrate			5000				    # Unit: kbps, controled by EnableRC also
-    MaxOverallBitrate       6000                    # Unit: kbps, max bitrate overall
-    EnableFrameSkip			1		#Enable Frame Skip
-
-#============================== DENOISE CONTROL ==============================
-    EnableDenoise                   0              # Enable Denoise (1: enable, 0: disable)
-
-#============================== SCENE CHANGE DETECTION CONTROL =======================
-    EnableSceneChangeDetection			1			# Enable Scene Change Detection (1: enable, 0: disable)
-
-#============================== BACKGROUND DETECTION CONTROL ==============================
-    EnableBackgroundDetection		 1     # BGD control(1: enable, 0: disable)
-
-#============================== ADAPTIVE QUANTIZATION CONTROL =======================
-    EnableAdaptiveQuantization			1			# Enable Adaptive Quantization (1: enable, 0: disable)
-
-#============================== LONG TERM REFERENCE CONTROL ==============================
-    EnableLongTermReference             1              # Enable Long Term Reference (1: enable, 0: disable)
-    LtrMarkPeriod                       30             # Long Term Reference Marking Period
-
-#============================== LAYER DEFINITION ==============================
-    PrefixNALAddingCtrl		0						# Control flag of adding prefix unit (0: off, 1: on)
-# It shall always be on in SVC contexts (i.e. when there are CGS/MGS/spatial enhancement layers)
-# Can be disabled when no inter spatial layer prediction in case of its value as 0
-    NumLayers              1                      # Number of layers
-    //LayerCfg                layer0.cfg		# Layer 0 configuration file
-    //LayerCfg                layer1.cfg		# Layer 1 configuration file
-    LayerCfg                layer2.cfg		# Layer 2 configuration file

codec/build/windowsphone/all/CodecRTComponent.cpp

@@ -1,181 +0,0 @@
-// CodecRTComponent.cpp
-#include <string.h>
-#include <iostream>
-#include "typedefs.h"
-#include "CodecRTComponent.h"
-
-using namespace CodecRTComponent;
-using namespace Platform;
-using namespace Windows::Storage;
-
-extern "C" int EncMain (int argc, char** argv);
-extern int32_t DecMain (int32_t iArgC, char* pArgV[]);
-//encoder info
-extern float   g_fFPS;
-extern double  g_dEncoderTime;
-extern int     g_iEncodedFrame;
-
-//decoder info
-extern double g_dDecTime;
-extern float  g_fDecFPS;
-extern int    g_iDecodedFrameNum;
-
-
-CodecRunTimeComponent::CodecRunTimeComponent() {
-}
-
-float CodecRunTimeComponent::GetEncFPS() {
-  return g_fFPS;
-}
-double CodecRunTimeComponent::GetEncTime() {
-  return g_dEncoderTime;
-}
-int  CodecRunTimeComponent::GetEncodedFrameNum() {
-  return g_iEncodedFrame;
-}
-
-int CodecRunTimeComponent::Encode() {
-  int iRet = 0;
-  int argc = 6;
-  char* argv[6];
-  int iSize = 0;
-
-  //App test data files' path
-  char InputPath[256] = { 0 };
-  char InputWelsEncCfgPath[256] = { 0 };
-  char InputCfgPath[256] = { 0 };
-  char InputYUVPath[256] = { 0 };
-  char OutputPath[256] = { 0 };
-  char Output264Path[256] = { 0 };
-
-  //App data location
-  Windows::Storage::StorageFolder^ InputLocation;
-  Platform::String^ InputLocationPath;
-  Windows::Storage::StorageFolder^ OutputLocation;
-  Platform::String^ OutputLocationPath;
-
-  //set input file path
-  InputLocation = Windows::ApplicationModel::Package::Current->InstalledLocation;
-  InputLocationPath = Platform::String::Concat (InputLocation->Path, "\\");
-  const wchar_t* pWcharInputFile = InputLocationPath->Data();
-
-  iSize = wcslen (pWcharInputFile);
-  InputPath[iSize] = 0;
-  for (int y = 0; y < iSize; y++) {
-    InputPath[y] = (char)pWcharInputFile[y];
-  }
-
-  //set output file path
-  OutputLocation = ApplicationData::Current->LocalFolder;
-  OutputLocationPath = Platform::String::Concat (OutputLocation->Path, "\\");
-  const wchar_t* pWcharOutputFile = OutputLocationPath->Data();
-
-  iSize = wcslen (pWcharOutputFile);
-  OutputPath[iSize] = 0;
-  for (int y = 0; y < iSize; y++) {
-    OutputPath[y] = (char)pWcharOutputFile[y];
-  }
-
-  //App
-  strcpy (InputWelsEncCfgPath, InputPath);
-  strcat (InputWelsEncCfgPath, "welsenc.cfg");
-
-  strcpy (InputYUVPath, InputPath);
-  strcat (InputYUVPath, "CiscoVT2people_160x96_6fps.yuv");
-
-  // single layer only
-  strcpy (InputCfgPath, InputPath);
-  strcat (InputCfgPath, "layer2.cfg");
-  // for multiple layers
-  /*
-  strcpy(InputCfg0Path, InputPath);
-  strcat(InputCfg0Path, "layer0.cfg");
-  strcpy(InputCfg1Path, InputPath);
-  strcat(InputCfg1Path, "layer1.cfg");
-  ...
-  */
-
-  strcpy (Output264Path, OutputPath);
-  strcat (Output264Path, "WP8_Test_CiscoVT2people_160x96_6fps.264");
-
-  argv[0] = (char*) ("EncoderApp");
-  argv[1] = InputWelsEncCfgPath;
-  argv[2] = (char*) ("-org");
-  argv[3] = InputYUVPath;
-  argv[4] = (char*) ("-bf");
-  argv[5] = Output264Path;
-
-  argc = 6;
-  iRet = EncMain (argc, argv);
-
-  return iRet;
-}
-
-
-float CodecRunTimeComponent::GetDecFPS() {
-  return g_fDecFPS;
-}
-double CodecRunTimeComponent::GetDecTime() {
-  return g_dDecTime;
-}
-int CodecRunTimeComponent::GetDecodedFrameNum() {
-  return g_iDecodedFrameNum;
-}
-
-int CodecRunTimeComponent::Decode() {
-  int iRet = 0;
-  int argc = 3;
-  char* argv[3];
-  int size = 0;
-
-  //App data files' path
-  char InputPath[256] = { 0 };
-  char OutputPath[256] = { 0 };
-  char InputBitstreamPath[256] = { 0 };
-  char OutputYUVPath[256] = { 0 };
-
-  //App data location
-  Windows::Storage::StorageFolder^ InputLocation;
-  Platform::String^ InputLocationPath;
-
-  Windows::Storage::StorageFolder^ OutputLocation;
-  Platform::String^ OutputLocationPath;
-
-  //set input file path
-  InputLocation = Windows::ApplicationModel::Package::Current->InstalledLocation;
-  InputLocationPath = Platform::String::Concat (InputLocation->Path, "\\");
-  const wchar_t* pWcharInputFile = InputLocationPath->Data();
-
-  size = wcslen (pWcharInputFile);
-  InputPath[size] = 0;
-  for (int y = 0; y < size; y++) {
-    InputPath[y] = (char)pWcharInputFile[y];
-  }
-
-  //set output file path
-  OutputLocation = ApplicationData::Current->LocalFolder;
-  OutputLocationPath = Platform::String::Concat (OutputLocation->Path, "\\");
-  const wchar_t* pWcharOutputFile = OutputLocationPath->Data();
-
-  size = wcslen (pWcharOutputFile);
-  OutputPath[size] = 0;
-  for (int y = 0; y < size; y++) {
-    OutputPath[y] = (char)pWcharOutputFile[y];
-  }
-
-  //App test setting
-  strcpy_s (InputBitstreamPath, InputPath);
-  strcat_s (InputBitstreamPath, "BA_MW_D.264");
-
-  strcpy_s (OutputYUVPath, OutputPath);
-  strcat_s (OutputYUVPath, "WP8_Dec_BA_MW_D.yuv");
-
-  argv[0] = (char*) ("DecoderApp");
-  argv[1] = InputBitstreamPath;
-  argv[2] = OutputYUVPath;
-
-  argc = 3;
-  iRet = DecMain (argc, argv);
-
-  return iRet;
-}

codec/build/windowsphone/all/CodecRTComponent.h

@@ -1,22 +0,0 @@
-#pragma once
-
-namespace CodecRTComponent {
-// public ref class WindowsPhoneRuntimeComponent  sealed
-public ref class CodecRunTimeComponent sealed {
- public:
-  CodecRunTimeComponent();
-  int Encode();
-  int Decode();
-
-  //Get encoder info
-  float GetEncFPS();
-  double GetEncTime();
-  int  GetEncodedFrameNum();
-
-  //get decoder info
-  float GetDecFPS();
-  double GetDecTime();
-  int  GetDecodedFrameNum();
-
-};
-}

codec/build/windowsphone/all/CodecRTComponent.vcxproj

@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{fe5bf241-f4ea-4b94-b36a-23511e5908ec}</ProjectGuid>
-    <RootNamespace>CodecRTComponent</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
-    <WinMDAssembly>true</WinMDAssembly>
-    <ApplicationType>Windows Phone Silverlight</ApplicationType>
-    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <OutDir>..\..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <OutDir>..\..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <CompileAsWinRT>true</CompileAsWinRT>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_WINRT_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <CompileAsWinRT>true</CompileAsWinRT>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <ClCompile>
-      <PreprocessorDefinitions>_WINRT_DLL;WINDOWS_PHONE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <CompileAsWinRT>true</CompileAsWinRT>
-      <AdditionalIncludeDirectories>..\..\..\console\dec\inc;..\..\..\console\common\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\console\enc\inc;..\..\..\encoder\core\inc;..\..\..\processing\interface</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>openh264.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <ClCompile>
-      <PreprocessorDefinitions>_WINRT_DLL;WINDOWS_PHONE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <CompileAsWinRT>true</CompileAsWinRT>
-      <AdditionalIncludeDirectories>..\..\..\console\dec\inc;..\..\..\console\common\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\console\enc\inc;..\..\..\encoder\core\inc;..\..\..\processing\interface</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>openh264.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <Reference Include="platform.winmd">
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\console\common\inc\read_config.h" />
-    <ClInclude Include="CodecRTComponent.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\console\common\src\read_config.cpp" />
-    <ClCompile Include="..\..\..\console\dec\src\d3d9_utils.cpp" />
-    <ClCompile Include="..\..\..\console\dec\src\h264dec.cpp" />
-    <ClCompile Include="..\..\..\console\enc\src\welsenc.cpp" />
-    <ClCompile Include="CodecRTComponent.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>