media/libvpx/vpx_config.h@ac0c01689b40 (annotated)
media/libvpx/vpx_config.h
Thu, 15 Jan 2015 15:59:08 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 15 Jan 2015 15:59:08 +0100
- branch
- TOR_BUG_9701
- changeset 10
- ac0c01689b40
- permissions
- -rw-r--r--
Implement a real Private Browsing Mode condition by changing the API/ABI;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.
| michael@0 | 1 | #if defined(VPX_X86_ASM) |
| michael@0 | 2 | |
| michael@0 | 3 | #if defined(_WIN64) |
| michael@0 | 4 | /* 64 bit Windows */ |
| michael@0 | 5 | #ifdef _MSC_VER |
| michael@0 | 6 | #include "vpx_config_x86_64-win64-vs8.h" |
| michael@0 | 7 | #else |
| michael@0 | 8 | #include "vpx_config_x86_64-win64-gcc.h" |
| michael@0 | 9 | #endif |
| michael@0 | 10 | |
| michael@0 | 11 | #elif defined(_WIN32) |
| michael@0 | 12 | /* 32 bit Windows, MSVC. */ |
| michael@0 | 13 | #ifdef _MSC_VER |
| michael@0 | 14 | #include "vpx_config_x86-win32-vs8.h" |
| michael@0 | 15 | #else |
| michael@0 | 16 | #include "vpx_config_x86-win32-gcc.h" |
| michael@0 | 17 | #endif |
| michael@0 | 18 | |
| michael@0 | 19 | #elif defined(__APPLE__) && defined(__x86_64__) |
| michael@0 | 20 | /* 64 bit MacOS. */ |
| michael@0 | 21 | #include "vpx_config_x86_64-darwin9-gcc.h" |
| michael@0 | 22 | |
| michael@0 | 23 | #elif defined(__APPLE__) && defined(__i386__) |
| michael@0 | 24 | /* 32 bit MacOS. */ |
| michael@0 | 25 | #include "vpx_config_x86-darwin9-gcc.h" |
| michael@0 | 26 | |
| michael@0 | 27 | #elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) |
| michael@0 | 28 | /* 32 bit ELF platforms. */ |
| michael@0 | 29 | #include "vpx_config_x86-linux-gcc.h" |
| michael@0 | 30 | |
| michael@0 | 31 | #elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) |
| michael@0 | 32 | /* 64 bit ELF platforms. */ |
| michael@0 | 33 | #include "vpx_config_x86_64-linux-gcc.h" |
| michael@0 | 34 | |
| michael@0 | 35 | #else |
| michael@0 | 36 | #error VPX_X86_ASM is defined, but assembly not supported on this platform! |
| michael@0 | 37 | #endif |
| michael@0 | 38 | |
| michael@0 | 39 | #elif defined(VPX_ARM_ASM) |
| michael@0 | 40 | |
| michael@0 | 41 | /* Android */ |
| michael@0 | 42 | #include "vpx_config_armv7-android-gcc.h" |
| michael@0 | 43 | |
| michael@0 | 44 | #else |
| michael@0 | 45 | /* Assume generic GNU/GCC configuration. */ |
| michael@0 | 46 | #include "vpx_config_generic-gnu.h" |
| michael@0 | 47 | #endif |
| michael@0 | 48 | |
| michael@0 | 49 | /* Control error-concealment support using our own #define rather than |
| michael@0 | 50 | hard-coding it. */ |
| michael@0 | 51 | #if defined(MOZ_VPX_ERROR_CONCEALMENT) |
| michael@0 | 52 | #undef CONFIG_ERROR_CONCEALMENT |
| michael@0 | 53 | #define CONFIG_ERROR_CONCEALMENT 1 |
| michael@0 | 54 | #endif |
