Commit Graph

1662 Commits

Author SHA1 Message Date
huili2
a1a22205c6 Merge pull request #814 from ruil2/enc_nalsize
add the maximum nal size setting in command line
2014-05-12 12:38:01 +08:00
ruil2
67327dfb2e add the maximum nal size setting in command line 2014-05-12 11:05:16 +08:00
Ethan Hugg
2f8f2880ff Merge pull request #812 from mstorsjo/remove-manual-win32-defines
Don't manually define WIN32/WIN64
2014-05-09 09:48:47 -07:00
Martin Storsjö
e8e2cbcc28 Revert "Set ASM_ARCH in all cases to fix Win64 Debug build"
This reverts commit 09025dc8ef.

There is no need to set ASM_ARCH unless assembly sources actually
are built. ASM_ARCH is no longer used for setting unrelated CFLAGS.
2014-05-09 19:34:49 +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
Ethan Hugg
d63458f8e0 Merge pull request #803 from mstorsjo/remove-unused-defines
Remove unused defines
2014-05-09 09:29:29 -07: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
sijchen
8d23201a05 Merge pull request #808 from mstorsjo/use-correct-param-types
Use the actual parameter types in PSearchMethodFunc instead of void pointers
2014-05-09 17:22:05 +08:00
sijchen
c215e576e6 Merge pull request #810 from huili2/ps_error_logic_ec
for PS error logic for EC
2014-05-09 17:08:44 +08:00
huili2
51c918f212 for PS error logic for EC 2014-05-09 01:12:08 -07:00
ruil2
1b501bb509 Merge pull request #807 from sijchen/mmcoslcfix
Fix the improper slice mmco setting
2014-05-09 11:09:02 +08:00
sijchen
5de9f41f5a Fix the improper slice mmco setting 2014-05-09 10:48:09 +08: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
5713363c89 Merge pull request #804 from mstorsjo/regenerate-makefiles
Regenerate test/decoder/targets.mk using mktargets.sh
2014-05-08 21:11:24 +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
volvet
054530fdb4 Merge pull request #800 from mstorsjo/matching-endif
Make an endif comment match the actual condition
2014-05-08 20:59:18 +08:00
volvet
ff33fdeb8e Merge pull request #799 from mstorsjo/use-predefined-define
Use the predefined _WIN32 instead of the manually defined WIN32 for windows specific code
2014-05-08 20:58:11 +08:00
volvet
3ea96df63c Merge pull request #798 from mstorsjo/remove-unused-header
Remove a completely unused header
2014-05-08 20:51:49 +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ö
820cfb40ca Regenerate test/decoder/targets.mk using mktargets.sh
This makes the indentation of one line match the rest.
2014-05-08 11:20:51 +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ö
6e715ddc10 Make an endif comment match the actual condition 2014-05-08 11:14:24 +03:00
Martin Storsjö
d69d9c4622 Use the predefined _WIN32 instead of the manually defined WIN32 for windows specific code
This avoids having to rely on manually defining WIN32 in the build
system.
2014-05-08 11:12:49 +03:00
Martin Storsjö
b5cc7c2fe1 Remove a completely unused header 2014-05-08 09:59:58 +03:00
dongzha
e61a6017f9 Merge pull request #795 from huili2/new_seq_au_reorder
fix order of new AU and new Seq
2014-05-08 11:24:26 +08:00
huili2
1839910bb0 fix order of new AU and new Seq 2014-05-07 17:56:31 -07:00
volvet
5e73cc4298 Merge pull request #794 from ethanhugg/win64_fix
Set ASM_ARCH in all cases to fix Win64 Debug build
2014-05-08 08:56:26 +08:00
Martin Storsjö
f954763635 Use the actual parameter types in PSearchMethodFunc instead of void pointers 2014-05-07 09:26:31 +03:00
Ethan Hugg
09025dc8ef Set ASM_ARCH in all cases to fix Win64 Debug build 2014-05-07 05:40:13 +00:00
zhilwang
7746e3f497 Merge pull request #793 from mstorsjo/fix-msvc-gtest
Fix building gtest on MSVC 2010 and newer
2014-05-06 16:52:57 +08:00
Martin Storsjö
853e71eb88 Fix building gtest on MSVC
The previous define change in 1e607d71 only made it work on MSVC
2005 and 2008, but broke things even more for 2010 and newer.
(One shouldn't override the internal details about which tuple
implementation to use, since one implementation don't work on
all versions.) Since we don't need or use the gtest tuple code,
the simplest workaround used to be just to disable it altogether,
but that was broken in r682 in gtest.

This has been tested and works on MSVC 2005, 2008, 2010, 2012 and
2013.
2014-05-06 11:14:41 +03:00
sijchen
69fe242dc7 Merge pull request #790 from huili2/astyle_all
astyle all files
2014-05-06 15:29:56 +08:00
volvet
9a74427a61 Merge pull request #788 from mstorsjo/factorize-duplicated-test
Avoid duplicating code in the MotionEstimate test

Approved by Sijia.
2014-05-06 15:00:01 +08:00
huili2
f897029034 Merge pull request #791 from zhilwang/intraSad
Add func init for welsfillingPred
2014-05-06 14:00:32 +08:00
huili2
d4145ee76c Merge pull request #792 from zhilwang/msvc-gtest
Fix gtest build error when OS=msvc.
2014-05-06 13:59:36 +08:00
zhiliang wang
1e607d71d2 Fix gtest build error when OS=msvc. 2014-05-06 13:06:37 +08:00
zhiliang wang
82b875c388 Add func init on UT source code 2014-05-06 11:16:46 +08:00
zhiliang wang
2d265877a9 Add func init for welsfillingPred 2014-05-06 10:45:25 +08:00
huili2
5ed24f216b astyle all files 2014-05-05 19:30:21 -07:00
volvet
0c246861b7 Merge pull request #789 from mstorsjo/remove-unused-static-func
Remove an unused static method
2014-05-05 22:13:43 +08:00
Martin Storsjö
92e5489dd3 Avoid duplicating code in the MotionEstimate test
All the tests of the line search (unoptimized and optimized)
use the exact same copypasted structure. Instead factorize this
into a test function which uses the provided function.
2014-05-05 16:15:18 +03:00
Martin Storsjö
c0f2487631 Remove an unused static method
This was added in 44640712f without actually being used.
2014-05-05 15:13:43 +03:00
huili2
15432d4fc5 Merge pull request #787 from sijchen/fme_merge97
[Encoder ME] Add FME unit test
2014-05-05 15:56:31 +08:00
sijchen
44640712f6 Add FME unit test 2014-05-05 15:41:15 +08:00
sijchen
cf5edec5ae Merge pull request #785 from mstorsjo/fix-me-test
Fix occasional errors in the motion estimation tests by correcting the range limits
2014-05-05 10:29:35 +08:00