Ethan Hugg
d6e14c14da
Merge pull request #352 from mstorsjo/simplify-travis-32bit
...
Don't install 32 bit zlib in travis builds
2014-02-24 07:58:24 -08:00
Martin Storsjö
9c21760d88
Don't install 32 bit zlib in travis builds
...
It shouldn't be necessary for anything in the build.
2014-02-24 17:47:46 +02:00
Ethan Hugg
3940beb7e8
Merge pull request #351 from mstorsjo/simplify-travis
...
Simplify the travis configuration now that OpenSSL isn't required any longer
2014-02-24 07:45:44 -08:00
Ethan Hugg
2966abd937
Merge pull request #350 from mstorsjo/android-unittest
...
Link codec_unittest to the static android STL
2014-02-24 07:45:13 -08:00
Ethan Hugg
72990e1290
Merge pull request #349 from mstorsjo/cleanup-ios-project
...
Remove unnecessary precompiled headers from the xcode projects
2014-02-24 07:44:41 -08:00
Martin Storsjö
3fdda8782a
Simplify the travis configuration now that OpenSSL isn't required any longer
2014-02-24 17:09:07 +02:00
Martin Storsjö
2f02bf9626
Link codec_unittest to the static android STL
...
This allows building (and running) codec_unittest for android.
This explicitly needs to go at the end of the LDFLAGS, since both
this and -lgtest etc. are static libraries, and code in gtest
relies on the STL. Since this explicitly needs to be at the end,
a separate makefile variable is added for it.
2014-02-24 17:03:18 +02:00
Ethan Hugg
58b39c9774
Merge pull request #156 from mstorsjo/avoid-openssl
...
Get rid of the OpenSSL dependency by bundling a simple SHA1 implementation
2014-02-24 06:27:11 -08:00
Martin Storsjö
e88348b76d
Allow building tests on MSVC versions where stdint.h is missing
...
Of the supported MSVC versions, only 2008 actually is missing
stdint.h, it is included in MSVC since 2010.
2014-02-24 15:38:37 +02:00
Martin Storsjö
56e5a11048
Wrap the library names in codec_unittest LDFLAGS, for use with MSVC
2014-02-24 15:38:37 +02:00
Martin Storsjö
113fb8c104
Set GTEST_HAS_TR1_TUPLE to 0 on msvc
...
This fixes building of gtest on msvc.
See e.g. http://stackoverflow.com/questions/8274588 for
more discussion on the matter.
This is only required on MSVC 2012 - gtest itself (in the cmake
files) adds -D_VARIADIC_MAX=10 to the build when building using
MSVC 2012, but we don't know the MSVC version at the make stage
here. Since the gtest tuple support isn't used at all, it's
simpler to just disable it altogether than to try to add
-D_VARIADIC_MAX=10.
2014-02-24 15:38:37 +02:00
Martin Storsjö
af2a354202
Remove the now unused -Wno-deprecated-declarations on OS X
...
This was only required for building with OpenSSL.
2014-02-24 15:38:36 +02:00
Martin Storsjö
0f3dfb33b0
Use the local sha1 function names directly without compatibility defines
2014-02-24 15:38:19 +02:00
Martin Storsjö
4f5fd952b6
Use the bundled sha1 implementation instead of relying on openssl
...
This simplifies running tests on platforms where OpenSSL isn't
commonly available.
2014-02-24 15:38:19 +02:00
Martin Storsjö
e8a2cf6d1f
Make the SHA1Result function write the output into a byte array
2014-02-24 15:38:19 +02:00
Martin Storsjö
7a4a066469
Make the SHA1 header compatible with C++
2014-02-24 15:38:19 +02:00
Martin Storsjö
fdd79e734a
Add an SHA1 implementation by Paul Jones
2014-02-24 15:38:15 +02:00
Licai Guo
59c8fd19d0
Merge pull request #348 from mstorsjo/darwin-dylib
...
Use -dynamiclib instead of -shared for building shared libraries on OS X
2014-02-24 20:43:36 +08:00
Martin Storsjö
38dbd57d36
Remove unnecessary precompiled headers
...
This reduces the huge amount of near-useless small extra files
scattered around for the sake of the platform demo projects.
This requires explicitly listing all the ncessary include paths.
2014-02-24 13:26:37 +02:00
Martin Storsjö
8c9a0bac01
Add the necessary directories to the include path within xcode
...
This is not necessary when using precompiled headers.
2014-02-24 13:24:39 +02:00
Martin Storsjö
c6cea2ccac
Use -dynamiclib instead of -shared for building shared libraries on OS X
...
Older toolchains don't recognize the -shared parameter.
2014-02-24 12:05:21 +02:00
Licai Guo
3c29c92133
Merge pull request #347 from huili2/active_sps_ref_size
...
use active SPS parameters instead of other SPS.
2014-02-24 17:03:25 +08:00
huili2
ab6931496b
Merge pull request #345 from licaiguo/fix-int-conversion-warning
...
fix int conversion warning, using LD32/ST32
2014-02-24 17:02:35 +08:00
Licai Guo
2983c92e1c
use active SPS parameters instead of other SPS.
2014-02-24 00:52:17 -08:00
Licai Guo
d78f8c7ed8
fix int conversion warning, using LD32/ST32
2014-02-24 00:27:33 -08:00
huili2
b647a78bf2
Merge pull request #344 from licaiguo/fix-level-check
...
refine level check
2014-02-24 16:21:11 +08:00
Licai Guo
b7bee7af0a
refine level check
2014-02-24 00:09:40 -08:00
Licai Guo
6854e06796
Merge pull request #343 from huili2/cast_get_word
...
cast to uint32_t in GET_WORD to prevent possible left shift error.
2014-02-24 14:34:46 +08:00
Licai Guo
d5e0b99372
cast to uint32_t in GET_WORD to prevent possible left shift error.
2014-02-23 22:22:13 -08:00
Licai Guo
c9a25e9494
Merge pull request #342 from volvet/rm-unsupported-para
...
remove inter spatial layer prediction in parameters
2014-02-24 13:22:16 +08:00
Licai Guo
26b225e34f
Merge pull request #341 from ruil2/cleanup
...
cleanup encoder parameters--- review request #108
2014-02-24 13:21:53 +08:00
volvet
f4d8882d2e
remove inter spatial layer prediction in parameters
2014-02-24 11:06:09 +08:00
ruil2
470fc4288c
minor update
2014-02-24 10:55:15 +08:00
ruil2
c79e78c4fb
cleanup encoder parameters
2014-02-24 10:40:17 +08:00
huili2
abc2495f2f
Merge pull request #335 from licaiguo/decoder-syntax-checks
...
Decoder syntax checks
2014-02-24 10:35:10 +08:00
Licai Guo
265741e922
update according to review comments
2014-02-23 18:26:28 -08:00
volvet
bf0179310c
Merge pull request #340 from zhilwang/ios-support
...
Ios support
2014-02-24 09:50:10 +08:00
volvet
5e956e3a1b
Merge pull request #337 from mstorsjo/update-sample-configs
...
Update the sample configs according to the latest config syntax changes
2014-02-24 09:49:11 +08:00
volvet
14acd1e663
Merge pull request #339 from mstorsjo/console-trace-param
...
Handle a -trace parameter for setting the trace level
2014-02-24 09:46:37 +08:00
volvet
d468404822
Merge pull request #338 from mstorsjo/use-encoder-params
...
Actually use the parameters set in SEncParamBase/SEncParamExt
2014-02-24 09:40:12 +08:00
Martin Storsjö
892d90175c
Handle a -trace parameter for setting the trace level
...
A similar parameter already exists in the other version of
the ParseCommandLine function.
The WelsStderrSetTraceLevel isn't one of the functions that
is exported from wels.dll (nor welsenc.dll) though, so this
doesn't work (not currently either since the function is
currently already referenced) if we would try to link to the
encoder library dynamically.
2014-02-23 00:19:56 +02:00
Martin Storsjö
b31049df89
Respect the iDLayerQp parameter in SEncParamExt
...
Previously the value set in the parameter struct was ignored
completely.
2014-02-23 00:14:39 +02:00
Martin Storsjö
08c07db3c6
Respect the loop filter disabling encoder parameter
...
Previously the loop filter was unconditionally enabled
regardless of what encoder parameter was set. If using
SEncParamBase instead, the loop filter was always disabled.
2014-02-23 00:14:39 +02:00
Martin Storsjö
8b7fb36f39
Set missed fields in ParamBaseTranscode
...
Previously, these fields kept whatever value was set by
FillDefault. The corresponding fields were set properly within
sSpatialLayers, but the fields within the main struct were left
with the default values.
This doesn't change the hashes in the unit test, since these
fields don't seem to be used in the produced bitstream at all.
2014-02-23 00:14:39 +02:00
Martin Storsjö
a76005065e
Use TemporalLayerNum instead of GOPSize in other encoder config files
...
This is similar to what was done to welsenc.cfg in f5cd56ea74
.
2014-02-23 00:08:36 +02:00
Martin Storsjö
d93a52ceb5
Update the other example config files to work after restructuring encoder parameters
...
This is similar to what was done to welsenc.cfg in
3ba6a5f4da
.
2014-02-22 23:46:04 +02:00
volvet
75f8b41bcd
Merge pull request #334 from mstorsjo/cleanup-vp-interface
...
Don't use a custom calling convention for the VP library entry points
2014-02-21 17:31:34 +08:00
Licai Guo
e7ed80c428
Merge pull request #322 from volvet/PreProcessExceptionHandle
...
init the spatial last spatial picture if excption
2014-02-21 17:09:17 +08:00
Licai Guo
bf921c532c
Merge pull request #333 from volvet/remove-mgs-cgs
...
remove cgs/mgs related code, it is not supported
2014-02-21 17:08:22 +08:00
Licai Guo
fee0f14732
finish syntax checks in ParseSps
2014-02-21 00:16:42 -08:00