generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable multi_res_encoding in libvpx.

Browse Source 
TBR=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/639008

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2385 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
marpan@webrtc.org 2012-06-08 22:53:55 +00:00
parent fa7138f889
commit 78a3110602
29 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
third_party/libvpx/generate_gypi.sh vendored
View File

@ -21,7 +21,7 @@
# http://src.chromium.org/svn/trunk/deps/third_party/libvpx/generate_gypi.sh
LIBVPX_SRC_DIR="source/libvpx"
COMMON_CONFIG="CONFIG_REALTIME_ONLY=yes CONFIG_GCC=yes CONFIG_ERROR_CONCEALMENT=yes CONFIG_POSTPROC=yes CONFIG_MULTI_RES_ENCODING=yes"
COMMON_CONFIG="CONFIG_REALTIME_ONLY=yes CONFIG_GCC=yes CONFIG_ERROR_CONCEALMENT=yes CONFIG_POSTPROC=yes"
X86_CONFIG="ARCH_X86=yes HAVE_MMX=yes HAVE_SSE2=yes HAVE_SSE3=yes HAVE_SSSE3=yes HAVE_SSE4_1=yes CONFIG_RUNTIME_CPU_DETECT=yes"
X86_64_CONFIG="ARCH_X86_64=yes HAVE_MMX=yes HAVE_SSE2=yes HAVE_SSE3=yes HAVE_SSSE3=yes HAVE_SSE4_1=yes CONFIG_PIC=yes CONFIG_RUNTIME_CPU_DETECT=yes"
ARM_CONFIG="ARCH_ARM=yes HAVE_EDSP=yes HAVE_MEDIA=yes"

2
third_party/libvpx/libvpx_srcs_arm.gypi vendored
View File

@ -147,8 +147,6 @@
'source/libvpx/vp8/encoder/mcomp.h',
'source/libvpx/vp8/encoder/modecosts.c',
'source/libvpx/vp8/encoder/modecosts.h',
'source/libvpx/vp8/encoder/mr_dissim.c',
'source/libvpx/vp8/encoder/mr_dissim.h',
'source/libvpx/vp8/encoder/onyx_if.c',
'source/libvpx/vp8/encoder/onyx_int.h',
'source/libvpx/vp8/encoder/pickinter.c',

2
third_party/libvpx/libvpx_srcs_arm_neon.gypi vendored
View File

@ -185,8 +185,6 @@
'source/libvpx/vp8/encoder/mcomp.h',
'source/libvpx/vp8/encoder/modecosts.c',
'source/libvpx/vp8/encoder/modecosts.h',
'source/libvpx/vp8/encoder/mr_dissim.c',
'source/libvpx/vp8/encoder/mr_dissim.h',
'source/libvpx/vp8/encoder/onyx_if.c',
'source/libvpx/vp8/encoder/onyx_int.h',
'source/libvpx/vp8/encoder/pickinter.c',

2
third_party/libvpx/libvpx_srcs_x86.gypi vendored
View File

@ -142,8 +142,6 @@
'source/libvpx/vp8/encoder/mcomp.h',
'source/libvpx/vp8/encoder/modecosts.c',
'source/libvpx/vp8/encoder/modecosts.h',
'source/libvpx/vp8/encoder/mr_dissim.c',
'source/libvpx/vp8/encoder/mr_dissim.h',
'source/libvpx/vp8/encoder/onyx_if.c',
'source/libvpx/vp8/encoder/onyx_int.h',
'source/libvpx/vp8/encoder/pickinter.c',

2
third_party/libvpx/libvpx_srcs_x86_64.gypi vendored
View File

@ -143,8 +143,6 @@
'source/libvpx/vp8/encoder/mcomp.h',
'source/libvpx/vp8/encoder/modecosts.c',
'source/libvpx/vp8/encoder/modecosts.h',
'source/libvpx/vp8/encoder/mr_dissim.c',
'source/libvpx/vp8/encoder/mr_dissim.h',
'source/libvpx/vp8/encoder/onyx_if.c',
'source/libvpx/vp8/encoder/onyx_int.h',
'source/libvpx/vp8/encoder/pickinter.c',

2
third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm vendored
View File

@ -66,7 +66,7 @@
.equ CONFIG_POSTPROC_VISUALIZER , 0
.equ CONFIG_OS_SUPPORT , 1
.equ CONFIG_UNIT_TESTS , 0
.equ CONFIG_MULTI_RES_ENCODING , 1
.equ CONFIG_MULTI_RES_ENCODING , 0
.equ CONFIG_TEMPORAL_DENOISING , 1
.section .note.GNU-stack,"",%progbits
@ This file was created from a .asm file

2
third_party/libvpx/source/config/linux/arm-neon/vpx_config.c vendored
View File

@ -5,5 +5,5 @@
/* tree. An additional intellectual property rights grant can be found */
/* in the file PATENTS. All contributing project authors may */
/* be found in the AUTHORS file in the root of the source tree. */
static const char* const cfg = "--sdk-path=/usr/local/google/users/holmer/code/android/android-ndk-r7c --target=armv7-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc --enable-multi-res-encoding --disable-runtime-cpu-detect";
static const char* const cfg = "--sdk-path=/usr/local/google/users/holmer/code/android/android-ndk-r7c --target=armv7-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc --disable-runtime-cpu-detect";
const char *vpx_codec_build_config(void) {return cfg;}

2
third_party/libvpx/source/config/linux/arm-neon/vpx_config.h vendored
View File

@ -74,6 +74,6 @@
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
#define CONFIG_UNIT_TESTS 0
#define CONFIG_MULTI_RES_ENCODING 1
#define CONFIG_MULTI_RES_ENCODING 0
#define CONFIG_TEMPORAL_DENOISING 1
#endif /* VPX_CONFIG_H */

2
third_party/libvpx/source/config/linux/arm/vpx_config.asm vendored
View File

@ -66,7 +66,7 @@
.equ CONFIG_POSTPROC_VISUALIZER , 0
.equ CONFIG_OS_SUPPORT , 1
.equ CONFIG_UNIT_TESTS , 0
.equ CONFIG_MULTI_RES_ENCODING , 1
.equ CONFIG_MULTI_RES_ENCODING , 0
.equ CONFIG_TEMPORAL_DENOISING , 1
.section .note.GNU-stack,"",%progbits
@ This file was created from a .asm file

2
third_party/libvpx/source/config/linux/arm/vpx_config.c vendored
View File

@ -5,5 +5,5 @@
/* tree. An additional intellectual property rights grant can be found */
/* in the file PATENTS. All contributing project authors may */
/* be found in the AUTHORS file in the root of the source tree. */
static const char* const cfg = "--sdk-path=/usr/local/google/users/holmer/code/android/android-ndk-r7c --target=armv5te-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc --enable-multi-res-encoding";
static const char* const cfg = "--sdk-path=/usr/local/google/users/holmer/code/android/android-ndk-r7c --target=armv5te-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc";
const char *vpx_codec_build_config(void) {return cfg;}

2
third_party/libvpx/source/config/linux/arm/vpx_config.h vendored
View File

@ -74,6 +74,6 @@
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
#define CONFIG_UNIT_TESTS 0
#define CONFIG_MULTI_RES_ENCODING 1
#define CONFIG_MULTI_RES_ENCODING 0
#define CONFIG_TEMPORAL_DENOISING 1
#endif /* VPX_CONFIG_H */

2
third_party/libvpx/source/config/linux/ia32/vpx_config.asm vendored
View File

@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
CONFIG_POSTPROC_VISUALIZER equ 0
CONFIG_OS_SUPPORT equ 1
CONFIG_UNIT_TESTS equ 0
CONFIG_MULTI_RES_ENCODING equ 1
CONFIG_MULTI_RES_ENCODING equ 0
CONFIG_TEMPORAL_DENOISING equ 1

2
third_party/libvpx/source/config/linux/ia32/vpx_config.c vendored
View File

@ -5,5 +5,5 @@
/* tree. An additional intellectual property rights grant can be found */
/* in the file PATENTS. All contributing project authors may */
/* be found in the AUTHORS file in the root of the source tree. */
static const char* const cfg = "--target=x86-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding";
static const char* const cfg = "--target=x86-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
const char *vpx_codec_build_config(void) {return cfg;}

2
third_party/libvpx/source/config/linux/ia32/vpx_config.h vendored
View File

@ -74,6 +74,6 @@
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
#define CONFIG_UNIT_TESTS 0
#define CONFIG_MULTI_RES_ENCODING 1
#define CONFIG_MULTI_RES_ENCODING 0
#define CONFIG_TEMPORAL_DENOISING 1
#endif /* VPX_CONFIG_H */

2
third_party/libvpx/source/config/linux/x64/vpx_config.asm vendored
View File

@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
CONFIG_POSTPROC_VISUALIZER equ 0
CONFIG_OS_SUPPORT equ 1
CONFIG_UNIT_TESTS equ 0
CONFIG_MULTI_RES_ENCODING equ 1
CONFIG_MULTI_RES_ENCODING equ 0
CONFIG_TEMPORAL_DENOISING equ 1

2
third_party/libvpx/source/config/linux/x64/vpx_config.c vendored
View File

@ -5,5 +5,5 @@
/* tree. An additional intellectual property rights grant can be found */
/* in the file PATENTS. All contributing project authors may */
/* be found in the AUTHORS file in the root of the source tree. */
static const char* const cfg = "--target=x86_64-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding";
static const char* const cfg = "--target=x86_64-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
const char *vpx_codec_build_config(void) {return cfg;}

2
third_party/libvpx/source/config/linux/x64/vpx_config.h vendored
View File

@ -74,6 +74,6 @@
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
#define CONFIG_UNIT_TESTS 0
#define CONFIG_MULTI_RES_ENCODING 1
#define CONFIG_MULTI_RES_ENCODING 0
#define CONFIG_TEMPORAL_DENOISING 1
#endif /* VPX_CONFIG_H */

2
third_party/libvpx/source/config/mac/ia32/vpx_config.asm vendored
View File

@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
CONFIG_POSTPROC_VISUALIZER equ 0
CONFIG_OS_SUPPORT equ 1
CONFIG_UNIT_TESTS equ 0
CONFIG_MULTI_RES_ENCODING equ 1
CONFIG_MULTI_RES_ENCODING equ 0
CONFIG_TEMPORAL_DENOISING equ 1

2
third_party/libvpx/source/config/mac/ia32/vpx_config.c vendored
View File

@ -5,5 +5,5 @@
/* tree. An additional intellectual property rights grant can be found */
/* in the file PATENTS. All contributing project authors may */
/* be found in the AUTHORS file in the root of the source tree. */
static const char* const cfg = "--target=x86-darwin9-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding";
static const char* const cfg = "--target=x86-darwin9-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
const char *vpx_codec_build_config(void) {return cfg;}

2
third_party/libvpx/source/config/mac/ia32/vpx_config.h vendored
View File

@ -74,6 +74,6 @@
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
#define CONFIG_UNIT_TESTS 0
#define CONFIG_MULTI_RES_ENCODING 1
#define CONFIG_MULTI_RES_ENCODING 0
#define CONFIG_TEMPORAL_DENOISING 1
#endif /* VPX_CONFIG_H */

2
third_party/libvpx/source/config/mac/x64/vpx_config.asm vendored
View File

@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
CONFIG_POSTPROC_VISUALIZER equ 0
CONFIG_OS_SUPPORT equ 1
CONFIG_UNIT_TESTS equ 0
CONFIG_MULTI_RES_ENCODING equ 1
CONFIG_MULTI_RES_ENCODING equ 0
CONFIG_TEMPORAL_DENOISING equ 1

2
third_party/libvpx/source/config/mac/x64/vpx_config.c vendored
View File

@ -5,5 +5,5 @@
/* tree. An additional intellectual property rights grant can be found */
/* in the file PATENTS. All contributing project authors may */
/* be found in the AUTHORS file in the root of the source tree. */
static const char* const cfg = "--target=x86_64-darwin10-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding";
static const char* const cfg = "--target=x86_64-darwin10-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
const char *vpx_codec_build_config(void) {return cfg;}

2
third_party/libvpx/source/config/mac/x64/vpx_config.h vendored
View File

@ -74,6 +74,6 @@
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
#define CONFIG_UNIT_TESTS 0
#define CONFIG_MULTI_RES_ENCODING 1
#define CONFIG_MULTI_RES_ENCODING 0
#define CONFIG_TEMPORAL_DENOISING 1
#endif /* VPX_CONFIG_H */

2
third_party/libvpx/source/config/win/ia32/vpx_config.asm vendored
View File

@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
CONFIG_POSTPROC_VISUALIZER equ 0
CONFIG_OS_SUPPORT equ 1
CONFIG_UNIT_TESTS equ 0
CONFIG_MULTI_RES_ENCODING equ 1
CONFIG_MULTI_RES_ENCODING equ 0
CONFIG_TEMPORAL_DENOISING equ 1

2
third_party/libvpx/source/config/win/ia32/vpx_config.c vendored
View File

@ -5,5 +5,5 @@
/* tree. An additional intellectual property rights grant can be found */
/* in the file PATENTS. All contributing project authors may */
/* be found in the AUTHORS file in the root of the source tree. */
static const char* const cfg = "--target=x86-win32-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding --enable-static-msvcrt --as=yasm";
static const char* const cfg = "--target=x86-win32-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-static-msvcrt --as=yasm";
const char *vpx_codec_build_config(void) {return cfg;}

2
third_party/libvpx/source/config/win/ia32/vpx_config.h vendored
View File

@ -74,6 +74,6 @@
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
#define CONFIG_UNIT_TESTS 0
#define CONFIG_MULTI_RES_ENCODING 1
#define CONFIG_MULTI_RES_ENCODING 0
#define CONFIG_TEMPORAL_DENOISING 1
#endif /* VPX_CONFIG_H */

2
third_party/libvpx/source/config/win/x64/vpx_config.asm vendored
View File

@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
CONFIG_POSTPROC_VISUALIZER equ 0
CONFIG_OS_SUPPORT equ 1
CONFIG_UNIT_TESTS equ 0
CONFIG_MULTI_RES_ENCODING equ 1
CONFIG_MULTI_RES_ENCODING equ 0
CONFIG_TEMPORAL_DENOISING equ 1

2
third_party/libvpx/source/config/win/x64/vpx_config.c vendored
View File

@ -5,5 +5,5 @@
/* tree. An additional intellectual property rights grant can be found */
/* in the file PATENTS. All contributing project authors may */
/* be found in the AUTHORS file in the root of the source tree. */
static const char* const cfg = "--target=x86_64-win64-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding --enable-static-msvcrt --as=yasm";
static const char* const cfg = "--target=x86_64-win64-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-static-msvcrt --as=yasm";
const char *vpx_codec_build_config(void) {return cfg;}

2
third_party/libvpx/source/config/win/x64/vpx_config.h vendored
View File

@ -74,6 +74,6 @@
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
#define CONFIG_UNIT_TESTS 0
#define CONFIG_MULTI_RES_ENCODING 1
#define CONFIG_MULTI_RES_ENCODING 0
#define CONFIG_TEMPORAL_DENOISING 1
#endif /* VPX_CONFIG_H */