Commit Graph

2489 Commits

Author SHA1 Message Date
dongzha
3596b6ced0 avoid encoder crash with random pixel input 2014-08-19 15:36:27 +08:00
huili2
d3dc48d1d1 Merge pull request #1284 from syureyi/perf
Perf
2014-08-18 12:52:44 +08:00
lingzhu
f4054f2633 Update run_AutoTest_android.sh
at now, need not such log file
2014-08-18 09:45:21 +08:00
lingzhu
fc9203cb50 Update run_AutoTest_ios.sh
typo wrong, need to copy
2014-08-18 09:44:07 +08:00
huili2
45d95d2f50 Merge pull request #1281 from mstorsjo/fix-arm-alignment
Fix building svc_motion_estimation.S for android
2014-08-15 15:17:09 +08:00
Martin Storsjö
81ac3d2a9b Fix building svc_motion_estimation.S for android
The .align directive takes an argument in number of bits, i.e. the
actual alignment is 2^n. Previously building with binutils failed,
since 16 isn't a valid parameter to .align, the maximum is 15.

Thus, this makes the code try to align to 16 bytes, instead of aligning
to 65536 bytes.

This fixes building for android.

This also clears up the same mistake in the aarch64 code, even though
that one built just fine.
2014-08-15 09:53:42 +03:00
dongzha
464244ccbe Merge pull request #1280 from mstorsjo/arm-common-ifdefs
Add ifdef HAVE_NEON around the contents of arm_arch_common_macro.S
2014-08-15 14:19:14 +08:00
HaiboZhu
955d27b3a2 Merge pull request #1278 from syureyi/perf
improve perf
2014-08-15 14:18:01 +08:00
zhilwang
e25a82b3d6 Merge pull request #1279 from dongzha/NewAddARMHash
add arm32/64 code for InitHash
2014-08-15 14:14:51 +08:00
Martin Storsjö
f69c9074e7 Add ifdef HAVE_NEON around the contents of arm_arch_common_macro.S
This file is built on its own from within the xcode projects,
even though it isn't necessary. Previously its contents was just
empty, but now a .syntax unified was added, which failed the build
when building for arm64.

Make this file a no-op, just like the other arm assembly source files,
unless HAVE_NEON is defined.
2014-08-15 08:49:31 +03:00
HFVideoMac
0f95fac4ca add arm32/64 code for InitHash 2014-08-15 13:47:59 +08:00
Ethan Hugg
4b5e893fcc Merge pull request #1277 from huili2/modify_releases_master
release note for master
2014-08-14 19:32:06 -07:00
dongzha
87107c50a3 Merge pull request #1275 from zhilwang/x86_hash_scc
Add x86 32/64bit asm code and UT for SCC hash functions
2014-08-15 10:12:18 +08:00
huili2
f9448ced69 release note for v1.1.0 2014-08-14 19:11:58 -07:00
zhiliang wang
ef88889404 refine format and add UT cases 2014-08-15 09:22:37 +08:00
huili2
136e169c01 Merge pull request #1270 from mstorsjo/android-tool-detect
Check for $(CXX).exe as well when checking for the android toolchain
2014-08-15 09:12:15 +08:00
huili2
a893e22311 Merge pull request #1266 from mstorsjo/fix-readme
Stop referring to a removed make variable
2014-08-15 09:12:06 +08:00
zhilwang
711f5cabe7 Merge pull request #1273 from dongzha/RefineArmCodeForSumBlock
refine arm code for sum of frame
2014-08-15 09:02:15 +08:00
zhiliang wang
76863f977a Refine asm code format 2014-08-15 08:46:55 +08:00
zhiliang wang
b35f5797de Add x86 32/64bit asm code for Scc_hash 2014-08-14 18:41:52 +08:00
HaiboZhu
1e34a61dd6 Merge pull request #1269 from huili2/enc_console_help
correct enc console help info
2014-08-14 17:07:16 +08:00
HaiboZhu
42384c0cb4 Merge pull request #1274 from huili2/test_VclNal
enable api test for decoder VclNal
2014-08-14 17:06:45 +08:00
huili2
f82726d7ef enable api test for decoder VclNal 2014-08-14 00:52:21 -07:00
dongzha
d243608611 Merge pull request #1272 from zhilwang/x86_hash_scc
Add function define and init for SCC hash function
2014-08-14 14:49:43 +08:00
HFVideoMac
e14186b535 refine arm code for sum of frame 2014-08-14 14:41:07 +08:00
zhiliang wang
9d2e1a9384 Merge branch 'master' of https://github.com/cisco/openh264 into x86_hash_scc 2014-08-14 14:38:18 +08:00
zhiliang wang
dc833e19f4 Add function define and init for SCC hash function 2014-08-14 14:20:07 +08:00
dongzha
2b26a28d15 Merge pull request #1271 from dongzha/fixBuildError
Fix build error ARM
2014-08-14 13:16:40 +08:00
dongzha
3703ba16a4 Fix build error ARM 2014-08-14 12:54:36 +08:00
dongzha
186f4c0d29 Merge pull request #1267 from zhilwang/sumofblocks_scc
Add x86 32/64bit asm code for SumOfBlocks.
2014-08-14 10:12:55 +08:00
Martin Storsjö
0f9c2dbb12 Check for $(CXX).exe as well when checking for the android toolchain
This fixes building for android on windows.

Building for android on windows still requires MSYS for running make,
but running the ndk-build of the sample projects from within MSYS
doesn't seem to work (the OS variable from the OpenH264 makefile
interferes with the host system detection in ndk-build), so one still
needs to build it in two steps, first make OS=android ... libopenh264.so,
then building the sample projects manually.
2014-08-13 14:23:09 +03:00
huili2
e346bc5263 correct enc console help info 2014-08-12 23:25:27 -07:00
zhiliang wang
f2314151e8 Add x86 32/64bit asm code for SumOfBlocks. 2014-08-13 11:18:39 +08:00
syureyi
2ac973474a improve perf 2014-08-12 14:29:39 +08:00
Martin Storsjö
a2b727fb6b Stop referring to a removed make variable
Nothing uses the make variable GCCVERSION any longer, since we just
query the NDK for the default compiler.
2014-08-12 09:11:15 +03:00
huili2
681b1da698 Merge pull request #1265 from ruil2/namespace_2
merge level table
2014-08-12 10:06:59 +08:00
ruil2
493d254a4a merge level table 2014-08-12 09:28:40 +08:00
huili2
49f8fe8c5c Merge pull request #1264 from ruil2/namespace_1
use WelsEnc namespace instead of WelsSVCEnc
2014-08-11 16:55:11 +08:00
ruil2
f7cd6e7aad use WelsEnc namespace instead of WelsSVCEnc 2014-08-11 16:08:49 +08:00
dongzha
57f4548daf Merge pull request #1262 from ruil2/fix_errors
fix an errors that for single slice mode, the number of slices should be 1
2014-08-11 14:31:41 +08:00
ruil2
febb3ebb9b fix an errors that for single slice mode, the number of slices should be 1 2014-08-11 13:58:33 +08:00
ruil2
5948e8af3f Merge pull request #1259 from mstorsjo/fix-singlecpu-tests
Remove a needless, no-op change of the number of threads
2014-08-11 13:31:57 +08:00
dongzha
7b3bf074b3 Merge pull request #1258 from mstorsjo/fetch-codec-params
Get the actual used parameters in the codec in TemporalLayerSettingTest
2014-08-11 10:53:28 +08:00
dongzha
6190c10de8 Merge pull request #1256 from mstorsjo/speedup-tests
Speed up test cases in EncoderInterfaceTest
2014-08-11 10:47:44 +08:00
dongzha
f8e5d3a7bf Merge pull request #1250 from huili2/test_EndOfStream
test end of stream for decoder API UT
2014-08-11 10:34:07 +08:00
zhilwang
46f1c898c6 Merge pull request #1257 from mstorsjo/fixup-apple-assembly
Explicitly add .syntax unified when building for iOS
2014-08-11 08:40:27 +08:00
Martin Storsjö
352f5eea7a Get the actual used parameters in the codec in TemporalLayerSettingTest
Make sure that pOptions is initialized to the parameters that
the codec actually uses, not the ones that we initially tried
to set.

When calling SetOption to update the codec parameters, this may
cause a reset of the whole codec if e.g. the number of threads
differs from what is set within the codec itself.

If the number of threads was changed by the codec internally
when inited (e.g. changed from 0 to 1), WelsEncoderParamAdjust
may think the whole codec needs to be reset.

This fixes running EncoderInterfaceTest.TemporalLayerSettingTest
on machines where the detected number of cores is 1.
2014-08-08 22:57:22 +03:00
Martin Storsjö
2f6a986d7c Remove a needless, no-op change of the number of threads
If kiCpuCores < 2, then iCountThreadsNum (and iMultipleThreadIdc)
can't be >= 2, because they're initialized with
WELS_MIN (kiCpuCores, ...) just a few lines above.

If iMultipleThreadIdc is initially set to 0 by the caller, this
removed piece of code would change it to 1, if kiCpuCores < 2.

When iMultipleThreadIdc is changed from the originally set value,
a call to WelsEncoderParamAdjust with the original parameters
would reset the whole codec since iMultipleThreadIdc differs.

This fixes running EncoderInterfaceTest.TemporalLayerSettingTest
on machines where the detected number of cores is 1.
2014-08-08 22:26:59 +03:00
Martin Storsjö
38d2d64ede Explicitly add .syntax unified when building for iOS
This is the default when building with the clang built-in assembler,
but not if using the external assembler - thus always specify it,
for clarity.

Also use the three-operand for of a sub instruction in BS_NZC_CHECK.
The same is already done in the gnu version of the macro.

This fixes building most of the arm assembly with Apple's external
assembler. While this isn't a necessary goal in itself, there's no
harm in doing this either.
2014-08-08 14:09:37 +03:00
huili2
dacd22d695 Merge pull request #1254 from mstorsjo/alias-attribute
Add attributes incidating intentional data type aliasing, fix GetIntraPredictorTest on android
2014-08-08 17:36:07 +08:00