Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-26 11:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
e24579bfcb
gecko-dev/media/libvpx/stdint.patch

42 lines
1.1 KiB
Diff
Raw Normal View History

Bug 1331498: Update libvpx to v1.6.1. r=rillian Removes armv6 and mmx optimizations. Removes x86inc.asm distinction. This was put in place because of issues with 32bit PIC builds but x86inc.asm has since been improved to support those. Switch to '.S' for arm assembly. There is now an #include for a helper file. All build systems appear to support .S so switch to it for consistency. Remove clang-cl.patch. There have been numerous changes upstream to improve clang support. MozReview-Commit-ID: IHVTbqSY2U7 --HG-- extra : rebase_source : 788796674e3eabed0c178ca327bc5e7628e03382
2017-01-17 21:46:42 +00:00
diff --git a/media/libvpx/libvpx/vpx/vpx_integer.h b/media/libvpx/libvpx/vpx/vpx_integer.h
--- a/media/libvpx/libvpx/vpx/vpx_integer.h
+++ b/media/libvpx/libvpx/vpx/vpx_integer.h
@@ -18,16 +18,18 @@
#define VPX_FORCE_INLINE __forceinline
#define VPX_INLINE __inline
#else
#define VPX_FORCE_INLINE __inline__ __attribute__(always_inline)
// TODO(jbb): Allow a way to force inline off for older compilers.
Bug 1223692: Update libvpx to v1.6.0. r=rillian This includes the following patches: <patch file> <upstream review commit> <upstream hash> 1237848-check-lookahead-ctx.patch https://chromium-review.googlesource.com/324510 4f780e94a1fa54f22256e0f4d42a77c340a38fa1 block_error_fp.patch https://chromium-review.googlesource.com/282611 ff8505a54d0b3dda220f5c0695519c353c82b933 cast-char-to-uint-before-shift.patch https://chromium-review.googlesource.com/345470 2240d83d7882ce2d5d0826b9ce33b86321d7a724 clamp_abs_lvl_seg.patch https://chromium-review.googlesource.com/315754 2e693eb80e705ea68e23eed19616d22b4778b45a clamp-abs-QIndex.patch https://chromium-review.googlesource.com/315802 ff3674a15e5b1a006546e1edc64c3e778eb34ab1 rename_duplicate_files.patch https://chromium-review.googlesource.com/281967 6a82f0d7fb9ee908c389e8d55444bbaed3d54e9c https://chromium-review.googlesource.com/317880 d36659cec7fab96cedc67db4d511ed7135637d0e vp9_filter_restore_aligment.patch https://chromium-review.googlesource.com/276889 33b3953c548a20c0aee705657df0440a740c28b7 vpx_once.patch https://chromium-review.googlesource.com/312467 2635573a7f2e4bbd259379acf91efb97d983359f MozReview-Commit-ID: R7qB6egl3Z --HG-- rename : media/libvpx/libvpx/third_party/libyuv/source/compare_posix.cc => media/libvpx/libvpx/third_party/libyuv/source/compare_gcc.cc rename : media/libvpx/libvpx/vp8/common/arm/neon/loopfilter_neon.c => media/libvpx/libvpx/vp8/common/arm/neon/vp8_loopfilter_neon.c rename : media/libvpx/libvpx/vp8/common/mips/dspr2/loopfilter_filters_dspr2.c => media/libvpx/libvpx/vp8/common/mips/dspr2/vp8_loopfilter_filters_dspr2.c rename : media/libvpx/libvpx/vp8/common/loopfilter.c => media/libvpx/libvpx/vp8/common/vp8_loopfilter.c rename : media/libvpx/libvpx/vp8/common/x86/loopfilter_mmx.asm => media/libvpx/libvpx/vp8/common/x86/vp8_loopfilter_mmx.asm rename : media/libvpx/libvpx/vp8/encoder/x86/quantize_sse2.c => media/libvpx/libvpx/vp8/encoder/x86/vp8_quantize_sse2.c extra : rebase_source : 2e851aff9c848835c5598c579b9e40e0d86658d4
2017-01-16 19:51:27 +00:00
#define VPX_INLINE inline
#endif
Bug 704313 - Add a don't-define-stdint-types frob to vpx (encapsulated in a custom downstream patch, until this makes its way upstream). r=derf --HG-- extra : rebase_source : cbc11a1b3ac02897d38553093dc52f4a3eef0bf6
2011-12-08 02:52:33 +00:00
+#if !defined(VPX_DONT_DEFINE_STDINT_TYPES)
+
Bug 1331498: Update libvpx to v1.6.1. r=rillian Removes armv6 and mmx optimizations. Removes x86inc.asm distinction. This was put in place because of issues with 32bit PIC builds but x86inc.asm has since been improved to support those. Switch to '.S' for arm assembly. There is now an #include for a helper file. All build systems appear to support .S so switch to it for consistency. Remove clang-cl.patch. There have been numerous changes upstream to improve clang support. MozReview-Commit-ID: IHVTbqSY2U7 --HG-- extra : rebase_source : 788796674e3eabed0c178ca327bc5e7628e03382
2017-01-17 21:46:42 +00:00
#if defined(VPX_EMULATE_INTTYPES)
typedef signed char int8_t;
Bug 1148639 - Update libvpx import script and patches. r=kinetik From 3f94fd4fc68971f0dc2148aa19b4e146262d15af Mon Sep 17 00:00:00 2001 Matched against upstream commit afad1a84c1.
2015-03-27 21:38:35 +00:00
typedef signed short int16_t;
Bug 1331498: Update libvpx to v1.6.1. r=rillian Removes armv6 and mmx optimizations. Removes x86inc.asm distinction. This was put in place because of issues with 32bit PIC builds but x86inc.asm has since been improved to support those. Switch to '.S' for arm assembly. There is now an #include for a helper file. All build systems appear to support .S so switch to it for consistency. Remove clang-cl.patch. There have been numerous changes upstream to improve clang support. MozReview-Commit-ID: IHVTbqSY2U7 --HG-- extra : rebase_source : 788796674e3eabed0c178ca327bc5e7628e03382
2017-01-17 21:46:42 +00:00
typedef signed int int32_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
@@ -48,16 +50,18 @@ typedef size_t uintptr_t;
#define __STDC_LIMIT_MACROS
Bug 1063356 - Back out partial libvpx update. r=me It's taking a while to get the new version building on all platforms. Removing the partial commits so we can land cleanly.
2014-10-02 18:20:47 +00:00
#endif
Bug 1331498: Update libvpx to v1.6.1. r=rillian Removes armv6 and mmx optimizations. Removes x86inc.asm distinction. This was put in place because of issues with 32bit PIC builds but x86inc.asm has since been improved to support those. Switch to '.S' for arm assembly. There is now an #include for a helper file. All build systems appear to support .S so switch to it for consistency. Remove clang-cl.patch. There have been numerous changes upstream to improve clang support. MozReview-Commit-ID: IHVTbqSY2U7 --HG-- extra : rebase_source : 788796674e3eabed0c178ca327bc5e7628e03382
2017-01-17 21:46:42 +00:00
#endif // __cplusplus
#include <stdint.h>
#endif
Bug 1063356 - Update libvpx update script. r=kinetik Remove upstreamed patches, rebase stdint.patch. Update script to work with the most recent chrome pull, upstream hasn't been doing releases, so this is the next best way to stay current. It's no longer possible to build vp8 and vp9 in the same unified source file, so most of the vp9 code is moved out of unified sources.
2014-10-06 21:41:18 +00:00
+#endif // VPX_DONT_DEFINE_STDINT_TYPES
Bug 704313 - Add a don't-define-stdint-types frob to vpx (encapsulated in a custom downstream patch, until this makes its way upstream). r=derf --HG-- extra : rebase_source : cbc11a1b3ac02897d38553093dc52f4a3eef0bf6
2011-12-08 02:52:33 +00:00
+
/* VS2010 defines stdint.h, but not inttypes.h */
Bug 1063356 - Update libvpx update script. r=kinetik Remove upstreamed patches, rebase stdint.patch. Update script to work with the most recent chrome pull, upstream hasn't been doing releases, so this is the next best way to stay current. It's no longer possible to build vp8 and vp9 in the same unified source file, so most of the vp9 code is moved out of unified sources.
2014-10-06 21:41:18 +00:00
#if defined(_MSC_VER) && _MSC_VER < 1800
Bug 704313 - Add a don't-define-stdint-types frob to vpx (encapsulated in a custom downstream patch, until this makes its way upstream). r=derf --HG-- extra : rebase_source : cbc11a1b3ac02897d38553093dc52f4a3eef0bf6
2011-12-08 02:52:33 +00:00
#define PRId64 "I64d"
Bug 1331498: Update libvpx to v1.6.1. r=rillian Removes armv6 and mmx optimizations. Removes x86inc.asm distinction. This was put in place because of issues with 32bit PIC builds but x86inc.asm has since been improved to support those. Switch to '.S' for arm assembly. There is now an #include for a helper file. All build systems appear to support .S so switch to it for consistency. Remove clang-cl.patch. There have been numerous changes upstream to improve clang support. MozReview-Commit-ID: IHVTbqSY2U7 --HG-- extra : rebase_source : 788796674e3eabed0c178ca327bc5e7628e03382
2017-01-17 21:46:42 +00:00
#else
#include <inttypes.h>
#endif
#endif // VPX_VPX_INTEGER_H_
Reference in New Issue Copy Permalink