Commit Graph

2363 Commits

Author SHA1 Message Date
Martin Storsjö
d5a45ec513 Mark the x86 assembly object files as not requiring an executable stack
This avoids having to add extra linker flags in order to specify this.

This is similar to how this already is handled for the arm assembly.
2014-07-25 00:56:39 +03:00
Martin Storsjö
a365b42d3b Consistently use -f elf instead of -f elf32
The freebsd platform file already did things like this.
2014-07-25 00:54:13 +03:00
Ethan Hugg
ab1778a523 Merge pull request #1213 from jld/noexecstack
Don't request executable stacks for Linux GMP plugin.
2014-07-24 11:31:54 -07:00
Jed Davis
cf0ac5504b Don't request executable stacks for Linux GMP plugin.
The codec seems to work without executable stack memory, and in general
executable stacks should be avoided if possible, but the assembler used
for the .asm source files requests it.  This commit adds a linker option
to override that.
2014-07-24 10:55:03 -07:00
Ethan Hugg
ed4db186a1 Merge pull request #1207 from mstorsjo/android-compiler-check
Check that a working android toolchain was found
2014-07-24 08:20:16 -07:00
Ethan Hugg
0b80b7fa79 Merge pull request #1206 from mstorsjo/version-generate-deps
Fix generating version.h in parallel make builds (make -jX)
2014-07-24 08:18:56 -07:00
Martin Storsjö
4433740722 Fix the name of the version generation makefile target 2014-07-24 17:02:40 +03:00
Martin Storsjö
8253049383 Add dependencies to generating version.h in the object files that use it
Previously the makefile didn't know that there was any dependency between
compiling welsDecoderExt.o and welsEncoderExt.o and the regeneration
of the version.h header. This meant that in parallel builds (make -jX),
make could try to regenerate version.h while compiling welsDecoderExt.o
and welsEncoderExt.o, which would lead to errors about version.h not
existing.

Also add some spacing around the makefile rules.

This fixes parallel make building in certain cases.
2014-07-24 17:02:40 +03:00
jesup
300cceaabf Merge pull request #1211 from ethanhugg/ff34-apichanges
Update for new GMP API changes in FF34
2014-07-24 09:23:46 -04:00
Ethan Hugg
06d92c4ed1 Update for new GMP API changes in FF34 2014-07-24 05:38:21 -07:00
Martin Storsjö
33a7e02261 Check that a working android toolchain was found
If the user selects a nonexistent ARCH, previously the call that
sets TOOLCHAINPREFIX would set it to contain a long error message,
which makes it quite hard to figure out what actually went wrong.

Instead check that CXX=$(TOLCHAINPREFIX)g++ actually points to a
working executable, and abort immediately if this isn't true.
2014-07-24 01:09:45 +03:00
huili2
470246c20f Merge pull request #1195 from mstorsjo/msvc-unify-linker-opts
Set MSVC linker debug options consistently in the project files
2014-07-23 13:29:14 +08:00
dongzha
5397265021 Merge pull request #1202 from zhilwang/processing-refine
Add arm64 downsample code to processing project
2014-07-22 13:01:51 +08:00
Ethan Hugg
7847f69eab Merge pull request #1200 from ruil2/decoder_ret_1
add decoder return value
2014-07-21 19:37:58 -07:00
zhiliang wang
e2425df06c Add arm64 downsample code to processing project 2014-07-22 10:16:55 +08:00
ruil2
78650363b8 add decoder return value 2014-07-22 09:43:18 +08:00
zhilwang
123b904f77 Merge pull request #1199 from dongzha/AddResArm64master
Add Unit Test and ARM64 code for block_add (for master)
2014-07-21 15:41:39 +08:00
HFVideoMac
0d1699b67f Add Unit Test and ARM64 code for block_add 2014-07-21 14:37:52 +08:00
zhilwang
9ac7cd2816 Merge pull request #1191 from mstorsjo/merge-encdemo-include-paths
Set the encDemo header paths on the target level
2014-07-18 17:01:46 +08:00
zhilwang
3797aa1a14 Merge pull request #1194 from mstorsjo/msvc-simplify-output-dirs
Use macros for setting the output directory in MSVC project files
2014-07-18 16:59:28 +08:00
zhilwang
811e20f0d9 Merge pull request #1185 from mstorsjo/android-l-preview
Fix building for the Android L preview release, add support for new 64 bit Android ABIs
2014-07-18 16:56:22 +08:00
Martin Storsjö
71e59fd31c Set MSVC linker debug options consistently in the project files 2014-07-18 11:26:26 +03:00
Martin Storsjö
f26c7e3f4f Use macros for setting the output directory
This makes sure this is set to the exact same string in all
the configurations, simplifying editing multiple configurations
at the same time.

This changes the output directory for 64 bit binaries from
bin/win64 to bin/x64, but this is the common pattern used by
MSVC in new projects.
2014-07-18 11:23:48 +03:00
huili2
7e3812c970 Merge pull request #1148 from mstorsjo/dont-hardcode-xcode-archs
Don't hardcode the valid architectures in one xcode project
2014-07-18 09:24:31 +08:00
huili2
2627c05117 Merge pull request #1130 from mstorsjo/default-intermediates-path
Use default paths for and object files and other intermediate files
2014-07-18 09:23:30 +08:00
jesup
6b67aa3516 Merge pull request #1192 from ethanhugg/info-file
Update info file for bugzilla 1037754 - no longer need to advertise VP8.
2014-07-17 16:37:38 -04:00
Martin Storsjö
8d22836ecd Set the encDemo header paths on the target level
Currently half of them are set on the project level, and half of them
on the target level.

In all other projects within OpenH264, they're set on the target level.
2014-07-17 17:41:06 +03:00
Ethan Hugg
df8623dce1 Merge pull request #1149 from mstorsjo/unify-build-active-arch
Unify the setting "Build Active Architecture Only"
2014-07-17 07:18:24 -07:00
Martin Storsjö
fa8e56e944 Unify the setting "Build Active Architecture Only"
Set it to Yes in Debug configurations, set on the project level
(not at the target level).
2014-07-17 12:36:49 +03:00
huili2
288e2b3cdf Merge pull request #1188 from ruil2/trace_tag
fix reference frame update issue which will casue crash
2014-07-17 13:40:31 +08:00
ruil2
63e3c6588a fix reference frame update issue which will casue crash 2014-07-17 12:45:17 +08:00
dongzha
a0320dac5d Merge pull request #1186 from huili2/diff_logic_WME_master
modify the logic for WME usage
2014-07-17 10:43:49 +08:00
dongzha
74b52e8a31 Merge pull request #1183 from ruil2/trace_tag
add trace tag
2014-07-17 10:43:14 +08:00
ruil2
ef7cce3d14 modify trace output 2014-07-17 10:09:52 +08:00
huili2
a0e569da81 modify the logic for WME usage 2014-07-16 18:14:53 -07:00
dongzha
396249fedc Merge pull request #1171 from shihuade/ReleaseV2.2
update binary comparison test script
2014-07-17 08:43:14 +08:00
dongzha
cd026ef166 Merge pull request #1152 from mstorsjo/xcode-inherit-include-paths
Include inherited header search paths in all projects
2014-07-17 08:42:15 +08:00
dongzha
2db10df5c6 Merge pull request #1180 from huili2/dpb_green_issue_master
solve green issue combined with EC and multi-packet input
2014-07-17 08:41:27 +08:00
dongzha
2a83a85eb7 Merge pull request #1151 from mstorsjo/unify-deployment-target
Set the iOS deployment target consistently
2014-07-17 08:40:39 +08:00
Ethan Hugg
948356993b Update info file for bugzilla 1037754 - no longer need to advertise VP8. 2014-07-16 13:40:28 -07:00
Ethan Hugg
990bdda615 Merge pull request #1181 from mstorsjo/generate-version
Fix generating the version header when building outside of the source tree
2014-07-16 13:19:11 -07:00
Martin Storsjö
22f04159bb Fix incorrect indentation in build/platform-android.mk 2014-07-16 21:33:14 +03:00
Martin Storsjö
04f066ae7c Add support for building for the new 64 bit android ABIs
This requires the new NDK r10.

The mips64 ABI is handled by the default case, there's no need to
add custom code for that in platform-android.mk.
2014-07-16 21:32:54 +03:00
Martin Storsjö
9aaeef9264 Manually define the SWelsTime struct on unix, don't rely on struct timeb
We don't use the ftime function on unix for filling SWelsTime anyway,
we fill the time and millitm fields manually.

On android, the sys/timeb.h header has been removed in the next
platform version (currently available in NDK r10 in the "L preview"
release), since this header and the ftime function have been removed
from the POSIX 2008 specification.

This fixes compilation when targeting the Android "L preview" release,
even when targeting the 32 bit ABIs.
2014-07-16 21:32:18 +03:00
Martin Storsjö
6966679f33 Remove unused includes of sys/timeb.h
This header is included by crt_util_safe_x.h whenever necessary (it's
all hidden in the SWelsTime struct) - code which does not explicitly
use things from sys/timeb.h shouldn't include it.
2014-07-16 21:31:07 +03:00
Martin Storsjö
71c5acc7a1 Remove outdated advice from the readme
We no longer use the GCCVERSION variable - we let the NDK pick whichever
compiler version is the default for the chosen architecture.
2014-07-16 21:28:01 +03:00
ruil2
b9058e4987 add trace tag 2014-07-16 16:49:53 +08:00
Martin Storsjö
93e9694bc6 Fix generating the version header when building outside of the source tree
Also silence this command in silent builds.
2014-07-16 10:40:45 +03:00
huili2
efdb0cd2e2 Merge pull request #1175 from ruil2/scc_ut
enable hashcode verification for screen content
2014-07-16 14:00:16 +08:00
huili2
e63dad0b6c Merge pull request #1172 from ruil2/pause_remove
remove pause frame interface which will be done in application level
2014-07-16 13:57:46 +08:00