Commit Graph

263 Commits

Author SHA1 Message Date
Martin Storsjö
a8d549e343 Omit assembler source rules if no asm sources are found 2014-01-17 18:52:46 +02:00
Ethan Hugg
16099cfd32 Merge pull request #154 from mstorsjo/no-recursive-make
Don't call make recursively to build codec_unittest
2014-01-17 08:49:56 -08:00
Ethan Hugg
dc2d799d2b Merge pull request #150 from mstorsjo/msvc-make
Support building with MSVC via the makefiles by doing "make UNAME=msvc"
2014-01-17 08:49:00 -08:00
Ethan Hugg
0c438ecdd3 Merge pull request #158 from mstorsjo/fix-msvc-2012-build
Fix building in MSVC 2012 by avoiding redefining the inline keyword
2014-01-17 08:45:44 -08:00
Martin Storsjö
6e75136201 Don't load welsdec.dll at runtime in the decConsole test app on windows
Instead just link directly to it. This matches how the library is
linked/loaded in encConsole/h264enc as well.

Only the 2008 version project file is updated for now, since
the 2010 and 2012 ones are out of sync right now.
2014-01-17 12:06:21 +02:00
Martin Storsjö
7f6cdb516d Add platform files for msvc and msvc-arm
Build with "make UNAME=msvc" to invoke this.
2014-01-17 12:06:12 +02:00
Martin Storsjö
46e6bb5c67 Allow overriding the cflags for debug/optimization and for 32/64 bit 2014-01-17 12:06:12 +02:00
Martin Storsjö
09585cf65a Allow overriding the command syntax for linking libraries 2014-01-17 12:06:11 +02:00
Martin Storsjö
b842ff30e5 Make the compiler/ar/linker file output parameters overrideable
This is in preparation for allowing building using MSVC via
makefiles.
2014-01-17 12:06:11 +02:00
Martin Storsjö
d7c907198b Fix building in MSVC 2012 by avoiding redefining the inline keyword
While building succeeds in MSVC 2008, it currently fails in 2012
due to error C1189 "The C++ standard library forbids macroizing
keywords", which is caused by doing "#define inline __inline" in
the macros.h header.

This could have been missed before since it only was triggered
if macros.h was included before some other system header was
included that contained checks against these inline defines.
2014-01-17 12:04:27 +02:00
Martin Storsjö
c0fcb8f90f Don't call make recursively to build codec_unittest 2014-01-17 11:05:33 +02:00
Ethan Hugg
306a1daa14 Merge pull request #149 from varunbpatil/typo
fix typo
2014-01-16 11:43:47 -08:00
Varun B Patil
98ff18d15d fix typo 2014-01-17 00:50:03 +05:30
Ethan Hugg
e68f435a84 Merge pull request #148 from varunbpatil/makefile_simplify
simplify gtest makefile
2014-01-16 10:35:31 -08:00
Varun B Patil
a00b0ca79b simplify gtest makefile 2014-01-16 23:33:20 +05:30
Ethan Hugg
b1fc94e314 Merge pull request #134 from mstorsjo/encode-sps-pps
Add an encoder method for encoding the SPS/PPS without encoding a frame
2014-01-14 15:31:18 -08:00
Ethan Hugg
9230b49728 Merge pull request #97 from mstorsjo/asm-source-cleanup
Make all asm sources consistently use unix newlines and remove trailing whitespace
2014-01-13 21:21:17 -08:00
Martin Storsjö
65b339815e Get rid of trailing whitespace in the assembly source files 2014-01-13 20:12:04 +02:00
Martin Storsjö
ddcfc09c49 Convert some assembly files to unix newlines
This makes them consistent with the rest of them.
2014-01-13 20:12:04 +02:00
Ethan Hugg
301b06ad36 Merge pull request #135 from mstorsjo/pointer-cast
Fix casting of the return value integer to a pointer in the thread lib
2014-01-13 09:05:01 -08:00
Ethan Hugg
ea418846f1 Merge pull request #144 from varunbpatil/better_make_test
Makefile modifications for test target
2014-01-13 09:04:08 -08:00
Ethan Hugg
e560ba58a3 Merge pull request #141 from licaiguo/update-vs2008-files
update vs2008 files
2014-01-13 09:02:47 -08:00
Ethan Hugg
a1d37ff6b5 Merge pull request #142 from mstorsjo/remove-unused-variable
Remove an unused variable
2014-01-13 09:01:59 -08:00
Ethan Hugg
3ba067a4c8 Merge pull request #139 from varunbpatil/enc_arb_res
Updated issues in README, Keep single copy of YUV test streams, enc/dec tests for arbitrary res stream
2014-01-13 08:29:28 -08:00
ekr
6b021aed10 Merge pull request #136 from ethanhugg/travis.32bit
Travis.32bit
2014-01-13 08:19:10 -08:00
Ethan Hugg
1d6ff99256 Merge pull request #143 from mstorsjo/remove-accidental-const
Remove accidentally added const for plain non-pointer function parameters
2014-01-13 08:13:55 -08:00
Martin Storsjö
11394f492d Remove accidentally added const for plain non-pointer function parameters
This was accidentally added in 61117c85 when the pointer
parameters were made const.
2014-01-13 12:14:43 +02:00
Martin Storsjö
c5ee5f8f05 Remove an unused variable 2014-01-13 12:11:37 +02:00
licaiguo
b92683691f update vs2008 files 2014-01-13 15:44:07 +08:00
Varun B Patil
e7be3a0afa Makefile modifications for test target
On fresh clone of repo, "make test" used to give,
"make: *** No rule to make target `codec_unittest', needed by `test'.  Stop."
because gtest was not available. This message is not very helpful. Instead printing
that gtest is not available and the command to run to obtain gtest.
2014-01-13 11:03:02 +05:30
Varun B Patil
1f598b892b Encoder output test : added stream with non-multiple of 16 width/height
Also added decoder output test for the same.
2014-01-12 19:54:55 +05:30
Varun B Patil
6082566f4c Single copy of yuv test streams. 2014-01-12 18:40:13 +05:30
volvet
14f6c4fa72 Merge pull request #131 from mstorsjo/win64-asm
win64: Use rsp instead of esp
2014-01-12 00:42:29 -08:00
Varun B Patil
c80f620749 Updated issues in README.
Also updated example command to run encoder with arbitrary resolution stream.
2014-01-12 13:39:59 +05:30
Ethan Hugg
4a8a9aabc1 Merge pull request #122 from volvet/core_number_detect_fix
Core number detect fix
2014-01-11 11:29:45 -08:00
Martin Storsjö
2766215545 Add an encoder method for encoding the SPS/PPS without encoding a frame
This is useful if using a muxer that requires the SPS/PPS to be
available before the first frame is encoded.
2014-01-11 13:58:56 +02:00
Martin Storsjö
a78f1b2650 win64: Use rsp instead of esp
Using esp works by coincidence as long as the stack pointer is
within the first 4 GB of the address space - which seems to work
as long as the test binary is built with /dynamicbase:no, but breaks
if this option is removed.
2014-01-11 13:12:35 +02:00
Martin Storsjö
d8d5dfe646 Fix casting of the return value integer to a pointer in the thread lib
This fixes building of the thread lib on 64 bit unix.
2014-01-11 13:12:30 +02:00
volvet
ccaef9fc6d protect code if cpuid.4 return eax as zero 2014-01-11 18:56:22 +08:00
Ethan Hugg
f02d0aa667 Merge pull request #137 from mstorsjo/const-global-tables
Mark some read-only global tables const
2014-01-10 21:32:21 -08:00
Ethan Hugg
2c9f19474a Merge pull request #132 from mstorsjo/mingw64
Add support for building on 64 bit mingw
2014-01-10 14:21:33 -08:00
Ethan Hugg
7261cc4bc2 Merge pull request #129 from mstorsjo/remove-unused
Remove unused global variables and defines
2014-01-10 14:05:00 -08:00
Martin Storsjö
6412884211 Mark some read-only global tables const 2014-01-10 23:48:53 +02:00
Martin Storsjö
61117c85d8 Mark pointers to quantization functions const where possible 2014-01-10 23:48:35 +02:00
Ethan Hugg
92e48ba2df Remove debugging - these patches will run Travis much faster. 2014-01-10 13:03:46 -08:00
Ethan Hugg
0f4bfd18ad Travis - Add install of libssl:i386 2014-01-10 12:46:23 -08:00
Ethan Hugg
82d6d0b9e8 Find libcrypto 2014-01-10 12:10:11 -08:00
Ethan Hugg
a611323c61 Travis - add libssl-dev 2014-01-10 11:50:38 -08:00
Ethan Hugg
f08271e52f Travis - query version of libcrypto 2014-01-10 11:31:27 -08:00
Ethan Hugg
0bad08f961 Fix 32bit libcrypto with a link instead of a re-install. 2014-01-10 11:10:46 -08:00