Ethan Hugg
8c461786cd
Merge pull request #130 from mstorsjo/gitignore
...
Add more generated files to gitignore
2014-01-10 09:19:20 -08:00
Martin Storsjö
ba38dc77a5
Add support for 64 bit mingw in the makefiles
...
By setting an overridable variable in the main makefile, we avoid
having to move the default -DUNIX64 into each of the other unix
platform makefiles, but still allowing the mingw platform to
override it.
2014-01-10 19:01:22 +02:00
Martin Storsjö
401f6d7160
Remove the HAVE_CACHE_LINE_ALIGN, ENCODER_CORE and WELS_SVC defines from visual studio project files
...
These defines are not used anywhere any longer.
2014-01-10 15:34:12 +02:00
Martin Storsjö
104494475e
Remove the HAVE_CACHE_LINE_ALIGN, ENCODER_CORE and WELS_SVC defines from makefiles
...
Neither of them are used anywhere any longer.
2014-01-10 15:33:09 +02:00
Martin Storsjö
41a251630d
Use intptr_t instead of long for casting pointers to integers
...
This fixes building on mingw-w64.
Include stdint.h on everything except MSVC for definitions of
common standard types, include stddef.h on MSVC instead, since
MSVC doesn't have stdint.h in all older versions that are
supposed to be supported, but MSVC always defines intptr_t via
stddef.h.
2014-01-10 14:52:09 +02:00
Martin Storsjö
37a241601f
Add more generated files to gitignore
2014-01-10 13:16:22 +02:00
Martin Storsjö
9ccae7b0d6
Remove useless use of the HAVE_CACHE_LINE_ALIGN define
...
The code ends up as the exact same regardless of whether the
define is set or not.
2014-01-10 12:25:39 +02:00
Martin Storsjö
8bc5bf58a0
Remove the unused global variable g_uiCacheLineSize
2014-01-10 12:20:59 +02:00
volvet
f2a14600a5
check cpuid max level before use cpuid.4
2014-01-10 15:32:35 +08:00
ekr
eeb11578ca
Merge pull request #123 from licaiguo/update-vs2010-files
...
Update vs2010 files
2014-01-09 18:07:57 -08:00
volvet
1834cb3aca
Merge branch 'master' of https://github.com/cisco/openh264 into core_number_detect_fix
2014-01-10 09:06:27 +08:00
ekr
9bf4b59283
Merge pull request #126 from ethanhugg/travis.32bit
...
Travis.32bit
2014-01-09 11:07:48 -08:00
Ethan Hugg
792060c388
Merge pull request #127 from ekr/asan
...
Asan
2014-01-09 10:49:52 -08:00
EKR
b7a5d70212
don't choke on deprecated sha-1 routines
2014-01-09 10:36:12 -08:00
EKR
e1772654b5
Add ASan support
2014-01-09 10:25:15 -08:00
Ethan Hugg
fc66b629ef
Travis: Use -B option instead of make clean.
2014-01-09 10:24:32 -08:00
Ethan Hugg
13db1b4ca1
Remove gcc in order to build for libssl 32bit
2014-01-09 09:39:42 -08:00
Ethan Hugg
abb302f567
Merge pull request #125 from mstorsjo/make-deps
...
Add missing make dependencies for the tests
2014-01-09 09:39:18 -08:00
Martin Storsjö
86c0f178ef
Add a dependency on the unittest in the "make test" rule
...
This makes sure "make test" succeeds without building anything
beforehand.
2014-01-09 15:10:27 +02:00
Martin Storsjö
a89513c073
Add dependencies on the encoder libraries to the unit tests
...
This makes sure a "make codec_unittest" succeeds without any
prior make invocation. The usage of the encoder libraries in
the unit test was added in 6f58a0c1
.
2014-01-09 15:10:27 +02:00
Martin Storsjö
3b0844e400
Regenerate the targets makefiles
...
Commit f38111d76b
updated these files
manually (based on older versions of them) to something not generated
by the current mktargets.py/sh, losing the compact pattern rules.
2014-01-09 11:30:40 +02:00
volvet
0e38e5c4e7
add exception handler, the AMD cpu must be single core if it do not support HTT
2014-01-09 16:59:07 +08:00
Licai Guo
15bd7dab57
fix crash issue for too big packet size
2014-01-09 00:28:13 -08:00
licaiguo
c7f1974ef7
update vs2010 files
2014-01-09 16:05:23 +08:00
Licai Guo
77fd9aa4f0
merge macros.h to common/macros.h
2014-01-09 15:41:24 +08:00
licaiguo
8a1922837d
update vs2010 files, we need to merge macros.h.
...
Currently We keep three copies
2014-01-09 15:11:36 +08:00
Ethan Hugg
d2ff2b6554
Attempt to build 32bit after 64bit.
2014-01-08 21:47:00 -08:00
volvet
02e4bf6e9d
fix UNIX64 and WIN64: use ecx as input param
2014-01-09 12:31:13 +08:00
Ethan Hugg
6b8fc49077
Merge pull request #121 from ekr/add_gtests
...
Add gtests for encoder and decoder.
2014-01-08 20:25:41 -08:00
volvet
ed8081022b
fix cpu core query via cpuid
2014-01-09 12:18:30 +08:00
EKR
78502ebcdf
Fix Travis and update test targets.mk (64-bit only for now)
2014-01-08 20:17:46 -08:00
jwwang
94b79c42b1
minor fixes to the tests
2014-01-08 19:12:21 -08:00
jwwang
6f58a0c1f7
Add encoder test
2014-01-08 19:12:02 -08:00
jwwang
cb0053f860
Add decoder test
2014-01-08 19:11:23 -08:00
ekr
61f1bac9ff
Merge pull request #119 from sijchen/merge6
...
complete the encoder interface of bit rate and frame rate updating
2014-01-08 17:39:08 -08:00
ekr
767073cbb2
Merge pull request #118 from licaiguo/move-to-common-2
...
move common code(deblocking and cpu) to common, enable idct asm in encoder
2014-01-08 17:39:00 -08:00
sijchen
4999b816ab
complete the encoder interface of bit rate and frame rate updating
2014-01-09 09:20:35 +08:00
Licai Guo
f38111d76b
file a new commit
...
Squashed commit of the following:
commit 26be4c66686d2d75ba1eb381ae562d30474429b2
Merge: 91bde82 8df0566
Author: Licai Guo <guolicai@gmail.com>
Date: Wed Jan 8 16:56:49 2014 -0800
Merge remote-tracking branch 'upstream/master' into move_to_common
Conflicts:
codec/common/targets.mk
codec/console/dec/targets.mk
codec/decoder/targets.mk
codec/encoder/targets.mk
codec/processing/targets.mk
commit 91bde8209dad40eaa0b26cc75467e4ce52b4c8ae
Merge: c827054 cc2ffee
Author: Licai Guo <guolicai@gmail.com>
Date: Tue Jan 7 20:16:11 2014 -0800
Merge remote-tracking branch 'upstream/master' into move_to_common
commit c8270543fab8e40cb4aebf62d7646068afe19484
Author: Licai Guo <guolicai@gmail.com>
Date: Mon Jan 6 19:12:39 2014 -0800
enable WelsScan4x4DcAc_ssse3
commit c8d2823d54e54cab146098302441ef44a4638382
Author: Licai Guo <guolicai@gmail.com>
Date: Mon Jan 6 18:46:06 2014 -0800
remove trailing white spaces
commit 39866a9cf54db6120aabd6a01afd4aedbead8af0
Author: Licai Guo <guolicai@gmail.com>
Date: Mon Jan 6 18:06:10 2014 -0800
move common code(deblocking and cpu) to common, rename decoder's
Intra-prediction functions prefix.
2014-01-08 17:03:00 -08:00
ekr
8df056618d
Merge pull request #111 from ethanhugg/reviewboard
...
ReviewBoard .rc file for rbt.
2014-01-08 12:15:05 -08:00
Ethan Hugg
f85911e331
Merge pull request #117 from mstorsjo/make-patterns
...
Use make patterns to avoid needing autogenerated rules for each source file
2014-01-08 09:48:31 -08:00
Ethan Hugg
4afa4fc7a8
Merge pull request #116 from mstorsjo/make-deps
...
Add proper dependencies for the command line binaries
2014-01-08 09:35:21 -08:00
Ethan Hugg
59466d0986
Merge pull request #115 from mstorsjo/remove-vc6-project-files
...
Remove VC6 project files
2014-01-08 08:46:03 -08:00
Ethan Hugg
3cdd792aba
Merge pull request #106 from mstorsjo/windows-api-subset
...
Allow building for the WinRT/Windows Phone API subsets
2014-01-08 08:33:17 -08:00
Martin Storsjö
488fb7bb20
Add proper dependencies for the command line binaries
...
This makes sure that all the dependency libs are built before trying
to link them together, fixing parallel make (which occasionally
failed due to trying to link the encoder or decoder command line
binaries before the libs had been built) and also fixes building an
individual component by e.g. "make h264enc".
2014-01-08 16:36:11 +02:00
Martin Storsjö
80669ed059
Use make patterns to avoid needing autogenerated rules for each source file
2014-01-08 16:33:35 +02:00
Martin Storsjö
8cf9bb68f0
Remove VC6 project files
...
These files are unmaintained and outdated, not even functional
in the initial commit of the project. Additionally, no similar
files are present for the decoder.
2014-01-08 12:02:44 +02:00
Martin Storsjö
cd0ee83393
Don't call process affinity functions in windows store or windows phone apps
...
These functions are only available in the desktop api subset.
2014-01-08 09:21:07 +02:00
Martin Storsjö
d0086b1940
Use the right data type for process affinity mask
...
This allows using the same code on 64 bit windows as well.
Tested on MSVC 2008-2013.
2014-01-08 09:21:06 +02:00
Martin Storsjö
65fa5d2a37
Enable use of D3D9 only when targeting desktop apps
...
Don't try to build this when building for phone/windows store (aka
metro/winrt) apps - this API isn't available there.
2014-01-08 09:21:06 +02:00
Martin Storsjö
05bf57a2af
Use InitializeCriticalSectionEx for Windows Store or Windows Phone apps
...
The old InitializeCriticalSection function isn't available in
these API partitions, and the new InitializeCriticalSectionEx
function is only available since Vista, so we want to keep using
the old function for normal desktop code.
2014-01-08 09:20:39 +02:00