Commit Graph

489 Commits

Author SHA1 Message Date
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
Ethan Hugg
cc2ffee5d2 Merge pull request #83 from varunbpatil/autobuildlinux_cleanup
Linux shell scripts refactored
2014-01-07 15:28:22 -08:00
Ethan Hugg
8af6e5cf69 Merge pull request #77 from varunbpatil/enc_testapp_arbitrary_res
Non-multiple of 16 width/height support for enc testapp
2014-01-07 13:38:04 -08:00
Ethan Hugg
4033940ba7 Merge pull request #105 from mstorsjo/msvc-disable-inline-asm-on-arm
Use MSVC inline assembly only on (32-bit) X86
2014-01-07 13:13:05 -08:00
Ethan Hugg
9665aa4417 ReviewBoard .rc file for rbt. 2014-01-06 13:14:04 -08:00
Ethan Hugg
9b46788676 Merge pull request #85 from varunbpatil/safe_param_parse
Safe parsing of command line parameters in enc console app
2014-01-06 11:33:13 -08:00
Ethan Hugg
e801b58bf8 Merge pull request #110 from huili2/master
interface clean and inside modification
2014-01-06 11:02:49 -08:00
Ethan Hugg
dd3466cc6b Merge pull request #88 from mstorsjo/remove-pragma-pack
Remove pragmas for non-standard struct packing in the public API
2014-01-06 09:46:17 -08:00
Ethan Hugg
95d693dcaf Merge pull request #107 from mstorsjo/update-readme
Update the readme with current platform support
2014-01-06 09:37:47 -08:00
Ethan Hugg
319ae0253b Merge pull request #98 from mstorsjo/trailing-whitespace-platform
Get rid of trailing whitespace in the platform makefiles
2014-01-06 09:35:24 -08:00
Ethan Hugg
057d3e507b Merge pull request #100 from mstorsjo/trailing-whitespace-cpp-comments
Remove trailing whitespace in comments
2014-01-06 09:33:52 -08:00
Ethan Hugg
9cf180dda6 Merge pull request #103 from mstorsjo/remove-commented-out-pragmas
Remove commented out pragmas
2014-01-06 08:37:33 -08:00
Ethan Hugg
24195dd884 Merge pull request #101 from mstorsjo/rerun-astyle
Rerun astyle on the C++ source files
2014-01-06 08:20:05 -08:00
Ethan Hugg
96ecb0942d Merge pull request #96 from mstorsjo/executablebit
Fix the executable bit on files
2014-01-06 08:17:41 -08:00
Ethan Hugg
05993ab2bf Merge pull request #99 from mstorsjo/gitignore
Add the console applications to .gitignore
2014-01-06 08:16:46 -08:00
huili2
32fd2c4e4d interface clean and inside modification
clean and comment some API.
move the SKIP mv pred location
remove the unused buffer in intra construction.
2014-01-06 13:28:55 +08:00
ekr
42389008a3 Merge pull request #95 from ethanhugg/travis2
Add release builds (ASM) to Travis
2014-01-05 20:00:45 -08:00
licaiguo
a3e0a71c71 remove unused intra-prediction functions and declarations 2014-01-06 11:53:43 +08:00
licaiguo
abb1311fb9 rename decoder's intra-prediction prefix from Wels to WelsDecoder. 2014-01-06 11:22:39 +08:00
Martin Storsjö
0640c1d834 Update the readme with current platform support
Both 32 and 64 bit is supported, on windows, linux and OS X,
including x86 assembly code.
2014-01-06 01:18:43 +02:00
Martin Storsjö
4a08781c18 Use MSVC inline assembly only on (32-bit) X86
Currently this used the _MSC_VER && !WIN64 to enable the inline
assembly, which still tried to use this code on windows on arm.
Using _MSC_VER && _M_IX86 is enough since _M_IX86 is defined only
when targeting 32 bit x86, not for x64.
2014-01-05 19:20:20 +02:00
ekr
16ad879daf Merge pull request #102 from mstorsjo/remove-pragma-once
Remove pragma once
2014-01-05 07:46:15 -08:00
Martin Storsjö
790110b2ce Remove commented out pragmas 2014-01-05 15:04:34 +02:00
Martin Storsjö
b1c070cf8b Remove "pragma once"
The same thing is handled by proper standard C header include guards
in all these files.
2014-01-05 15:03:25 +02:00
Martin Storsjö
d1b0713c76 Add a proper include guard to dec_console.h 2014-01-05 15:03:08 +02:00