Commit Graph

155 Commits

Author SHA1 Message Date
Ethan Hugg
ae73411f9a Merge pull request #176 from mstorsjo/remove-msvc-2010-2012-files
Remove the MSVC 2010 and 2012 project files
2014-01-21 19:29:49 -08:00
Martin Storsjö
36f96cb766 Don't include the headers for dynamically loading the VP library if NO_DYNAMIC_VP is defined
bundleloader.h, which is included if MACOS is defined, defines
inline functions that reference bundle loading system functions,
which requires linking to the core foundation framework.

Avoid requiring linking to extra libraries/frameworks if
NO_DYNAMIC_VP is defined.
2014-01-21 21:15:32 +02:00
Ethan Hugg
efaa153bb1 Merge pull request #183 from mstorsjo/remove-unused-typedef
Remove unused typedefs
2014-01-21 10:34:14 -08:00
Ethan Hugg
ae0bd3ee02 Merge pull request #182 from mstorsjo/move-threadlib
Move the WelsThreadLib files to the common directory/library
2014-01-21 10:33:50 -08:00
Ethan Hugg
b6dcd94cb0 Merge pull request #180 from mstorsjo/remove-disabled-bundle-loading
Remove disabled/broken/unused code for bundle loading in the console tools
2014-01-21 10:30:28 -08:00
Ethan Hugg
57a292b106 Merge pull request #179 from mstorsjo/fix-bundleloader-64bit
Fix building of macos bundle loading code on 64 bit
2014-01-21 09:46:40 -08:00
Ethan Hugg
c4609af29c Merge pull request #178 from mstorsjo/remove-system-header-hackery
Remove system header/define hackery in welsenc.cpp
2014-01-21 09:45:38 -08:00
Ethan Hugg
47db901f29 Merge pull request #177 from mstorsjo/remove-unused-function
Remove an unused function
2014-01-21 09:44:08 -08:00
Martin Storsjö
c196fd1ef0 Remove unused typedefs 2014-01-21 15:44:05 +02:00
Martin Storsjö
68f32c3c29 Move the WelsThreadLib files to the common directory/library
This simplifies building the thread library code via the
makefile based build system.
2014-01-21 15:11:07 +02:00
Martin Storsjö
249b4e3d1f Only build the thread code if multithreading is enabled
This allows including the source file in the build even if
multithreading isn't desired.
2014-01-21 15:11:07 +02:00
Martin Storsjö
867d39e01b Remove system header/define hackery in welsenc.cpp
There doesn't seem to be any actual need for this, building
on linux still works just fine.
2014-01-21 15:02:51 +02:00
Martin Storsjö
67405177d9 Remove an unused function
This function contains a lot of platform specific constants
whose use is unknown.
2014-01-21 15:01:52 +02:00
Martin Storsjö
d1a6929516 Fix building of macos bundle loading code on 64 bit 2014-01-21 15:00:56 +02:00
Martin Storsjö
41928236e4 Remove unused files about macos bundle loading from the console tools 2014-01-21 14:59:41 +02:00
Martin Storsjö
b903aa8273 Remove/disable broken code for loading the encoder library from a macos bundle
This refers to a file "bundlewelsenc.h" which doesn't even
exist in the project at the moment.

The corresponding bundle loading code is not called at all
in the decoder console tool.
2014-01-21 14:59:41 +02:00
Martin Storsjö
ccca04453a Remove the MSVC 2010 and 2012 project files
Only the 2008 version is kept up to date at the moment.

The newer versions of MSVC can open and upgrade the 2008 version
files anyway, so by removing the unmaintained ones we reduce the
confusion and maintainance burden.

Additionally, the preferred way of building with MSVC is with the
makefile build system, according to the readme.
2014-01-21 13:51:41 +02:00
Martin Storsjö
5cb3fc93e0 Remove the __NO_CTYPE define
Nothing within the project uses it, and it's not necessary to
build the project either, tested on both linux and mingw.
2014-01-21 12:48:33 +02:00
Ethan Hugg
ae027b83d8 Merge pull request #159 from mstorsjo/frameskip-option
Add a runtime option for controlling frame skipping
2014-01-20 16:56:32 -08:00
V
a6463be0cc Allow yasm to be used instead of nasm.
http://www.nasm.us/doc/nasmdoc3.html#section-3.4.1 says a zero should
follow $ in numeric constants, but yasm complains about it when not
followed.
2014-01-18 13:59:24 +01:00
Ethan Hugg
2011a7407e Merge pull request #147 from volvet/illegal_assembly_fix
fix illegal instruction use
2014-01-17 14:13:24 -08:00
Martin Storsjö
a8d549e343 Omit assembler source rules if no asm sources are found 2014-01-17 18:52:46 +02:00
Martin Storsjö
cee3329ff0 Add a runtime option for controlling frame skipping 2014-01-17 12:39:33 +02: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ö
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
Varun B Patil
98ff18d15d fix typo 2014-01-17 00:50:03 +05:30
volvet
856f186b8e fix illegal instruction use 2014-01-16 15:57:22 +08:00
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
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
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
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
volvet
14f6c4fa72 Merge pull request #131 from mstorsjo/win64-asm
win64: Use rsp instead of esp
2014-01-12 00:42:29 -08:00
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
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
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