Commit Graph

1785 Commits

Author SHA1 Message Date
zhiliang wang
e3d8524c82 Refine EncDemo. 2014-08-21 09:10:49 +08:00
lyao2
47f1ac7307 fix Loop filter error under multithreads on encoder when #TEST_BED enabled 2014-08-20 11:54:07 +08:00
dongzha
3596b6ced0 avoid encoder crash with random pixel input 2014-08-19 15:36:27 +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
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
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
zhiliang wang
ef88889404 refine format and add UT cases 2014-08-15 09:22:37 +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
HFVideoMac
e14186b535 refine arm code for sum of frame 2014-08-14 14:41:07 +08:00
zhiliang wang
dc833e19f4 Add function define and init for SCC hash function 2014-08-14 14:20:07 +08: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
ruil2
493d254a4a merge level table 2014-08-12 09:28:40 +08:00
ruil2
f7cd6e7aad use WelsEnc namespace instead of WelsSVCEnc 2014-08-11 16:08:49 +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
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
ruil2
af417b5ae4 re-allocate resource when threadIDC changes 2014-08-08 16:43:38 +08:00
Martin Storsjö
5f0ef6a5a9 Add attributes incidating intentional data type aliasing
Interpreting data of one type via a pointer of a different type is an
aliasing violating. This means that a compiler optimizer's analyzer
can assume that data loaded into an array as uint32_t isn't related
to data read out from the same array as uint64_t, and e.g. reorder
loads/stores.

Since these structs are intentionally used to load data via pointers
of a wrong size, tell the compiler that these accesses may alias
other reads.

This fixes the GetIntraPredictorTest tests of WelsI4x4LumaPredV_c
and WelsI4x4LumaPredH_c. (The compiler optimizer did the wrong thing
as long as WelsFillingPred8to16_c or WelsFillingPred8x2to16_c were
inlined into the calling function.)
2014-08-08 11:34:45 +03:00
HFVideoMac
84f33aa8e4 Disable failed UT and Fix Build Error onAndroid 2014-08-08 10:53:23 +08:00
HFVideoMac
cff49f5e45 add arm 32/64 code and UT for SVC SCC motion estimation 2014-08-06 17:24:36 +08:00
huili2
3aec3a2606 Merge pull request #1245 from zhilwang/processing_sad
Add sad arm64 code to processing.
2014-08-06 09:31:22 +08:00
huili2
0dd0b06287 Merge pull request #1243 from ruil2/comment
add parameter verification
2014-08-05 14:58:01 +08:00
zhiliang wang
3139fe7a88 Add sad arm64 code to processing. 2014-08-05 11:23:38 +08:00
ruil2
5356249100 if dynamic slice mode, this limitation should be removed 2014-08-01 16:10:11 +08:00
ruil2
059e19074a add parameter verification 2014-08-01 12:39:29 +08:00
ruil2
11f0a11177 Merge pull request #1242 from huili2/test_dataformat
setget_dataformat_ut
2014-08-01 12:27:38 +08:00
HaiboZhu
aa41dc43bd Merge pull request #1241 from ruil2/comment
fix typo
2014-07-31 16:52:04 +08:00
ruil2
2ec91a0bbe fix typo 2014-07-31 15:14:10 +08:00
ruil2
f68b0811f0 update recontruct frame output 2014-07-31 15:10:12 +08:00
Martin Storsjö
8c663ffe66 Use the common stdint typedefs in processing as well
This fixes building test/processing/ProcessUT_AdaptiveQuantization.cpp
with MSVC.
2014-07-30 13:53:54 +03:00
huili2
e8fdd4cf75 setget_dataformat_ut 2014-07-28 18:41:58 -07:00
ruil2
eff4b3ae4d add a judgment 2014-07-29 09:37:14 +08:00
Martin Storsjö
ae62909aab Unify the indentation in the new aarch64 assembly files 2014-07-28 09:23:36 +03:00
Martin Storsjö
3240a14baa Add a missing .endm in the gnu version of macros 2014-07-28 09:01:24 +03:00
Martin Storsjö
79276c38dd Clear the executable bit for new arm64 assembly source files 2014-07-28 08:29:01 +03:00
HaiboZhu
39d490b23d Merge pull request #1224 from huili2/ec_flag_modif
modify EC API name and remove useless flag
2014-07-28 13:06:23 +08:00
huili2
933c477717 modify EC API name and remove useless flag 2014-07-27 21:35:26 -07:00
huili2
8e2d92e5c9 Merge pull request #1218 from zhilwang/arm64_vaa
Arm64 vaa
2014-07-28 09:30:16 +08:00
ruil2
e58de20f3a add encoder interface ut 2014-07-25 16:40:14 +08:00
zhilwang
b1a76aa936 Merge pull request #1215 from mstorsjo/x86-asm-noexec-stack
Mark the x86 assembly object files as not requiring an executable stack
2014-07-25 14:15:17 +08:00
zhiliang wang
7932845674 Refine code style. 2014-07-25 14:07:24 +08:00
zhiliang wang
de624c0972 Add arm64 code for vaa. 2014-07-25 14:07:24 +08:00
zhilwang
6ba537bee5 Merge pull request #1203 from dongzha/AddAQArm64
add ARM64 Adaptative Quantization code and UT
2014-07-25 13:46:10 +08:00
ruil2
1c42743999 fix crash bugs that too large size local varialbe will cause stack overflow 2014-07-25 09:55:41 +08:00
ruil2
7624b360f0 Merge pull request #1214 from mstorsjo/use-min-qp
Actually use iMinQp in WelRcPictureInitBufferBasedQp
2014-07-25 09:47:15 +08:00
huili2
a8286234bb Merge pull request #1204 from syureyi/mobile_AT
Mobile at
2014-07-25 08:52:20 +08:00
Martin Storsjö
d5a45ec513 Mark the x86 assembly object files as not requiring an executable stack
This avoids having to add extra linker flags in order to specify this.

This is similar to how this already is handled for the arm assembly.
2014-07-25 00:56:39 +03:00
Martin Storsjö
d215a5f879 Actually use iMinQp in WelRcPictureInitBufferBasedQp
This fixes a warning in certain builds, about the variable iMinQp
being set but not used. This also probably is what was intended originally.
2014-07-25 00:46:35 +03:00
huili2
470246c20f Merge pull request #1195 from mstorsjo/msvc-unify-linker-opts
Set MSVC linker debug options consistently in the project files
2014-07-23 13:29:14 +08:00
HFVideoMac
910c64ef22 add ARM64 Adaptative Quantization code and UT 2014-07-22 15:07:25 +08:00
zhiliang wang
e2425df06c Add arm64 downsample code to processing project 2014-07-22 10:16:55 +08:00
syureyi
9b11f25300 also format the file 2014-07-21 16:26:33 +08:00
syureyi
a555639dd2 check in the code for do codec performance testing on mobile 2014-07-21 15:31:43 +08:00
HFVideoMac
0d1699b67f Add Unit Test and ARM64 code for block_add 2014-07-21 14:37:52 +08:00
zhilwang
9ac7cd2816 Merge pull request #1191 from mstorsjo/merge-encdemo-include-paths
Set the encDemo header paths on the target level
2014-07-18 17:01:46 +08:00
zhilwang
3797aa1a14 Merge pull request #1194 from mstorsjo/msvc-simplify-output-dirs
Use macros for setting the output directory in MSVC project files
2014-07-18 16:59:28 +08:00
zhilwang
811e20f0d9 Merge pull request #1185 from mstorsjo/android-l-preview
Fix building for the Android L preview release, add support for new 64 bit Android ABIs
2014-07-18 16:56:22 +08:00
Martin Storsjö
71e59fd31c Set MSVC linker debug options consistently in the project files 2014-07-18 11:26:26 +03:00
Martin Storsjö
f26c7e3f4f Use macros for setting the output directory
This makes sure this is set to the exact same string in all
the configurations, simplifying editing multiple configurations
at the same time.

This changes the output directory for 64 bit binaries from
bin/win64 to bin/x64, but this is the common pattern used by
MSVC in new projects.
2014-07-18 11:23:48 +03:00
huili2
7e3812c970 Merge pull request #1148 from mstorsjo/dont-hardcode-xcode-archs
Don't hardcode the valid architectures in one xcode project
2014-07-18 09:24:31 +08:00
huili2
2627c05117 Merge pull request #1130 from mstorsjo/default-intermediates-path
Use default paths for and object files and other intermediate files
2014-07-18 09:23:30 +08:00
Martin Storsjö
8d22836ecd Set the encDemo header paths on the target level
Currently half of them are set on the project level, and half of them
on the target level.

In all other projects within OpenH264, they're set on the target level.
2014-07-17 17:41:06 +03:00
Martin Storsjö
fa8e56e944 Unify the setting "Build Active Architecture Only"
Set it to Yes in Debug configurations, set on the project level
(not at the target level).
2014-07-17 12:36:49 +03:00
huili2
288e2b3cdf Merge pull request #1188 from ruil2/trace_tag
fix reference frame update issue which will casue crash
2014-07-17 13:40:31 +08:00
ruil2
63e3c6588a fix reference frame update issue which will casue crash 2014-07-17 12:45:17 +08:00
dongzha
a0320dac5d Merge pull request #1186 from huili2/diff_logic_WME_master
modify the logic for WME usage
2014-07-17 10:43:49 +08:00
dongzha
74b52e8a31 Merge pull request #1183 from ruil2/trace_tag
add trace tag
2014-07-17 10:43:14 +08:00
ruil2
ef7cce3d14 modify trace output 2014-07-17 10:09:52 +08:00
huili2
a0e569da81 modify the logic for WME usage 2014-07-16 18:14:53 -07:00
dongzha
cd026ef166 Merge pull request #1152 from mstorsjo/xcode-inherit-include-paths
Include inherited header search paths in all projects
2014-07-17 08:42:15 +08:00
dongzha
2db10df5c6 Merge pull request #1180 from huili2/dpb_green_issue_master
solve green issue combined with EC and multi-packet input
2014-07-17 08:41:27 +08:00
dongzha
2a83a85eb7 Merge pull request #1151 from mstorsjo/unify-deployment-target
Set the iOS deployment target consistently
2014-07-17 08:40:39 +08:00
Martin Storsjö
9aaeef9264 Manually define the SWelsTime struct on unix, don't rely on struct timeb
We don't use the ftime function on unix for filling SWelsTime anyway,
we fill the time and millitm fields manually.

On android, the sys/timeb.h header has been removed in the next
platform version (currently available in NDK r10 in the "L preview"
release), since this header and the ftime function have been removed
from the POSIX 2008 specification.

This fixes compilation when targeting the Android "L preview" release,
even when targeting the 32 bit ABIs.
2014-07-16 21:32:18 +03:00
Martin Storsjö
6966679f33 Remove unused includes of sys/timeb.h
This header is included by crt_util_safe_x.h whenever necessary (it's
all hidden in the SWelsTime struct) - code which does not explicitly
use things from sys/timeb.h shouldn't include it.
2014-07-16 21:31:07 +03:00
ruil2
b9058e4987 add trace tag 2014-07-16 16:49:53 +08:00
huili2
e63dad0b6c Merge pull request #1172 from ruil2/pause_remove
remove pause frame interface which will be done in application level
2014-07-16 13:57:46 +08:00
ruil2
29bb1df645 Merge pull request #1177 from huili2/version_all
version-generate
2014-07-16 10:35:20 +08:00
ruil2
f94a20d7b5 Merge pull request #1174 from huili2/border_green_master
expand pic for EC
2014-07-16 10:01:02 +08:00
Martin Storsjö
c9a6482fc6 Use default paths for and object files and other intermediate files
This makes sure that one can build for all architectures without
having the intermediates from one clobber the other.
2014-07-15 13:00:56 +03:00
huili2
9626596421 Merge pull request #1143 from mstorsjo/remove-stray-option
Remove a stray option set on only one MSVC project
2014-07-15 17:56:38 +08:00
huili2
b7ea251e95 Merge pull request #1142 from mstorsjo/remove-unused-hardcoded-paths
Don't set a custom path to browse information files, when no browse information is generated
2014-07-15 17:55:46 +08:00
huili2
d7f3331c9d solve green issue combined with EC and multi-packet input 2014-07-15 02:51:20 -07:00
huili2
7f36b244f7 Merge pull request #1158 from HaiboZhu/Debug_codenomicon_3_015584
Debug for InitRefPicList
2014-07-15 17:50:51 +08:00
huili2
333cf6aa97 version-generate 2014-07-14 23:39:31 -07:00
huili2
b02f75f608 expand pic for EC 2014-07-14 23:28:46 -07:00
ruil2
010e423b2b Merge pull request #1169 from sijchen/interfaceUT12
[Encoder UT] Interface: EncoderEncodeParameterSets
2014-07-15 14:20:18 +08:00
ruil2
3632a0331c remove pause frame interface which will be done in application level 2014-07-15 11:05:05 +08:00
huili2
c4fc6642cf reuse dsNoParamSets in dec 2014-07-14 18:47:40 -07:00
Martin Storsjö
110ce9ceca Remove an unused variable
This fixes build warnings with clang on OS X.
2014-07-14 15:44:26 +03:00
Sijia Chen
b669801e89 add interface UT for WelsEncoderEncodeParameterSets
and fix previous value
2014-07-14 18:36:35 +08:00
ruil2
36cfb3bd32 add buffer based rc 2014-07-14 13:57:03 +08:00
ruil2
4cdee3b2d1 Merge pull request #1150 from mstorsjo/unify-sdk-setting
Don't hardcode the sdk on the target level
2014-07-12 16:02:49 +08:00
Martin Storsjö
edb9872473 Include inherited header search paths in all projects 2014-07-11 11:41:23 +03:00
Martin Storsjö
301ccb1081 Set the iOS deployment target consistently
Set it on the project level, don't override it on the target level.

Set the deployment target to 6.0 everywhere.
2014-07-11 11:39:08 +03:00
Martin Storsjö
c0c51eb73e Don't hardcode the sdk on the target level
It's already set on the project level, and this is the default
value anyway.

This was the only project where the sdk was set on the target level.
2014-07-11 11:27:22 +03:00
Martin Storsjö
e9610e465e Don't hardcode the valid architectures in one xcode project
There's no reason to hardcode these here - these are the default.
(We keep the intentionally hardcoded default arch in the
codec_unittest project though.)
2014-07-11 11:20:10 +03:00
Martin Storsjö
b63b13e6f0 Don't hardcode an include path to the xcode default toolchain
The necessary system include paths are already inherited, and manually
forcing this location can cause conflicts if using different versions
of xcode installed in parallel.

None of the other xcode projects hardcode this path.
2014-07-11 11:11:32 +03:00
huili2
140a67dfc9 Merge pull request #1144 from syureyi/openh264xcode
add openh264 xcode and adjust processing xcode project
2014-07-11 15:33:41 +08:00
Haibo Zhu
cbc5f3bf4b Remove the call function parameter. 2014-07-10 22:54:35 -07:00
Sijia Chen
99dc18c0ba add BasicInitialize UT and some fix in create/destroy encoder in the existing interface test 2014-07-11 13:50:58 +08:00
Haibo Zhu
79891067e9 Debug for codenomicon bits, when one picture contains diff types of slices(I, P),may request null ref list. 2014-07-10 20:17:18 -07:00
syureyi
a3800d205d add openh264 xcode and adjust processing xcode project 2014-07-10 20:47:27 -06:00
dongzha
da0f65ea0a Merge pull request #1140 from zhilwang/x86_64-downsample
Add X86 64bit asm code for downsample
2014-07-11 08:48:45 +08:00
huili2
6310017877 Merge pull request #1139 from huili2/parse_fail_master
add return info for all cases
2014-07-10 17:48:18 +08:00
ruil2
c72f82e7a7 Revert "turn off LTR for screen content. after checking LTR logic, will turn on"
This reverts commit 0fda3d9235.
2014-07-10 16:20:54 +08:00
Martin Storsjö
0dc2c3b031 Remove a stray option set on only one MSVC project
No other projects create browse information, and browse information
for the decConsole project alone doesn't help much. This is also
only enabled in debug mode, further indicating that this option is
only enabled accidentally, not by purpose.
2014-07-10 10:16:58 +03:00
Martin Storsjö
21691a6741 Don't set a custom path to browse information files, when no browse information is generated
These projects never had browse information generation enabled.
2014-07-10 10:15:30 +03:00
huili2
209c607020 add return info for all cases 2014-07-09 23:06:40 -07:00
Martin Storsjö
d5c71dbe2f Use the correct syntax for the aarch64 ext instructions
Since Xcode 5.1, the apple tools actually support using the
official, correct syntax for the ext instructions. This syntax
is already used in a number of places already - use it consistently,
and get rid of the compatibility hacks.
2014-07-10 08:53:41 +03:00
huili2
019fb9e20e Merge pull request #1132 from mstorsjo/unify-encoder-opts
Unify optimization options within the encoder MSVC projects
2014-07-10 13:50:48 +08:00
dongzha
0cafc565be Merge pull request #1121 from ruil2/interface_update_1
interface update
2014-07-10 10:15:30 +08:00
zhiliang wang
eaf7d65518 Align C version to asm function. 2014-07-10 09:38:07 +08:00
ruil2
7bb422803d Merge pull request #1131 from mstorsjo/avoid-hardcoding-paths
Use $(OutDir) instead of hardcoding the directory name
2014-07-10 09:30:37 +08:00
dongzhang
beaf7c1893 speed up memory loading in arm64 MC 2014-07-09 18:22:42 +08:00
Martin Storsjö
e5eed1f65b Remove stray optimization options from the WelsEncPlus project
There's not much performance critical code within this lib, all
the performance critical code in the encoder is in WelsEncCore and
WelsVP, so there's little point in having an extra odd option enabled
here.
2014-07-09 13:14:08 +03:00
Martin Storsjö
ac0e5cb7b4 Set optimizer options in WelsVP similarly to the other encoder projects 2014-07-09 13:13:59 +03:00
Martin Storsjö
013de2602a Use $(OutDir) instead of hardcoding the directory name
This is how it is done in the other projects.
2014-07-09 13:12:12 +03:00
huili2
b86e1f00b2 Merge pull request #1127 from ruil2/temporal_bug_fix
fix bug when temporal layer changes
2014-07-09 17:26:59 +08:00
huili2
a29645cefe Merge pull request #1125 from mstorsjo/remove-unused-options
Don't set custom build options for VCMIDLTool
2014-07-09 17:26:21 +08:00
huili2
e465cc8bc3 Merge pull request #1124 from mstorsjo/consistent-debug-options
Set DebugInformationFormat consistently in all projects
2014-07-09 17:25:58 +08:00
huili2
fb52509cee Merge pull request #1122 from mstorsjo/remove-hardcoded-defaults
Remove some manually set options, that are set to the default value
2014-07-09 17:25:26 +08:00
huili2
9ccfea24a7 Merge pull request #1120 from mstorsjo/remove-nonexistent-paths
Remove unnecessarily set AdditionalLibraryDirectories
2014-07-09 17:24:41 +08:00
ruil2
821483a4e9 fix bug when temporal layer changes 2014-07-09 16:43:58 +08:00
Martin Storsjö
569033c091 Don't set custom build options for VCMIDLTool
This tool isn't even used in the build (and thus, these settings
aren't even visible in the IDE).
2014-07-09 10:48:15 +03:00
Martin Storsjö
46c4335cb5 Set DebugInformationFormat consistently in all projects
Use the "Program Database (/Zi)" in release mode and in debug
mode for x64, use "Program Database for Edit & Continue (/ZI)"
in debug mode for Win32.

This is how new visual studio projects are set by default.
2014-07-09 10:46:18 +03:00
Martin Storsjö
79f80ac7da Don't set path to a precompiled header - precompiled headers are disabled 2014-07-09 10:43:57 +03:00
Martin Storsjö
3068814e90 Remove some manually set options, that are set to the default value
These are the only places where these options are overridden.
2014-07-09 10:42:32 +03:00
ruil2
45c2fff6b8 interface update 2014-07-09 15:41:04 +08:00
Martin Storsjö
fb47e529fc Remove unnecessarily set AdditionalLibraryDirectories
Some of these even pointed to directories that don't exist (and
don't get created during the build process).
2014-07-09 10:35:54 +03:00
huili2
adb0fa498f astyle all cpp files 2014-07-08 20:01:42 -07:00
huili2
0dbdbfb53b Merge pull request #1115 from huili2/dec_log_decrease
decrease dec log size
2014-07-09 10:59:56 +08:00
huili2
581f8fdf79 decrease dec log size 2014-07-08 19:46:01 -07:00
huili2
5f8822644f Merge pull request #1108 from mstorsjo/regenerate-makefiles
Regenerate the targets.mk files
I'm not able to see the changes in rbcommons (strange), so directly look at here.
2014-07-09 10:14:04 +08:00
huili2
c2dd7df0f2 Merge pull request #1110 from mstorsjo/neon-deblock-fix
Check left/top flag instead of uiNeighborAvail in neon deblocking
2014-07-09 10:10:53 +08:00
huili2
6897398175 Merge pull request #1112 from huili2/EC_IDR_request
mark decoder always ECed status until correct IDR comes
2014-07-09 09:33:38 +08:00
huili2
7b9ae15482 Merge pull request #1114 from huili2/GREY
new IDR inserted as GREY
2014-07-09 09:33:06 +08:00
zhilwang
228ea1a668 Merge pull request #1101 from dongzha/AddArm64MBCopy
add arm64 MB COPY code and UT
2014-07-09 09:31:31 +08:00
zhilwang
ce740ee19e Merge pull request #1113 from mstorsjo/asm-indent
Fix indentation of macros in reconstruct_aarc64_neon.S
2014-07-09 09:04:22 +08:00
zhilwang
1ae709dde0 Merge pull request #1106 from mstorsjo/fix-aarch64-hadamard
Fix WelsHadamardQuant2x2*_AArch64_neon
2014-07-09 09:03:14 +08:00
huili2
1a58488aeb new IDR inserted as GREY 2014-07-08 17:58:23 -07:00
Martin Storsjö
cc8a2bd07e Fix indentation of macros in reconstruct_aarc64_neon.S 2014-07-08 20:16:28 +03:00
huili2
ce43674703 mark decoder always ECed status until correct IDR comes 2014-07-08 08:42:31 -07:00
zhilwang
6ff2b84736 Merge pull request #1107 from mstorsjo/fix-aarch64-gnu-build
Fix building for aarch64 with gnu binutils
2014-07-08 19:31:50 +08:00
zhiliang wang
ae12fbde1c Add x86 64bit asm code for downsample 2014-07-08 19:25:31 +08:00
Martin Storsjö
e5abbdcdab Check left/top flag instead of uiNeighborAvail in neon deblocking
When deblocking over slice edges (in single threaded sliced
encoding), uiNeighborAvail might say that a MB isn't available,
even though it is available for deblocking here.

This fixes the encoder test of dynamic slicing, with neon
optimizations enabled.
2014-07-08 13:53:28 +03:00
sijchen
ca61e286b4 Merge pull request #1104 from ruil2/rc_fix_1
turn off LTR for screen content. after checking LTR logic, will turn on
2014-07-08 16:48:19 +08:00
Martin Storsjö
7fc869cf0f Regenerate the targets.mk files
This makes the indentation of some new lines consistent with the rest.
2014-07-08 11:42:05 +03:00
Martin Storsjö
03d9f07671 Fix WelsHadamardQuant2x2*_AArch64_neon
In WelsHadamardQuant2x2SkipKernel_AArch64_neon, write the output
of cmhi into v0 - this is the register that is assumed to hold
the output.

In WelsHadamardQuant2x2_AArch64_neon, subtract the count of zero
elements from 4, not from 16.

This makes the encoding unit tests pass again.
2014-07-08 11:36:40 +03:00
Martin Storsjö
86b3a999d5 Use mov.16b instead of mov.8h
According to the arm architecture reference manual, the mov (vector)
instruction can only use the arrangement specifiers '8b' and '16b'.
The apple tools still accept the '8h' form, but it assembles into the
same as '16b'. (When copying a vector register to another, the element
size in the vectors don't matter.)

This fixes building with gnu binutils.
2014-07-08 11:34:44 +03:00
Martin Storsjö
3a1cc63649 Don't use the non-standard apple syntax in a gnu version of a macro 2014-07-08 11:34:44 +03:00
ruil2
0fda3d9235 turn off LTR for screen content. after checking LTR logic, will turn on
it
2014-07-08 16:15:51 +08:00
huili2
c228c51423 Merge pull request #1102 from ruil2/rc_fix_1
add skip frame processing for screen content
2014-07-08 16:14:01 +08:00
Sijia Chen
0a6819c0b7 remove unnecessary log output 2014-07-08 15:43:15 +08:00
ruil2
d98cefecec add skip frame processing for screen content 2014-07-08 14:41:34 +08:00
dongzhang
249b8a0aa6 add arm64 MB COPY code and UT 2014-07-08 14:22:14 +08:00
zhilwang
c1a24d52f5 Merge pull request #1099 from mstorsjo/fix-chmod
Remove the executable bit from new assembly source files
2014-07-08 13:59:05 +08:00
Martin Storsjö
01835134ee Remove the executable bit from new assembly source files 2014-07-08 08:46:44 +03:00
dongzhang
eace9b7b00 add MemoryZero Arm64 code and UT 2014-07-08 12:52:48 +08:00
dongzha
6489e7b38a Merge pull request #1096 from huili2/early_stop_parse_rec_bug
stop early error for parse/recon MB
2014-07-08 12:49:42 +08:00
huili2
1ec213d5a7 stop early error for parse/recon MB 2014-07-07 21:27:44 -07:00
dongzha
e66cf5369e Merge pull request #1091 from zhilwang/arm64-downsample
Add arm64 code for downsample.
2014-07-08 10:31:40 +08:00
huili2
9a68572240 Merge pull request #1092 from dongzha/AddRecARM64CodeAndUT
Add ARM64 Code and UnitTest for reconstruction
2014-07-08 10:31:22 +08:00
ruil2
589e40aa67 Merge pull request #1094 from huili2/ec_grey_replace_green
use grey instead of green in EC without ref
2014-07-07 17:39:37 +08:00
huili2
fb6379eeb1 use grey instead of green in EC without ref 2014-07-07 02:24:51 -07:00
ruil2
b52aff7225 bEnableSceneChangeDetect should be true for screen content 2014-07-07 16:53:49 +08:00
HaiboZhu
f22a9e890f Merge pull request #1093 from huili2/ec_return_error
LTR feedback check in decoder
2014-07-07 15:58:20 +08:00
dongzhang
d88b83df44 Add ARM64 Code and UnitTest for reconstruction 2014-07-07 15:31:46 +08:00
zhiliang wang
5cb66bd8a7 Add arm64 code for downsample. 2014-07-07 10:25:23 +08:00
huili2
60314ff570 LTR feedback check in decoder 2014-07-06 19:17:50 -07:00
huili2
5a60d0fef4 Merge pull request #1090 from HaiboZhu/Debug_ExpandBsBuffer
Remove warning
2014-07-07 10:17:41 +08:00
Haibo Zhu
863852259d Remove warning 2014-07-06 19:04:59 -07:00
ruil2
9015bd4049 fix typo 2014-07-05 17:08:38 +08:00
ruil2
21e3e81536 add some protection on rc module 2014-07-05 17:04:14 +08:00
ruil2
7cfce53f53 Merge pull request #1084 from JuannyWang/maxbr_refine
modify console for disable delay skip if maxbr==0
2014-07-05 14:12:55 +08:00
huili2
f1a0a81226 dpb uninitial crash for EC 2014-07-04 20:40:41 -07:00
huili2
ab41e69a5e Merge pull request #1087 from HaiboZhu/Debug_ExpandBsBuffer
Debug about the ExpandBsBuffer (have no Bs buffer offset reset)
2014-07-04 22:28:20 +08:00
zhilwang
821ff96c70 Merge pull request #1085 from mstorsjo/fix-msvc-autobuild-script
Fix running the MSVC autobuild bat script
2014-07-04 21:40:08 +08:00
Martin Storsjö
c2cde65ac9 Explicitly mention WelsVP.lib as an additional dependency
This fixes building welsenc.dll from AutoBuild_Windows_VS2008.bat,
since the project interdependencies aren't taken into account
automatically in the linker commands when building one project at a
time.
2014-07-04 15:11:47 +03:00
Haibo Zhu
8e400f19d2 Debug about the ExpandBsBuffer (have no Bs buffer offset reset) 2014-07-04 04:19:16 -07:00
ruil2
ee425ec785 Merge pull request #1083 from JuannyWang/maxbr_refine
disable delay skip if maxbr==0 (that means no maxbr setting from upper layer)
2014-07-04 18:45:09 +08:00
JuannyWang
c05e1ad797 modify console for disable delay skip if maxbr==0 2014-07-04 18:44:03 +08:00
ruil2
aa1786254a Merge pull request #1082 from mstorsjo/msvc-ltcg
Enable whole program optimization for both decoder and encoder MSVC projects
2014-07-04 18:40:36 +08:00
JuannyWang
24cd5afa33 disable delay skip if maxbr=0 which means no maxbr setting from upper layer 2014-07-04 18:25:55 +08:00
Martin Storsjö
31e3884a68 Enable whole program optimization for both decoder and encoder MSVC projects
Enable it on the project level, instead of having to set separate options
for both compiler and linker.

The processing project actually had the options set in this way originally
as well.
2014-07-04 11:59:45 +03:00
ruil2
0fa845ed27 Merge pull request #1081 from sijchen/scc_param_valid
avoid using AQ which is untuned for screen route
2014-07-04 16:35:02 +08:00
huili2
ef0c3e2b91 Merge pull request #1075 from HaiboZhu/Debug_InvHadamard_Chroma
Debug for chroma inv-hadamard dequant mismatch error
2014-07-04 13:49:36 +08:00
HaiboZhu
5dbd3f01ea Merge pull request #1080 from huili2/enable_ASM_EC
add missing ASM in EC
2014-07-04 13:46:46 +08:00
sijchen
10804f316e avoid using AQ which is untuned for screen route 2014-07-04 11:02:24 +08:00
ruil2
9506f71b43 Merge pull request #1060 from mstorsjo/loopfilter-multithreading
Only force iLoopFilterDisableIdc to 2 if multithreading has been enabled
2014-07-04 10:43:41 +08:00
sijchen
fb4c907ecb Merge pull request #1076 from lyao2/RCdiv
refactor code to eliminate potential div by 0, review at: https://rbcommons.com/s/OpenH264/r/595/
2014-07-04 10:31:38 +08:00
ruil2
2bb23a79ed Merge pull request #1061 from mstorsjo/welsenc-init-defaults
Use GetDefaultParams instead of memset to initialize SEncParamExt in the console test app
2014-07-04 10:21:36 +08:00
huili2
3f5f0d6a57 add missing ASM in EC 2014-07-03 18:43:52 -07:00
lyao2
21deaddc48 refactor code to eliminate potential div by 0 2014-07-03 15:01:48 +08:00
Haibo Zhu
e0ba5cd9f3 Debug for Chroma InvHadamard Dequant error 2014-07-02 23:36:44 -07:00
Martin Storsjö
6e40991cc7 Only force iLoopFilterDisableIdc to 2 if multithreading has been enabled
Previously these lines were within an #ifdef MT_ENABLED block,
but now that threading is enabled by default, we should probably
only do it if threading has been requested.
2014-07-03 08:38:23 +03:00
ruil2
2c250179dc Merge pull request #1071 from ganyangbbl/typo_bug
fix a typo issue in ParamValidation
2014-07-03 11:23:33 +08:00
ruil2
f245dc34ff Merge pull request #1062 from sijchen/scc_md_bgd1
fix BGD under screen and remove a build warning in ME
2014-07-03 11:23:17 +08:00
ganyang
01559a684e fix a typo issue in ParamValidation 2014-07-03 11:02:09 +08:00
Sijia Chen
49fb042f21 add bgd fix to camera route as well to avoid visible artifact when using fake content in video 2014-07-03 11:01:02 +08:00
zhilwang
782e94b05c Merge pull request #1065 from mstorsjo/remove-old-includes
Remove leftover include directories
2014-07-03 09:21:11 +08:00
Martin Storsjö
1c1468210f Remove leftover include directories
codec/common no longer contains headers, they're all in
codec/common/inc now.
2014-07-02 13:31:36 +03:00
Sijia Chen
0a3db78bb9 fix BGD under screen and remove a build warning in ME 2014-07-02 16:50:59 +08:00
Martin Storsjö
4d494cb0f1 Use GetDefaultParams instead of memset to initialize SEncParamExt in the console test app
Most of the default parameters still are overwritten with hardcoded
values in FillSpecificParameters though, but this makes sure that
defaults are applied for any new fields at least.
2014-07-02 11:47:31 +03:00
ruil2
3ef97dc0c9 Merge pull request #1057 from sijchen/scc_md_merge11
[Encoder] Completing and bug-fixing the screen content MD/ME process
2014-07-02 14:02:51 +08:00
ruil2
bdf9f6b4ff Merge pull request #1043 from mstorsjo/avoid-globals
Get rid of global non-readonly variables within the library
2014-07-02 14:01:35 +08:00
Sijia Chen
a964ae8cfa completing and bug-fixing the screen content MD/ME process 2014-07-02 10:33:47 +08:00
huili2
19273b1ae5 Merge pull request #1052 from sijchen/scc_md_merge2
[Processing] fix the different threshold between camera and screen
2014-07-02 10:33:14 +08:00
huili2
05cd0e8ada fix when output enabled in encoder 2014-07-01 02:13:03 -07:00
Martin Storsjö
e5609bc0fe Remove global function pointers in the encoder MC code
This is similar to how this is done in the decoder part of MC.
2014-07-01 12:01:48 +03:00
Martin Storsjö
130c682c29 Avoid intermediate function pointers for some function pointers that are never overridden
These are only used in the leaf C versions of functions anyway.
2014-07-01 12:01:48 +03:00
Martin Storsjö
586d0ba3dc Reduce code duplication 2014-07-01 12:01:48 +03:00
Martin Storsjö
00f28cc185 Avoid using static arrays for keeping track of frame dumping state 2014-07-01 12:01:48 +03:00
Martin Storsjö
1888fba336 Move pfCavlcParamCal into the function pointer list
This avoids using a global variable for this function.
2014-07-01 12:01:48 +03:00
Martin Storsjö
d84d739ec8 Hardwire functions set up in WelsInitFillingPredFuncs
These are never overridden by any assembler optimized versions.
(The assembler optimized intra predictor functions may use such
optimized code internally anyway.)

This avoids global writable data.
2014-07-01 12:00:32 +03:00
Martin Storsjö
9ef09861cf Don't use and modify function pointers in global static tables
Make the tables const and keep a copy of the table in the
SWelsFuncPtrList struct instead, where any modifications to
the table only touch that individual instance of the codec.
2014-07-01 12:00:14 +03:00
zhilwang
3a6f51781d Merge pull request #1044 from mstorsjo/android-cleanup-compiler-flags
Simplify the compiler flags for the android test projects
2014-07-01 15:31:22 +08:00
huili2
5b004048ed Merge pull request #1051 from ruil2/overflow_check
check each WriteBlockResidualCavlc to avoid overflow
2014-07-01 15:25:59 +08:00
huili2
4486e328d4 Merge pull request #1050 from ruil2/update_param
fix error judgment on return value in pauseframe
2014-07-01 15:25:06 +08:00
ruil2
325c63d0ca Merge pull request #1047 from mstorsjo/cpufeatures-armv8
Update the generic 32 bit arm linux cpu feature detection to support 64 bit kernels
2014-07-01 14:53:52 +08:00
ruil2
32ce337eb0 check each WriteBlockResidualCavlc to avoid overflow 2014-07-01 14:50:50 +08:00
ruil2
ffb38322d0 fix error judgment on return value in pauseframe 2014-07-01 14:36:46 +08:00
ruil2
806e59fcb1 Merge pull request #1045 from mstorsjo/share-read-config
Share one implementation of CReadConfig between both console apps
2014-07-01 08:55:07 +08:00
Martin Storsjö
04c6c95577 Update the generic 32 bit arm linux cpu feature detection to support 64 bit kernels
On 64 bit kernels, /proc/cpuinfo doesn't list the same old features
as on 32 bit kernels, since most of them are mandatory on 64 bit arm
systems, see [1] for details.

If running a 32 bit arm binary on such a kernel, we need to detect
the features slightly differently, either by using other names
listed in the Features field on these devices, by checking the
"CPU architecture" field and always enabling these if the architecture
is >= 8, or by parsing /proc/self/auxv or using the getauxval function.

[1] http://marc.info/?l=linux-arm-kernel&m=139087240101974
2014-06-30 09:51:49 +03:00
Martin Storsjö
7ae3fbcfbf Share one implementation of the CReadConfig class between the decoder and encoder console apps 2014-06-30 09:04:12 +03:00
Martin Storsjö
b4b1d1df8c Move a struct to the actual place where it's used
It's not related to the config reader.
2014-06-30 09:04:08 +03:00
Martin Storsjö
4af37a7d21 Move common tables and definitions into the common library 2014-06-30 09:03:10 +03:00
Martin Storsjö
44ebe7dea4 Rename a decoder macro to the name used in the encoder 2014-06-30 09:03:10 +03:00
Martin Storsjö
578060373a Rename data types in the decoder to match the name used in the encoder 2014-06-30 09:03:10 +03:00
Martin Storsjö
eb7cdf2bda Rename some decoder tables to match the name used in the encoder 2014-06-30 09:03:10 +03:00
Martin Storsjö
4aa22da812 Remove an unused constant 2014-06-30 09:03:10 +03:00
zhilwang
2b038fa73b Merge pull request #1037 from mstorsjo/unify-align-macros
Unify macros for alignment
2014-06-30 10:09:05 +08:00
zhilwang
e9b8d927ca Merge pull request #1039 from mstorsjo/unify-msvc-project-files
Unify some details in MSVC project files
2014-06-30 10:08:40 +08:00
zhilwang
17f3dd5ae6 Merge pull request #1041 from mstorsjo/upgrade-ios-projects
Mark xcode projects as upgraded to/checked for the latest version
2014-06-30 10:07:16 +08:00
zhilwang
1780a81a1d Merge pull request #1042 from mstorsjo/avoid-ios-build-warnings
Avoid warnings when building for iOS
2014-06-30 10:06:52 +08:00
zhilwang
bfd8f97578 Merge pull request #1040 from mstorsjo/gitignore-msvc
Ignore files generated by MSVC
2014-06-30 10:05:54 +08:00
zhilwang
eb221eb3d1 Merge pull request #1030 from mstorsjo/cpuid-32bit-param
Don't load undefined bits into rcx before calling the cpuid instruction
2014-06-30 10:05:26 +08:00
zhilwang
58349156b1 Merge pull request #1035 from mstorsjo/aarch64-cpufeatures
Implement WelsCPUFeatureDetect for AArch64
2014-06-30 10:04:03 +08:00
zhilwang
fd132aba0f Merge pull request #1033 from mstorsjo/aarch64-typofix
Fix a typo in arm64 assembly macros, ARCH64 -> AARCH64
2014-06-30 10:02:41 +08:00
zhilwang
0549fb99eb Merge pull request #1034 from mstorsjo/aarch64-combined-satd-sad
Prefer modes in the same order as the reference, in the aarch64 combined intra satd/sad
2014-06-30 10:01:09 +08:00
Martin Storsjö
68b4b09ae6 Don't load undefined bits into rcx before calling the cpuid instruction
The pFeatureC pointer is an uint32_t pointer, therefore only
load 32 bits into ecx.

This avoids loading potentially uninitialized data into the upper
half of the rcx register, fixing valgrind warnings in some build
setups (depending on how the compiler chooses to layout the stack
in the calling function).
2014-06-29 20:46:55 +03:00