generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
962 Commits 23 Branches 9 Tags 55 MiB
801da26d1d
Commit Graph

99 Commits

Author SHA1 Message Date
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ö
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
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
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ö
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
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
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
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ö
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
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
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
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
24195dd884 Merge pull request #101 from mstorsjo/rerun-astyle 
Rerun astyle on the C++ source files
 2014-01-06 08:20:05 -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
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
Martin Storsjö
55b82b3cd7 Rerun astyle on the C++ source files 
astyle was only run on .cpp files this time - already in
ff6b66917 where the style cleanup was done initially, not all
.h files seem to have gotten the same styling (rerunning astyle
on .h files at that commit produces a huge diff).
 2014-01-05 14:59:18 +02:00
Martin Storsjö
d3ee1de5ac Remove trailing whitespace in comments 
The astyle cleanup keeps trailing whitespace within comments,
but the whitespace here is not significant nor intentional
and thus should be removed.
 2014-01-05 14:53:21 +02:00
Ethan Hugg
8c1550954b Add release builds to Travis and fix warning in release build. 2014-01-04 22:42:57 -08:00
Varun B Patil
d43e91a8a6 Safe parsing of command line parameters in enc console app 2013-12-29 18:01:32 +05:30
Ethan Hugg
9254d722d3 Merge pull request #62 from varunbpatil/cleanup 
minor cleanup and bug fixes
 2013-12-26 17:52:49 -08:00
Varun B Patil
70d2ae8334 Non-multiple of 16 width/height support for enc testapp 
Also included test sequence.
../h264enc welsenc_arbitrary_res.cfg
 2013-12-25 16:14:37 +05:30
V
7fa09903cf Add MinGW platform makefile and related source changes 2013-12-23 21:42:31 +01:00
Varun B Patil
e69983d6de Improve command line arguments handling in dec testapp 
Problems fixed:
1. No longer segfaults if an option is specified without an accompanying argument.

2. Wrongly incrementing i by 3 instead of by 2 while parsing command line options.
 2013-12-20 11:46:09 +05:30
Varun B Patil
5ff3a23c18 Fix typo which ignored dec options file in dec testapp 
Options file was not being taken because it was wrongly being taken as output
file for decoder.
 2013-12-20 11:31:13 +05:30
Varun B Patil
2bc7d2bf86 memset not required as struct is already initialized to 0. 
Moreover, memset causes loss of sDecParam.sVideoProperty.size
that was set previously.
 2013-12-20 11:31:13 +05:30
Varun B Patil
301fd58c04 Replace some fancy stuff with simple function 2013-12-20 11:30:58 +05:30
Ethan Hugg
c97be377b1 Rollup of minor fixes found by Martin Ettl 2013-12-16 09:25:35 -08:00
Varun B Patil
e65525d7b4 Improve handling of help switch in enc test app 
welsenc.exe -h is now a valid command which returns success.

No longer prints help text twice in the case when the -h switch
is given along with a wrong cfg.
 2013-12-16 09:30:38 +05:30
Ethan Hugg
8d3b617761 Merge pull request #48 from licaiguo/master 
Add 64-bit build support for windows & Linux
 2013-12-15 13:01:20 -08:00
Varun B Patil
f5e0058786 Make the two ParseCommandLine functions consistent 
with respect to strcmp function call.
Removed unnecessary brackets.
 2013-12-15 18:49:08 +05:30
Varun B Patil
42097a6ed3 Fix function name typo in enc test app 2013-12-15 18:34:50 +05:30
licaiguo
077ffed5ea Add Windows 64-bit build to VS project files 2013-12-15 15:18:19 +08:00
Cullen Jennings
41d1c31f7f Fix warnings on OSX compile 2013-12-13 13:03:38 -07:00
Ethan Hugg
ff6b669176 Pretty printed the C++ code with astyle 2013-12-12 14:21:12 -08:00
Martin Storsjö
3331ff6566 Fix a typo in the public codec API 2013-12-12 16:13:45 +02:00
Ethan Hugg
a15ad8cc80 Updated makefiles for new logging changes. 2013-12-11 09:52:02 -08:00
Ethan Hugg
2ca14fed1c Rebase of EKR's patches for tracing and frame size 2013-12-11 06:51:26 -08:00
EKR
cf92e8d620 Add support for assembly on linux as well as multiple configs 2013-12-10 18:57:32 +08:00
EKR
2edc251ded First cut at new build system. Tested on Mac 2013-12-10 16:19:42 +08:00
Ethan Hugg
70e5e62f3d Initial Commit 2013-12-09 04:51:09 -08:00