Martin Storsjö
11bdebb12c
Explicitly enable the UAL syntax when using gnu tools
...
Arm assembly has got two variants of the syntax, the old legacy
syntax, and the new modern UAL (unified assembly language) syntax.
Most arm assembly is the same in the both syntaxes, but some
uncommon cases change the order of suffixes - the "subscs"
instruction would be written "subcss" in the old syntax.
The apple tools default to UAL, while the GNU tools (e.g. in
android) require you to specify ".syntax unified" to enable the
new syntax. When enabling the new syntax with the GNU tools, some
cases of "sub r0, r1, lsl #1 " needs to be written explicitly as
"sub r0, r0, r1, lsl #1 ", handled in the previous commit.
This allows using the same, modern syntax for things like subscs,
without needing to have two alternate forms of writing it.
2014-03-06 16:21:54 +02:00
Martin Storsjö
c0043f7053
Use the three-operand form of add/sub with shift
...
When using unified syntax, the two operand form with a shift
isn't allowed.
2014-03-06 16:21:54 +02:00
Martin Storsjö
f1502c26e3
Don't use WELS_ASM_FUNC_END in the middle of a function
...
WELS_ASM_FUNC_END declares the end of the function, and needs
to be paired with WELS_ASM_FUNC_BEGIN.
2014-03-06 16:21:54 +02:00
Martin Storsjö
8ba79262bf
Rename a function to avoid conflicts between almost duplicate neon functions
...
There's a different version of the same function in the encoder,
but they're not identical - the encoder version has got stricter
alignment requirements.
If someone can confirm that it is ok to use the function from the
encoder, pixel_sad_neon.S in processing could be deleted, and the
encoder version moved to codec/common instead.
2014-03-06 16:19:48 +02:00
Martin Storsjö
4e4bfcc1bc
Regenerate makefiles to include the encoder arm assembly
2014-03-06 16:11:54 +02:00
Martin Storsjö
45e059ec5f
Rename expand_picture.S to expand_picture_neon.S
...
This avoids ambiguity in the make based build system about
whether expand_picture.o should be built from expand_picture.S
or expand_picture.asm.
2014-03-06 16:11:40 +02:00
Licai Guo
201ab42d7e
Merge pull request #431 from huili2/large_to_small_sps_bug
...
Large to small sps bug for issue #373
2014-03-06 16:51:59 +08:00
volvet
8cc332dea1
Merge pull request #432 from zhilwang/arm-asm
...
Arm asm
2014-03-06 16:50:56 +08:00
volvet
73452e0993
Merge pull request #429 from mstorsjo/simplify-ifdef-with-macro
...
Use a macro for conditionally logging based on ENABLE_TRACE_MT
2014-03-06 16:01:41 +08:00
Licai Guo
8a7a9195d9
remove unused function
2014-03-05 23:14:57 -08:00
Licai Guo
4260a9b2ba
remove CS and RS syntaxs for issue 373
2014-03-05 22:59:27 -08:00
Licai Guo
7bfe801874
Remove trailing space
2014-03-06 14:55:36 +08:00
Licai Guo
67534b0fc0
arm asm code refine.
2014-03-06 14:30:16 +08:00
Martin Storsjö
fd6f8a83b3
Use a macro for conditionally logging based on ENABLE_TRACE_MT
...
This avoids having an extra ifdef around every single WelsLog
call.
2014-03-06 08:06:34 +02:00
ruil2
28a56a6752
Merge pull request #415 from volvet/remove-useless-mgs-code
...
remove un-supported mgs code
2014-03-06 14:05:04 +08:00
ruil2
8313e015a8
Merge pull request #427 from volvet/clean-encode-cfg
...
clean encode cfg files
2014-03-06 14:04:48 +08:00
ruil2
a59c8ea04c
Merge pull request #428 from sijchen/read_para3
...
[Encoder Console] add new para reading to get accord with the new API design
2014-03-06 14:04:33 +08:00
volvet
54c63e2547
Merge pull request #423 from licaiguo/refine-android-build-pr
...
rebase on latest code, refine android build
2014-03-06 13:55:16 +08:00
volvet
a17dd825a5
clean encode cfg files
2014-03-06 13:48:31 +08:00
sijchen
a4a8eddb04
add new para reading to get accord with the new API design
2014-03-06 13:48:18 +08:00
volvet
d292179095
Merge pull request #424 from ruil2/encoder_interface
...
remove inter-deblock related parameters--review request #148
2014-03-06 13:39:57 +08:00
ruil2
f176bf5637
modify welsenc.cfg for parameters update
2014-03-06 10:28:36 +08:00
ruil2
334c5765c7
remove inter-deblock related parameters
2014-03-06 10:26:53 +08:00
Licai Guo
585c526b1f
rebase on latest code, refine android build
2014-03-05 17:32:03 -08:00
volvet
8beb3c8c09
Merge pull request #417 from mstorsjo/unify-event-init
...
Unify the interface for creating/deleting event objects
2014-03-06 09:13:13 +08:00
Licai Guo
61dae45fad
Merge pull request #421 from mstorsjo/android-x86-build
...
Fix building android on x86
2014-03-06 09:07:26 +08:00
Ethan Hugg
4f535e31e6
Merge pull request #420 from mstorsjo/simplify-x86-asm-flags
...
Don't add -DNO_DYNAMIC_VP to ASMFLAGS
2014-03-05 07:11:41 -08:00
Ethan Hugg
4b97d2d48f
Merge pull request #414 from mstorsjo/unix-newlines
...
Convert encoder config files to unix newlines
2014-03-05 07:08:48 -08:00
volvet
97376c6339
Merge pull request #413 from mstorsjo/remove-commented-code
...
Remove commented out, unused code
2014-03-05 22:13:35 +08:00
Martin Storsjö
506826a8ae
Fix building android on x86
...
In 70360cb11
, the ASM variable was moved to the x86-common file
even though the android build file didn't include neither
platform-arch.mk nor platform-x86-common.mk.
Instead of explicitly declaring ASM here, include platform-arch.mk
and remove setting of the flags that platform-arch.mk sets.
This is inspired by and based on a patch by Licai Guo.
2014-03-05 15:19:18 +02:00
Martin Storsjö
0df3a068ba
Don't add -DNO_DYNAMIC_VP to ASMFLAGS
...
None of the assembly source uses this define for anything.
2014-03-05 15:02:53 +02:00
volvet
7ea70491c8
Merge pull request #411 from mstorsjo/arm-add-func-markers
...
Add .func/.endfunc markers in the arm assembly
2014-03-05 17:40:18 +08:00
Martin Storsjö
f384dde881
Add .func/.endfunc markers in the arm assembly
...
This adds information to debug builds.
This requires adding a separate definition of WELS_ASM_FUNC_END
for apple tools.
2014-03-05 11:25:51 +02:00
Licai Guo
eb3dd8f0ae
Merge pull request #416 from huili2/move_iTotalNumMbRec_to_pCtx
...
move iTotalNumMbRec from refpic to ctx
2014-03-05 17:12:43 +08:00
Licai Guo
e7cc8c2780
Add arm asm code for processing.
2014-03-05 16:54:05 +08:00
Martin Storsjö
d4bdef2916
Use an event name that contains the process id
...
This reduces the risk for namespace collisions if two processes
run the encoder simultaneously without address space layout
randomization.
2014-03-05 09:36:46 +02:00
Martin Storsjö
4814d5828d
Use unnamed semaphores on linux
...
This avoids the risk of namespace collisions for named semaphores
(where the names are global for the whole machine), on platforms
where we strictly don't need to use the named semaphores.
2014-03-05 09:36:46 +02:00
Martin Storsjö
5480ffafdf
Use the WelsEventOpen interface with an event name on windows as well
...
This unifies the event creation interface, even if the event
name itself is unused on windows, allowing use the exact same
code to initialize events regardless of the actual platform.
Some ifdefs still remain in the event initialization code, since
some events are only used on windows.
2014-03-05 09:36:04 +02:00
Martin Storsjö
420cfb0f2a
Convert encoder config files to unix newlines
...
The new iOS configuration file welsenc_ios.cfg was committed with
dos newlines originally, while welsenc.cfg was accidentally changed
to dos newlines in f5cd56ea74
.
2014-03-05 09:24:51 +02:00
volvet
e9395bbd35
remove un-supported mgs code
2014-03-05 15:17:07 +08:00
Martin Storsjö
04917cd13f
Remove commented out, unused code
...
Some few lines of commented out code is left, that might be useful
for debugging.
2014-03-05 08:50:59 +02:00
volvet
adb27ff0b1
Merge pull request #405 from mstorsjo/simplify-threads
...
Adjust WELS_EVENT definitions to allow sharing more code between unix and win32 codepaths
2014-03-05 12:31:15 +08:00
Licai Guo
9e4ab64c73
move iTotalNumMbRec from refpic to ctx
2014-03-04 19:23:15 -08:00
Licai Guo
ced9e41b5d
Merge pull request #399 from volvet/refine-multi-layer-process
...
refine-multi-layer-process
2014-03-05 10:45:35 +08:00
Licai Guo
248f324c62
Add intra predictor arm asm code.
2014-03-05 10:25:15 +08:00
Licai Guo
efcee63692
Remove .DS_Store file.
2014-03-05 10:24:05 +08:00
Licai Guo
bb244d736b
Partly add arm asm code to encoder.
2014-03-05 10:24:05 +08:00
volvet
7150adc91b
Merge pull request #407 from mstorsjo/do-blocking-wait
...
Do a blocking wait with WelsMultipleEventsWaitSingleBlocking
2014-03-05 09:18:45 +08:00
Licai Guo
8f981a4282
Merge pull request #409 from mstorsjo/exclude-arm-header
...
Exclude the arm assembly header as well
2014-03-05 06:16:51 +08:00
Martin Storsjö
dae8f4b737
Exclude the arm assembly header as well
...
This avoids warnings about object files not containing any symbols.
2014-03-04 23:23:19 +02:00