Commit Graph

1632 Commits

Author SHA1 Message Date
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
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
sijchen
81467fd93e Merge pull request #786 from mstorsjo/use-proper-types
Use the proper type in function parameters instead of void pointers
2014-05-05 10:27:13 +08:00
zhilwang
f797785a12 Merge pull request #782 from mstorsjo/fix-msvc-warning
Don't compare a boolean to an integer
2014-05-05 09:26:59 +08:00
zhilwang
fd446a1f69 Merge pull request #783 from mstorsjo/win64-clobber
Properly back up and restore XMM registers on win64 in WelsSampleSadFour4x4_sse2
2014-05-05 08:45:48 +08:00
Ethan Hugg
5c5a233257 Merge pull request #784 from mstorsjo/renamed-lib
Take the new external library name in use, fix building for android
2014-05-04 15:19:51 -07:00
Martin Storsjö
26624bbfdb Use the proper type in function parameters instead of void pointers 2014-05-04 18:00:36 +03:00
Martin Storsjö
1711b497e3 Take the test of TestHorizontalSearch_SSE41 into use
After fixing the ranges, there's no reason to exclude this test.
2014-05-04 17:51:05 +03:00
Martin Storsjö
b1c13f4954 Properly limit the range for the random target motion vectors
A 16x16 pixel block is copied to the destination pointed out by the
target motion vector. Since the motion vector is relative to the
center of the buffer, the upper bound of the range is size/2-16.

Previously we never used negative motion vectors, but there is no
reason not to test that direction. Therefore, the possible range
would be [-size/2,size/2-16]. Additionally pad this range with
INTPEL_NEEDED_MARGIN.
2014-05-04 17:50:55 +03:00
Martin Storsjö
03db750ba9 Limit the ME scanning range to 16 pixels from the end of the buffer
The block size is chosen randomly; if the block size is 16,
LineFullSearch_c will read a block with 16 pixels from kiMaxPos;
thus kiMaxPos cannot be larger than height-16, otherwise the calls
end up with reads out of bounds.
2014-05-04 17:35:01 +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ö
a0002c2be8 Use $(PROJECT_NAME) in the android .so name 2014-05-04 15:57:40 +03:00
Martin Storsjö
dc57301d0c Rename the DLL definition file according to what the output DLL is named 2014-05-04 15:55:17 +03:00
Martin Storsjö
9d0647b8ac Use $(PROJECT_NAME) for naming the DLL import library as well 2014-05-04 15:54:59 +03:00
Martin Storsjö
b8eeda1740 Properly back up and restore XMM registers on win64 in WelsSampleSadFour4x4_sse2 2014-05-04 15:47:56 +03:00
Martin Storsjö
f99336d866 Don't compare a boolean to an integer
This avoids a warning when building with MSVC.
2014-05-04 14:53:36 +03:00
volvet
e4a9c7f8e4 Merge pull request #779 from zhilwang/intraSad
Add IntraSad asm code.
2014-05-04 16:29:59 +08:00
ruil2
0e7ed62997 Merge pull request #780 from sijchen/md_merge25
[Encoder MD] Add scrolling skip function pointers in MD
2014-05-04 15:31:13 +08:00
sijchen
938019748d add scrolling skip function pointers in MD 2014-05-04 15:03:23 +08:00
Licai Guo
fe5b8d1a69 refine format 2014-05-04 14:51:05 +08:00
ruil2
30687f4647 Merge pull request #761 from sijchen/md_merge31
[Encoder MD] Adjust MD under Screen Content route
2014-05-04 14:25:10 +08:00
Licai Guo
485b2b5b43 Add IntraSad asm code.
Enable intraSad ASM code

Refine format

Add X86_ASM pretect for intraSad ASM code UT

remove duplicated code.
2014-05-04 12:12:38 +08:00
sijchen
ba7b4adb57 Merge pull request #778 from ethanhugg/rename
Parameterize the project name and change it to openh264
2014-05-04 10:24:21 +08:00
Ethan Hugg
deb01d34dd Parameterize the project name and change it to openh264 2014-05-02 08:12:40 -07:00
Ethan Hugg
1560eec2ea Merge pull request #775 from mstorsjo/stub-binaries-target
Add a stub makefile target for binaries
2014-04-30 11:24:11 -07:00
Martin Storsjö
97faa3abb6 Add a stub makefile target for binaries
This avoids the following error when doing "make OS=ios" if gtest
isn't installed:

make: *** No rule to make target `binaries', needed by `all'.  Stop.

This fixes issue #752.
2014-04-30 21:08:17 +03:00
Ethan Hugg
685d595c30 Merge pull request #767 from mstorsjo/avoid-conflicting-msvc-options
Only use the -Gm option in desktop debug MSVC builds
2014-04-30 09:40:25 -07:00
Ethan Hugg
57a23406d7 Merge pull request #766 from mstorsjo/reduce-msvc-runtime-flags
Don't build all object files with -ZW, only the one that needs it
2014-04-30 09:40:12 -07:00
HaiboZhu
37deb06700 Merge pull request #771 from huili2/newseqorder_prefixerror_bugfix
fix new sequence&EC order, and prefix parse bug
2014-04-30 17:31:04 +08:00
sijchen
844f88bbbe Merge pull request #772 from lyao2/scrollingUT
this only solve the problem temporarily. but for the building of tests working, merge this first. 
we need to re-consider the including of typedef headers
2014-04-30 17:20:41 +08:00
lyao2
4248cc9c42 fix typedef re-define issue 2014-04-30 16:46:58 +08:00
huili2
5e6ef17412 fix new sequence&EC order, and prefix parse bug 2014-04-29 20:00:12 -07:00