Commit Graph

223 Commits

Author SHA1 Message Date
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
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
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
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
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ö
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ö
4af37a7d21 Move common tables and definitions into the common library 2014-06-30 09:03:10 +03: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
Martin Storsjö
a01d6812ed Simplify the compiler flags for the android test projects
These parts aren't performance critical, thus overriding the
compiler optimization flags (and arm instruction mode) isn't
necessary.
2014-06-29 19:59:10 +03:00
Martin Storsjö
f6302ea414 Mark xcode projects as upgraded to/checked for the latest version
This avoids some warnings when building. This shouldn't affect
building with older xcode versions.
2014-06-29 16:06:07 +03:00
Martin Storsjö
83d7c3547c Ignore files generated by MSVC 2014-06-29 13:59:18 +03:00
Martin Storsjö
3a43c6bad4 Remove custom, manual linker options for the encoder in the MSVC project files 2014-06-29 13:51:54 +03:00
Martin Storsjö
157935e9a0 Write map files to the default directory instead of a custom directory 2014-06-29 13:49:33 +03:00
Martin Storsjö
7fba7a08bc Set ProgramDatabaseFile to the default used in all other project files 2014-06-29 13:49:33 +03:00
dongzha
300bbfb67b Merge pull request #1014 from zhilwang/arm64-intraSad
Add arm64 neon code for intraSad&Satd
2014-06-27 15:55:33 +08:00
zhiliang wang
e389cf4348 refine file name. 2014-06-27 14:11:04 +08:00
huili2
dc3fae4477 astyle all 2014-06-25 18:50:41 -07:00
zhiliang wang
f0ec323e2c Add arm64 neon code for intraSad&Satd 2014-06-25 13:43:26 +08:00
huili2
fa0eee2470 Merge pull request #990 from zhilwang/arm64-intrapred
Add Arm64 neon Intra-pred code
2014-06-21 07:03:24 +08:00
ruil2
1111757977 Merge pull request #967 from dongzha/Deblock_AArch64
add arm 64 deblock code and Unit Test code
2014-06-16 17:19:25 +08:00
zhiliang wang
947e3c64fe Add arm64 code for intra-pred 2014-06-13 15:21:48 +08:00
Martin Storsjö
dc91e0958b Integrate the lone function from logging.cpp into welsCodecTrace.cpp 2014-06-11 08:08:56 +03:00
dongzhang
0e0c8b5569 add arm 64 deblock code and Unit Test code 2014-06-10 11:23:51 +08:00
ruil2
4c12f8970c cleanup trace module 2014-06-10 10:24:45 +08:00
Martin Storsjö
e1f28cea96 Remove the now unused XCTest.framework references 2014-06-06 10:34:39 +03:00
Martin Storsjö
7773506b00 Remove leftover references to the newly removed test projects 2014-06-06 10:32:26 +03:00
ruil2
2d61c97bc7 remove a redundant file in encDemo project 2014-06-06 13:34:32 +08:00
ruil2
ece06b37da resolve unit test warnings 2014-06-06 13:29:30 +08:00
Martin Storsjö
837a582510 Remove unnecessary autogenerated stub iOS test projects
The actual unit tests will be hooked up in a separate project.
2014-06-05 12:13:58 +03:00
dongzha
51b2ff84fc Merge pull request #918 from syureyi/de7621
for cleaning .o and .d files generated by android demo
2014-06-05 10:02:24 +08:00
zhuling13
6bf7ad4e2b and space to colon, modify bad note 2014-06-04 18:23:19 -07:00
Kento
977d7cd0b3 Update common.xcodeproj to build successfully 2014-06-04 17:28:48 +09:00
ruil2
030492de19 update decoder mac project for expand picture files position change 2014-06-04 10:08:58 +08:00
JuannyWang
fbacfbdb69 fix ios build error caused by expand_pic.cpp missing from project configuration 2014-06-03 17:17:17 +08:00
zhuling13
b4c8f6b778 for cleaning .o and .d files generated by android demo 2014-06-02 20:21:10 -07:00
Ethan Hugg
9b6df8a267 Merge pull request #905 from mstorsjo/cleanup-android-projects
Cleanup android test projects
2014-06-02 07:06:54 -07:00
Martin Storsjö
a0c9f8c9a0 Remove the stock example icons
A test application like these ones can do just fine without any icon
at all - there's no need to bundle 8 different extra binary images
just for that.
2014-05-30 11:04:54 +03:00
Martin Storsjö
1bb73e017e Remove useless declarations from Application.mk
OPTIM_debug isn't set by anything in this project, and APP_ABI
is set directly when invoking ndk-build - we don't use these
declarations at all.
2014-05-30 11:04:54 +03:00
Martin Storsjö
e276ae3c2f Convert android resource xml files to unix newlines
Some of these files actually had mixed line endings previously.
2014-05-30 11:04:54 +03:00
Martin Storsjö
2a65a32de1 Remove stray " in android layout xml files 2014-05-30 11:04:54 +03:00
ruil2
14e5d740cd clean up expand picture. 2014-05-30 11:05:31 +08:00
zhiliang wang
e6c9eb9824 Add Sad arm64 code 2014-05-14 17:06:48 +08:00
Martin Storsjö
aafa6e3e53 Reorder sections in encConsole.vcproj
The MSVC GUI seems to want to write the file with data in the order
Debug|Win32, Debug|x64, Release|Win32, Release|x64. This causes a
large number of changes in the git diff even though the content
still basically is the same. Therefore do it in a separate commit,
to make sure that any later actual changes stay minimal.
2014-05-12 09:20:41 +03:00
Martin Storsjö
4354371b4e Revert "Remove the literal CRLF (
) within the nasm commands in msvc project files"
This reverts commit 7aff66d40c.

These CRLF marks are readded by MSVC as soon as the project files
are updated from within the GUI anyway.
2014-05-12 09:20:41 +03:00
Martin Storsjö
416bb224e0 Don't hardcode SuppressStartupBanner=true, this is the default value
The fewer fields overridden, the better.
2014-05-09 19:59:06 +03:00
Martin Storsjö
3923d11dc6 Remove unnecessary, empty, file specific FileConfiguration blocks in vcproj files 2014-05-09 19:59:06 +03:00
Martin Storsjö
7676c5b65b Unify the include dirs within the decConsole project
Some include directories were only present in debug builds.
2014-05-09 19:59:06 +03:00
Martin Storsjö
1446f8b599 Don't use the encoder include dir when building the decoder 2014-05-09 19:59:06 +03:00
Martin Storsjö
324205df88 Remove references to nonexistent include directories
Some of these were legacy references to absolute paths outside of
the project itself.
2014-05-09 19:59:06 +03:00
Martin Storsjö
4635232d93 Don't manually define WIN32/WIN64
All the code that relies on separating them uses the built-in defines
_WIN32 and _WIN64, or the corresponding machine defines (such as
_M_IX86, for MSVC 32 bit inline assembly).
2014-05-09 19:34:04 +03:00
Martin Storsjö
094aa24bf6 Remove unused manual defines of _WINDOWS 2014-05-09 19:27:42 +03:00
Martin Storsjö
0d8f7ab0e1 Remove the unused WELSDEC/ENCPLUS_EXPORTS defines 2014-05-09 19:27:42 +03:00
Martin Storsjö
e2ec07ae87 Remove the unused leftover define HAVE_CACHE_LINE_ALIGN 2014-05-09 19:27:42 +03:00
zhilwang
f6293153c8 Merge pull request #802 from mstorsjo/remove-unused-misspelled-define
Remove an unused, misspelled define set on only one source file
2014-05-09 08:45:49 +08:00
volvet
88a25713a5 Merge pull request #801 from mstorsjo/fix-manually-edited-vcproj
Make manually edited vcproj files match what visual studio actually generates
2014-05-08 21:19:25 +08:00
volvet
322a3cca50 Merge pull request #805 from mstorsjo/remove-msvc-version-suffix
Remove msvc version suffix
2014-05-08 21:06:11 +08:00
Martin Storsjö
26edfd1f92 Remove the _2008 suffix from the Visual Studio solutions
This is the only version of them that we provide - and they
can easily be opened in any newer version anyway.
2014-05-08 11:47:56 +03:00
Martin Storsjö
66f0f6ccbe Rename the WelsVP vcproj file to match the others
The other projects don't have the _2008 suffix.
2014-05-08 11:46:18 +03:00
Martin Storsjö
f8ae7fcc5f Remove an unused, misspelled define set on only one source file 2014-05-08 11:17:29 +03:00
Martin Storsjö
60f1ea8088 Make manually edited vcproj files match what visual studio actually generates
This changes the indentation from space to tabs, and adds missing
dos newlines to these few lines.

This makes the file be detected as using dos newlines properly in
certain editors.
2014-05-08 11:15:50 +03:00
Martin Storsjö
b5cc7c2fe1 Remove a completely unused header 2014-05-08 09:59:58 +03:00
Martin Storsjö
b4fdfa64af Use the new library name in the android sample projects 2014-05-04 16:00:51 +03:00
Martin Storsjö
655d9c5dbf Remove dos newlines in the android java code 2014-04-25 11:03:03 +03:00
dongzhang
ad9e2dab4f Add Motion Compehension ARM64 Neon Code 2014-04-23 13:26:28 +08:00
dongzhang
2444327a6c Add expand picture support for ARM64 NEON
Remove duplicate MACROS
2014-04-23 09:14:32 +08:00
Licai Guo
c8e1a41c29 Move copy_mb neon code to common folder 2014-04-17 10:06:48 +08:00
Dmitriy Tyagniy
4e8428fbfc Updated XCode projects to properly launch for arm64 architecture 2014-04-16 11:53:44 +03:00
zhchu
01d6a26012 update ios project files 2014-04-15 16:23:48 +08:00
Licai Guo
e8d8bdc48e Merge pull request #689 from huili2/add_file_CopyMB_EC
divide copy_mb functions into new file for decoder use from encoder and ...
2014-04-15 16:20:08 +08:00
huili2
4ab8c88e98 divide copy_mb functions into new file for decoder use from encoder and add files for EC in decoder only. 2014-04-14 20:17:41 -07:00
Martin Storsjö
5c1666f430 Update the MSVC project files to use the statically linked C runtime library
This makes them match the behaviour of the make based build system.
2014-04-11 10:35:57 +03:00
volvet
8690adf870 Merge pull request #647 from mstorsjo/remove-dynamic-vp
Remove code for loading the VP library dynamically
2014-04-08 10:40:55 -07:00
Martin Storsjö
3dcd458ffd Remove trailing whitespace in the source files 2014-04-08 18:13:23 +03:00
Martin Storsjö
1342da9bc4 Remove everything related to NO_DYNAMIC_VP
This mode is the default and used everywhere now.
2014-04-08 15:09:21 +03:00
Martin Storsjö
56abd3c15b Link the encoder core directly to the VP library
This avoids using the codepaths for dynamically loading the
DLL, letting the linker resolve it as any other function.
2014-04-08 15:09:21 +03:00
Martin Storsjö
7aff66d40c Remove the literal CRLF (
) within the nasm commands in msvc project files 2014-04-08 11:43:08 +03:00
Martin Storsjö
5d2ca9d7a8 Remove the explicit -O3 parameter to nasm in visual studio project files
According to "nasm -h", there is no -O3 parameter at all, and
the highest optimization level (-Ox) is already the default.

The corresponding parameter never was set when building with the
make build system.
2014-04-08 11:42:14 +03:00
Martin Storsjö
e329ff4cb0 Add the new x86 assembly source files to the msvc project files 2014-04-08 10:17:48 +03:00
Licai Guo
5c60e8f868 Add ASM related functions for ME cross search
Add asm level functions

Add asm code for ME

Modify format

Add unit test for asm code.

Modify function name and format.

Remove unuse comment

Modify targets file

Add Macro protect for SSE41 funtion test

Modify according to review request.
2014-04-08 11:24:45 +08:00
Martin Storsjö
cc86533a39 Remove the now unused MT_ENABLE define from project files 2014-04-01 13:21:19 +03:00
volvet
9714e97fbe fix ios encDemo build 2014-03-30 23:09:01 -07:00
ruil2
6b3f89d582 move some common functions to common.cpp and add some functions in common 2014-03-25 15:35:55 +08:00
volvet
c45b46a786 fix android build for mini-sdk virsion issue 2014-03-25 03:04:31 +08:00
Andoni Morales Alastruey
6ed23591a8 Fix Android build setting minSdkVersion
Beside changing line endings in (see: 973a16) it's also
required to set a minimum Sdk version in the manifest
2014-03-24 17:20:41 +01:00
Andoni Morales Alastruey
973a167e8e Fix line endings in manifest files
Fixes build error in Android getting TOOLCHAINPREFIX
in build/platform-android.mk:

$NDKROOT/build/gmsl/__gmsl:512: *** non-numeric second argument to `wordlist' function: ''.  Stop.
2014-03-24 16:00:30 +01:00
wayne liu
06c534d9f2 rephrase blockzero function complexity and remove useless functions 2014-03-19 23:43:55 -07:00
Licai Guo
3febdc1d2e Modify xcode project to fit common reorg. 2014-03-19 15:08:14 +08:00
Licai Guo
e39de8d404 reoranize common to inc/src/x86/arm 2014-03-18 19:41:32 -07:00
Martin Storsjö
ed9c03408f Rename the asm subdirectories to x86
This is consistent with having the arm assembly in a subdirectory
called arm.
2014-03-18 23:09:45 +02:00
Martin Storsjö
dbdf8fbe9d Remove something that looks like a personal todo note from the Android makefiles 2014-03-11 14:27:14 +02:00
Martin Storsjö
966cc97496 Remove a dubious/unnecessary workaround for an issue in a nonstandard toolchain
There's no requirement to work with the Intel NDK. The NDK build
files don't even need to create any cpufeatures subdirectory since
all of the cpufeatures library is handled within the normal build
system. Finally, the encoder makefile tried to create a directory
for "welsdecdemo", not anything for "welsencdemo".

Thus, if this really was necessary, it would already have been noticed
that it missed an entry for "welsencdemo". Therefore, remove this
hack/workaround.
2014-03-11 10:09:17 +02:00
Martin Storsjö
fd90d14ece Enable threading when building for iOS using the project files
This was already enabled when building the library for iOS using
the makefiles.
2014-03-08 13:06:05 +02:00
Martin Storsjö
45c21931de Add NO_DYNAMIC_VP when building the encoder lib for the iOS simulator
This was previously only added to builds for actual devices.
2014-03-08 13:05:45 +02:00
Licai Guo
71467f948a mv mc_neon.S to common,add MC arm code to encoder 2014-03-07 12:18:58 +08: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
67534b0fc0 arm asm code refine. 2014-03-06 14:30:16 +08:00
Licai Guo
bb244d736b Partly add arm asm code to encoder. 2014-03-05 10:24:05 +08:00
volvet
f8b0cec68d Merge pull request #387 from zhilwang/arm-asm
Arm asm
2014-03-04 11:08:17 +08:00
Licai Guo
7768cd0a98 Modify code style, remove trailing space. 2014-03-03 15:42:01 +08:00