Index: third_party/libvpx/generate_gni.sh |
diff --git a/third_party/libvpx/generate_gni.sh b/third_party/libvpx/generate_gni.sh |
index 1516235af91ce61cfeee386b8f740bba2c340315..142cad35b4307e58c517e4235393bf43540eff34 100755 |
--- a/third_party/libvpx/generate_gni.sh |
+++ b/third_party/libvpx/generate_gni.sh |
@@ -13,8 +13,10 @@ |
# |
# The following optional flags are supported: |
# --disable-avx : AVX+AVX2 support is disabled. |
-# --only-configs: Excludes generation of GN and GYP files (i.e. only |
-# configuration headers are generated). |
+# --only-configs : Excludes generation of GN and GYP files (i.e. only |
+# configuration headers are generated). |
+# --enable-vp9-highbitdepth : Allow for high bit depth internal, 10 and 12 bit |
+# vp9 encode and decode. Only applied to x86[_64]. |
export LC_ALL=C |
BASE_DIR=$(pwd) |
@@ -33,6 +35,10 @@ case $i in |
ONLY_CONFIGS=true |
shift |
;; |
+ --enable-vp9-highbitdepth) |
+ HIGHBD="--enable-vp9-highbitdepth" |
+ shift |
+ ;; |
*) |
echo "Unknown option: $i" |
exit 1 |
@@ -306,9 +312,10 @@ cp -R $LIBVPX_SRC_DIR $TEMP_DIR |
cd $TEMP_DIR |
echo "Generate config files." |
-all_platforms="--enable-external-build --enable-postproc --disable-install-srcs --enable-multi-res-encoding --enable-temporal-denoising --disable-unit-tests --disable-install-docs --disable-examples --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 $DISABLE_AVX --as=yasm" |
-gen_config_files linux/ia32 "--target=x86-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms}" |
-gen_config_files linux/x64 "--target=x86_64-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms}" |
+all_platforms="--enable-external-build --enable-postproc --disable-install-srcs --enable-multi-res-encoding --enable-temporal-denoising --disable-unit-tests --disable-install-docs --disable-examples --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384" |
+x86_platforms="$DISABLE_AVX --as=yasm $HIGHBD" |
+gen_config_files linux/ia32 "--target=x86-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms} ${x86_platforms}" |
+gen_config_files linux/x64 "--target=x86_64-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms} ${x86_platforms}" |
gen_config_files linux/arm "--target=armv7-linux-gcc --enable-pic --enable-realtime-only --disable-install-bins --disable-install-libs --disable-neon ${all_platforms}" |
gen_config_files linux/arm-neon "--target=armv7-linux-gcc --enable-pic --enable-realtime-only ${all_platforms}" |
gen_config_files linux/arm-neon-cpu-detect "--target=armv7-linux-gcc --enable-pic --enable-realtime-only --enable-runtime-cpu-detect ${all_platforms}" |
@@ -316,10 +323,10 @@ gen_config_files linux/arm64 "--force-target=armv8-linux-gcc --enable-pic --enab |
gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}" |
gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}" |
gen_config_files linux/generic "--target=generic-gnu --enable-pic --enable-realtime-only ${all_platforms}" |
-gen_config_files win/ia32 "--target=x86-win32-vs12 --enable-realtime-only ${all_platforms}" |
-gen_config_files win/x64 "--target=x86_64-win64-vs12 --enable-realtime-only ${all_platforms}" |
-gen_config_files mac/ia32 "--target=x86-darwin9-gcc --enable-pic --enable-realtime-only ${all_platforms}" |
-gen_config_files mac/x64 "--target=x86_64-darwin9-gcc --enable-pic --enable-realtime-only ${all_platforms}" |
+gen_config_files win/ia32 "--target=x86-win32-vs12 --enable-realtime-only ${all_platforms} ${x86_platforms}" |
+gen_config_files win/x64 "--target=x86_64-win64-vs12 --enable-realtime-only ${all_platforms} ${x86_platforms}" |
+gen_config_files mac/ia32 "--target=x86-darwin9-gcc --enable-pic --enable-realtime-only ${all_platforms} ${x86_platforms}" |
+gen_config_files mac/x64 "--target=x86_64-darwin9-gcc --enable-pic --enable-realtime-only ${all_platforms} ${x86_platforms}" |
gen_config_files nacl "--target=generic-gnu --enable-pic --enable-realtime-only ${all_platforms}" |
echo "Remove temporary directory." |