Bug 1328330 - Remove vp8 error concealment. r=jesup, r=jya
authorJohann <johannkoenig@google.com>
Wed, 18 Jan 2017 07:37:00 -0500
changeset 330156 bbbbcc7e8a1bf0b432f22a04994d920a091c591f
parent 330155 111109712e7700e8544d0da27589016662d48399
child 330157 0a4c1b6c15a2f5c862c7158bb94e626960db9215
push id31231
push userkwierso@gmail.com
push dateFri, 20 Jan 2017 00:31:55 +0000
treeherdermozilla-central@bde3fc40b9b5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, jya
bugs1328330
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1328330 - Remove vp8 error concealment. r=jesup, r=jya This feature is unused by WebRTC.
media/libvpx/config/generic/vpx_config.asm
media/libvpx/config/generic/vpx_config.c
media/libvpx/config/generic/vpx_config.h
media/libvpx/config/linux/arm/vpx_config.asm
media/libvpx/config/linux/arm/vpx_config.c
media/libvpx/config/linux/arm/vpx_config.h
media/libvpx/config/linux/ia32/vpx_config.asm
media/libvpx/config/linux/ia32/vpx_config.c
media/libvpx/config/linux/ia32/vpx_config.h
media/libvpx/config/linux/x64/vpx_config.asm
media/libvpx/config/linux/x64/vpx_config.c
media/libvpx/config/linux/x64/vpx_config.h
media/libvpx/config/mac/ia32/vpx_config.asm
media/libvpx/config/mac/ia32/vpx_config.c
media/libvpx/config/mac/ia32/vpx_config.h
media/libvpx/config/mac/x64/vpx_config.asm
media/libvpx/config/mac/x64/vpx_config.c
media/libvpx/config/mac/x64/vpx_config.h
media/libvpx/config/win/ia32/vpx_config.asm
media/libvpx/config/win/ia32/vpx_config.c
media/libvpx/config/win/ia32/vpx_config.h
media/libvpx/config/win/x64/vpx_config.asm
media/libvpx/config/win/x64/vpx_config.c
media/libvpx/config/win/x64/vpx_config.h
media/libvpx/generate_sources_mozbuild.sh
media/libvpx/sources.mozbuild
old-configure.in
--- a/media/libvpx/config/generic/vpx_config.asm
+++ b/media/libvpx/config/generic/vpx_config.asm
@@ -51,17 +51,17 @@
 .equ CONFIG_VP8 ,  1
 .equ CONFIG_VP9 ,  1
 .equ CONFIG_ENCODERS ,  1
 .equ CONFIG_DECODERS ,  1
 .equ CONFIG_STATIC_MSVCRT ,  0
 .equ CONFIG_SPATIAL_RESAMPLING ,  1
 .equ CONFIG_REALTIME_ONLY ,  0
 .equ CONFIG_ONTHEFLY_BITPACKING ,  0
-.equ CONFIG_ERROR_CONCEALMENT ,  1
+.equ CONFIG_ERROR_CONCEALMENT ,  0
 .equ CONFIG_SHARED ,  0
 .equ CONFIG_STATIC ,  1
 .equ CONFIG_SMALL ,  0
 .equ CONFIG_POSTPROC_VISUALIZER ,  0
 .equ CONFIG_OS_SUPPORT ,  1
 .equ CONFIG_UNIT_TESTS ,  0
 .equ CONFIG_WEBM_IO ,  1
 .equ CONFIG_LIBYUV ,  1
--- a/media/libvpx/config/generic/vpx_config.c
+++ b/media/libvpx/config/generic/vpx_config.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 /*  */
 /* Use of this source code is governed by a BSD-style license */
 /* that can be found in the LICENSE file in the root of the source */
 /* 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. */
 #include "vpx/vpx_codec.h"
-static const char* const cfg = "--target=generic-gnu --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-error-concealment";
+static const char* const cfg = "--target=generic-gnu --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic";
 const char *vpx_codec_build_config(void) {return cfg;}
--- a/media/libvpx/config/generic/vpx_config.h
+++ b/media/libvpx/config/generic/vpx_config.h
@@ -60,17 +60,17 @@
 #define CONFIG_VP8 1
 #define CONFIG_VP9 1
 #define CONFIG_ENCODERS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 0
 #define CONFIG_ONTHEFLY_BITPACKING 0
-#define CONFIG_ERROR_CONCEALMENT 1
+#define CONFIG_ERROR_CONCEALMENT 0
 #define CONFIG_SHARED 0
 #define CONFIG_STATIC 1
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
 #define CONFIG_WEBM_IO 1
 #define CONFIG_LIBYUV 1
--- a/media/libvpx/config/linux/arm/vpx_config.asm
+++ b/media/libvpx/config/linux/arm/vpx_config.asm
@@ -51,17 +51,17 @@
 .equ CONFIG_VP8 ,  1
 .equ CONFIG_VP9 ,  1
 .equ CONFIG_ENCODERS ,  1
 .equ CONFIG_DECODERS ,  1
 .equ CONFIG_STATIC_MSVCRT ,  0
 .equ CONFIG_SPATIAL_RESAMPLING ,  1
 .equ CONFIG_REALTIME_ONLY ,  1
 .equ CONFIG_ONTHEFLY_BITPACKING ,  0
-.equ CONFIG_ERROR_CONCEALMENT ,  1
+.equ CONFIG_ERROR_CONCEALMENT ,  0
 .equ CONFIG_SHARED ,  0
 .equ CONFIG_STATIC ,  1
 .equ CONFIG_SMALL ,  0
 .equ CONFIG_POSTPROC_VISUALIZER ,  0
 .equ CONFIG_OS_SUPPORT ,  1
 .equ CONFIG_UNIT_TESTS ,  0
 .equ CONFIG_WEBM_IO ,  1
 .equ CONFIG_LIBYUV ,  1
--- a/media/libvpx/config/linux/arm/vpx_config.c
+++ b/media/libvpx/config/linux/arm/vpx_config.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 /*  */
 /* Use of this source code is governed by a BSD-style license */
 /* that can be found in the LICENSE file in the root of the source */
 /* 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. */
 #include "vpx/vpx_codec.h"
-static const char* const cfg = "--target=armv7-linux-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-error-concealment --enable-runtime-cpu-detect --enable-realtime-only";
+static const char* const cfg = "--target=armv7-linux-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-runtime-cpu-detect --enable-realtime-only";
 const char *vpx_codec_build_config(void) {return cfg;}
--- a/media/libvpx/config/linux/arm/vpx_config.h
+++ b/media/libvpx/config/linux/arm/vpx_config.h
@@ -60,17 +60,17 @@
 #define CONFIG_VP8 1
 #define CONFIG_VP9 1
 #define CONFIG_ENCODERS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 1
 #define CONFIG_ONTHEFLY_BITPACKING 0
-#define CONFIG_ERROR_CONCEALMENT 1
+#define CONFIG_ERROR_CONCEALMENT 0
 #define CONFIG_SHARED 0
 #define CONFIG_STATIC 1
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
 #define CONFIG_WEBM_IO 1
 #define CONFIG_LIBYUV 1
--- a/media/libvpx/config/linux/ia32/vpx_config.asm
+++ b/media/libvpx/config/linux/ia32/vpx_config.asm
@@ -48,17 +48,17 @@
 %define CONFIG_VP8 1
 %define CONFIG_VP9 1
 %define CONFIG_ENCODERS 1
 %define CONFIG_DECODERS 1
 %define CONFIG_STATIC_MSVCRT 0
 %define CONFIG_SPATIAL_RESAMPLING 1
 %define CONFIG_REALTIME_ONLY 0
 %define CONFIG_ONTHEFLY_BITPACKING 0
-%define CONFIG_ERROR_CONCEALMENT 1
+%define CONFIG_ERROR_CONCEALMENT 0
 %define CONFIG_SHARED 0
 %define CONFIG_STATIC 1
 %define CONFIG_SMALL 0
 %define CONFIG_POSTPROC_VISUALIZER 0
 %define CONFIG_OS_SUPPORT 1
 %define CONFIG_UNIT_TESTS 0
 %define CONFIG_WEBM_IO 1
 %define CONFIG_LIBYUV 1
--- a/media/libvpx/config/linux/ia32/vpx_config.c
+++ b/media/libvpx/config/linux/ia32/vpx_config.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 /*  */
 /* Use of this source code is governed by a BSD-style license */
 /* that can be found in the LICENSE file in the root of the source */
 /* 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. */
 #include "vpx/vpx_codec.h"
-static const char* const cfg = "--target=x86-linux-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-error-concealment --enable-postproc --enable-vp9-postproc --as=yasm";
+static const char* const cfg = "--target=x86-linux-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-postproc --enable-vp9-postproc --as=yasm";
 const char *vpx_codec_build_config(void) {return cfg;}
--- a/media/libvpx/config/linux/ia32/vpx_config.h
+++ b/media/libvpx/config/linux/ia32/vpx_config.h
@@ -60,17 +60,17 @@
 #define CONFIG_VP8 1
 #define CONFIG_VP9 1
 #define CONFIG_ENCODERS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 0
 #define CONFIG_ONTHEFLY_BITPACKING 0
-#define CONFIG_ERROR_CONCEALMENT 1
+#define CONFIG_ERROR_CONCEALMENT 0
 #define CONFIG_SHARED 0
 #define CONFIG_STATIC 1
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
 #define CONFIG_WEBM_IO 1
 #define CONFIG_LIBYUV 1
--- a/media/libvpx/config/linux/x64/vpx_config.asm
+++ b/media/libvpx/config/linux/x64/vpx_config.asm
@@ -48,17 +48,17 @@
 %define CONFIG_VP8 1
 %define CONFIG_VP9 1
 %define CONFIG_ENCODERS 1
 %define CONFIG_DECODERS 1
 %define CONFIG_STATIC_MSVCRT 0
 %define CONFIG_SPATIAL_RESAMPLING 1
 %define CONFIG_REALTIME_ONLY 0
 %define CONFIG_ONTHEFLY_BITPACKING 0
-%define CONFIG_ERROR_CONCEALMENT 1
+%define CONFIG_ERROR_CONCEALMENT 0
 %define CONFIG_SHARED 0
 %define CONFIG_STATIC 1
 %define CONFIG_SMALL 0
 %define CONFIG_POSTPROC_VISUALIZER 0
 %define CONFIG_OS_SUPPORT 1
 %define CONFIG_UNIT_TESTS 0
 %define CONFIG_WEBM_IO 1
 %define CONFIG_LIBYUV 1
--- a/media/libvpx/config/linux/x64/vpx_config.c
+++ b/media/libvpx/config/linux/x64/vpx_config.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 /*  */
 /* Use of this source code is governed by a BSD-style license */
 /* that can be found in the LICENSE file in the root of the source */
 /* 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. */
 #include "vpx/vpx_codec.h"
-static const char* const cfg = "--target=x86_64-linux-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-error-concealment --enable-postproc --enable-vp9-postproc --as=yasm";
+static const char* const cfg = "--target=x86_64-linux-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-postproc --enable-vp9-postproc --as=yasm";
 const char *vpx_codec_build_config(void) {return cfg;}
--- a/media/libvpx/config/linux/x64/vpx_config.h
+++ b/media/libvpx/config/linux/x64/vpx_config.h
@@ -60,17 +60,17 @@
 #define CONFIG_VP8 1
 #define CONFIG_VP9 1
 #define CONFIG_ENCODERS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 0
 #define CONFIG_ONTHEFLY_BITPACKING 0
-#define CONFIG_ERROR_CONCEALMENT 1
+#define CONFIG_ERROR_CONCEALMENT 0
 #define CONFIG_SHARED 0
 #define CONFIG_STATIC 1
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
 #define CONFIG_WEBM_IO 1
 #define CONFIG_LIBYUV 1
--- a/media/libvpx/config/mac/ia32/vpx_config.asm
+++ b/media/libvpx/config/mac/ia32/vpx_config.asm
@@ -48,17 +48,17 @@
 %define CONFIG_VP8 1
 %define CONFIG_VP9 1
 %define CONFIG_ENCODERS 1
 %define CONFIG_DECODERS 1
 %define CONFIG_STATIC_MSVCRT 0
 %define CONFIG_SPATIAL_RESAMPLING 1
 %define CONFIG_REALTIME_ONLY 0
 %define CONFIG_ONTHEFLY_BITPACKING 0
-%define CONFIG_ERROR_CONCEALMENT 1
+%define CONFIG_ERROR_CONCEALMENT 0
 %define CONFIG_SHARED 0
 %define CONFIG_STATIC 1
 %define CONFIG_SMALL 0
 %define CONFIG_POSTPROC_VISUALIZER 0
 %define CONFIG_OS_SUPPORT 1
 %define CONFIG_UNIT_TESTS 0
 %define CONFIG_WEBM_IO 1
 %define CONFIG_LIBYUV 1
--- a/media/libvpx/config/mac/ia32/vpx_config.c
+++ b/media/libvpx/config/mac/ia32/vpx_config.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 /*  */
 /* Use of this source code is governed by a BSD-style license */
 /* that can be found in the LICENSE file in the root of the source */
 /* 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. */
 #include "vpx/vpx_codec.h"
-static const char* const cfg = "--target=x86-darwin9-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-error-concealment --enable-postproc --enable-vp9-postproc --as=yasm";
+static const char* const cfg = "--target=x86-darwin9-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-postproc --enable-vp9-postproc --as=yasm";
 const char *vpx_codec_build_config(void) {return cfg;}
--- a/media/libvpx/config/mac/ia32/vpx_config.h
+++ b/media/libvpx/config/mac/ia32/vpx_config.h
@@ -60,17 +60,17 @@
 #define CONFIG_VP8 1
 #define CONFIG_VP9 1
 #define CONFIG_ENCODERS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 0
 #define CONFIG_ONTHEFLY_BITPACKING 0
-#define CONFIG_ERROR_CONCEALMENT 1
+#define CONFIG_ERROR_CONCEALMENT 0
 #define CONFIG_SHARED 0
 #define CONFIG_STATIC 1
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
 #define CONFIG_WEBM_IO 1
 #define CONFIG_LIBYUV 1
--- a/media/libvpx/config/mac/x64/vpx_config.asm
+++ b/media/libvpx/config/mac/x64/vpx_config.asm
@@ -48,17 +48,17 @@
 %define CONFIG_VP8 1
 %define CONFIG_VP9 1
 %define CONFIG_ENCODERS 1
 %define CONFIG_DECODERS 1
 %define CONFIG_STATIC_MSVCRT 0
 %define CONFIG_SPATIAL_RESAMPLING 1
 %define CONFIG_REALTIME_ONLY 0
 %define CONFIG_ONTHEFLY_BITPACKING 0
-%define CONFIG_ERROR_CONCEALMENT 1
+%define CONFIG_ERROR_CONCEALMENT 0
 %define CONFIG_SHARED 0
 %define CONFIG_STATIC 1
 %define CONFIG_SMALL 0
 %define CONFIG_POSTPROC_VISUALIZER 0
 %define CONFIG_OS_SUPPORT 1
 %define CONFIG_UNIT_TESTS 0
 %define CONFIG_WEBM_IO 1
 %define CONFIG_LIBYUV 1
--- a/media/libvpx/config/mac/x64/vpx_config.c
+++ b/media/libvpx/config/mac/x64/vpx_config.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 /*  */
 /* Use of this source code is governed by a BSD-style license */
 /* that can be found in the LICENSE file in the root of the source */
 /* 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. */
 #include "vpx/vpx_codec.h"
-static const char* const cfg = "--target=x86_64-darwin9-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-error-concealment --enable-postproc --enable-vp9-postproc --as=yasm";
+static const char* const cfg = "--target=x86_64-darwin9-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-postproc --enable-vp9-postproc --as=yasm";
 const char *vpx_codec_build_config(void) {return cfg;}
--- a/media/libvpx/config/mac/x64/vpx_config.h
+++ b/media/libvpx/config/mac/x64/vpx_config.h
@@ -60,17 +60,17 @@
 #define CONFIG_VP8 1
 #define CONFIG_VP9 1
 #define CONFIG_ENCODERS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 0
 #define CONFIG_ONTHEFLY_BITPACKING 0
-#define CONFIG_ERROR_CONCEALMENT 1
+#define CONFIG_ERROR_CONCEALMENT 0
 #define CONFIG_SHARED 0
 #define CONFIG_STATIC 1
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
 #define CONFIG_WEBM_IO 1
 #define CONFIG_LIBYUV 1
--- a/media/libvpx/config/win/ia32/vpx_config.asm
+++ b/media/libvpx/config/win/ia32/vpx_config.asm
@@ -48,17 +48,17 @@
 %define CONFIG_VP8 1
 %define CONFIG_VP9 1
 %define CONFIG_ENCODERS 1
 %define CONFIG_DECODERS 1
 %define CONFIG_STATIC_MSVCRT 0
 %define CONFIG_SPATIAL_RESAMPLING 1
 %define CONFIG_REALTIME_ONLY 0
 %define CONFIG_ONTHEFLY_BITPACKING 0
-%define CONFIG_ERROR_CONCEALMENT 1
+%define CONFIG_ERROR_CONCEALMENT 0
 %define CONFIG_SHARED 0
 %define CONFIG_STATIC 1
 %define CONFIG_SMALL 0
 %define CONFIG_POSTPROC_VISUALIZER 0
 %define CONFIG_OS_SUPPORT 1
 %define CONFIG_UNIT_TESTS 0
 %define CONFIG_WEBM_IO 1
 %define CONFIG_LIBYUV 1
--- a/media/libvpx/config/win/ia32/vpx_config.c
+++ b/media/libvpx/config/win/ia32/vpx_config.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 /*  */
 /* Use of this source code is governed by a BSD-style license */
 /* that can be found in the LICENSE file in the root of the source */
 /* 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. */
 #include "vpx/vpx_codec.h"
-static const char* const cfg = "--target=x86-win32-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-error-concealment --enable-postproc --enable-vp9-postproc --as=yasm";
+static const char* const cfg = "--target=x86-win32-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-postproc --enable-vp9-postproc --as=yasm";
 const char *vpx_codec_build_config(void) {return cfg;}
--- a/media/libvpx/config/win/ia32/vpx_config.h
+++ b/media/libvpx/config/win/ia32/vpx_config.h
@@ -60,17 +60,17 @@
 #define CONFIG_VP8 1
 #define CONFIG_VP9 1
 #define CONFIG_ENCODERS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 0
 #define CONFIG_ONTHEFLY_BITPACKING 0
-#define CONFIG_ERROR_CONCEALMENT 1
+#define CONFIG_ERROR_CONCEALMENT 0
 #define CONFIG_SHARED 0
 #define CONFIG_STATIC 1
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
 #define CONFIG_WEBM_IO 1
 #define CONFIG_LIBYUV 1
--- a/media/libvpx/config/win/x64/vpx_config.asm
+++ b/media/libvpx/config/win/x64/vpx_config.asm
@@ -48,17 +48,17 @@
 %define CONFIG_VP8 1
 %define CONFIG_VP9 1
 %define CONFIG_ENCODERS 1
 %define CONFIG_DECODERS 1
 %define CONFIG_STATIC_MSVCRT 0
 %define CONFIG_SPATIAL_RESAMPLING 1
 %define CONFIG_REALTIME_ONLY 0
 %define CONFIG_ONTHEFLY_BITPACKING 0
-%define CONFIG_ERROR_CONCEALMENT 1
+%define CONFIG_ERROR_CONCEALMENT 0
 %define CONFIG_SHARED 0
 %define CONFIG_STATIC 1
 %define CONFIG_SMALL 0
 %define CONFIG_POSTPROC_VISUALIZER 0
 %define CONFIG_OS_SUPPORT 1
 %define CONFIG_UNIT_TESTS 0
 %define CONFIG_WEBM_IO 1
 %define CONFIG_LIBYUV 1
--- a/media/libvpx/config/win/x64/vpx_config.c
+++ b/media/libvpx/config/win/x64/vpx_config.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 /*  */
 /* Use of this source code is governed by a BSD-style license */
 /* that can be found in the LICENSE file in the root of the source */
 /* 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. */
 #include "vpx/vpx_codec.h"
-static const char* const cfg = "--target=x86_64-win64-vs12 --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-error-concealment --enable-postproc --enable-vp9-postproc --as=yasm";
+static const char* const cfg = "--target=x86_64-win64-vs12 --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --enable-postproc --enable-vp9-postproc --as=yasm";
 const char *vpx_codec_build_config(void) {return cfg;}
--- a/media/libvpx/config/win/x64/vpx_config.h
+++ b/media/libvpx/config/win/x64/vpx_config.h
@@ -60,17 +60,17 @@
 #define CONFIG_VP8 1
 #define CONFIG_VP9 1
 #define CONFIG_ENCODERS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 0
 #define CONFIG_ONTHEFLY_BITPACKING 0
-#define CONFIG_ERROR_CONCEALMENT 1
+#define CONFIG_ERROR_CONCEALMENT 0
 #define CONFIG_SHARED 0
 #define CONFIG_STATIC 1
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
 #define CONFIG_WEBM_IO 1
 #define CONFIG_LIBYUV 1
--- a/media/libvpx/generate_sources_mozbuild.sh
+++ b/media/libvpx/generate_sources_mozbuild.sh
@@ -188,17 +188,16 @@ echo "Create temporary directory."
 TEMP_DIR="$LIBVPX_SRC_DIR.temp"
 rm -rf $TEMP_DIR
 cp -R $LIBVPX_SRC_DIR $TEMP_DIR
 cd $TEMP_DIR
 
 echo "Generate config files."
 all_platforms="--enable-external-build --disable-examples --disable-install-docs --disable-unit-tests"
 all_platforms="${all_platforms} --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic"
-all_platforms="${all_platforms} --enable-error-concealment"
 x86_platforms="--enable-postproc --enable-vp9-postproc --as=yasm"
 arm_platforms="--enable-runtime-cpu-detect --enable-realtime-only"
 gen_config_files linux/x64 "--target=x86_64-linux-gcc ${all_platforms} ${x86_platforms}"
 gen_config_files linux/ia32 "--target=x86-linux-gcc ${all_platforms} ${x86_platforms}"
 gen_config_files mac/x64 "--target=x86_64-darwin9-gcc ${all_platforms} ${x86_platforms}"
 gen_config_files mac/ia32 "--target=x86-darwin9-gcc ${all_platforms} ${x86_platforms}"
 gen_config_files win/x64 "--target=x86_64-win64-vs12 ${all_platforms} ${x86_platforms}"
 gen_config_files win/ia32 "--target=x86-win32-gcc ${all_platforms} ${x86_platforms}"
--- a/media/libvpx/sources.mozbuild
+++ b/media/libvpx/sources.mozbuild
@@ -67,17 +67,16 @@ files = {
     'libvpx/vp8/common/x86/subpixel_mmx.asm',
     'libvpx/vp8/common/x86/subpixel_sse2.asm',
     'libvpx/vp8/common/x86/subpixel_ssse3.asm',
     'libvpx/vp8/common/x86/vp8_asm_stubs.c',
     'libvpx/vp8/decoder/dboolhuff.c',
     'libvpx/vp8/decoder/decodeframe.c',
     'libvpx/vp8/decoder/decodemv.c',
     'libvpx/vp8/decoder/detokenize.c',
-    'libvpx/vp8/decoder/error_concealment.c',
     'libvpx/vp8/decoder/onyxd_if.c',
     'libvpx/vp8/decoder/threading.c',
     'libvpx/vp8/encoder/bitstream.c',
     'libvpx/vp8/encoder/boolhuff.c',
     'libvpx/vp8/encoder/dct.c',
     'libvpx/vp8/encoder/denoising.c',
     'libvpx/vp8/encoder/encodeframe.c',
     'libvpx/vp8/encoder/encodeintra.c',
@@ -328,17 +327,16 @@ files = {
     'libvpx/vp8/common/x86/subpixel_mmx.asm',
     'libvpx/vp8/common/x86/subpixel_sse2.asm',
     'libvpx/vp8/common/x86/subpixel_ssse3.asm',
     'libvpx/vp8/common/x86/vp8_asm_stubs.c',
     'libvpx/vp8/decoder/dboolhuff.c',
     'libvpx/vp8/decoder/decodeframe.c',
     'libvpx/vp8/decoder/decodemv.c',
     'libvpx/vp8/decoder/detokenize.c',
-    'libvpx/vp8/decoder/error_concealment.c',
     'libvpx/vp8/decoder/onyxd_if.c',
     'libvpx/vp8/decoder/threading.c',
     'libvpx/vp8/encoder/bitstream.c',
     'libvpx/vp8/encoder/boolhuff.c',
     'libvpx/vp8/encoder/dct.c',
     'libvpx/vp8/encoder/denoising.c',
     'libvpx/vp8/encoder/encodeframe.c',
     'libvpx/vp8/encoder/encodeintra.c',
@@ -578,17 +576,16 @@ files = {
     'libvpx/vp8/common/setupintrarecon.c',
     'libvpx/vp8/common/swapyv12buffer.c',
     'libvpx/vp8/common/treecoder.c',
     'libvpx/vp8/common/vp8_loopfilter.c',
     'libvpx/vp8/decoder/dboolhuff.c',
     'libvpx/vp8/decoder/decodeframe.c',
     'libvpx/vp8/decoder/decodemv.c',
     'libvpx/vp8/decoder/detokenize.c',
-    'libvpx/vp8/decoder/error_concealment.c',
     'libvpx/vp8/decoder/onyxd_if.c',
     'libvpx/vp8/decoder/threading.c',
     'libvpx/vp8/encoder/arm/neon/denoising_neon.c',
     'libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.c',
     'libvpx/vp8/encoder/arm/neon/shortfdct_neon.c',
     'libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c',
     'libvpx/vp8/encoder/bitstream.c',
     'libvpx/vp8/encoder/boolhuff.c',
@@ -789,17 +786,16 @@ files = {
     'libvpx/vp8/common/setupintrarecon.c',
     'libvpx/vp8/common/swapyv12buffer.c',
     'libvpx/vp8/common/treecoder.c',
     'libvpx/vp8/common/vp8_loopfilter.c',
     'libvpx/vp8/decoder/dboolhuff.c',
     'libvpx/vp8/decoder/decodeframe.c',
     'libvpx/vp8/decoder/decodemv.c',
     'libvpx/vp8/decoder/detokenize.c',
-    'libvpx/vp8/decoder/error_concealment.c',
     'libvpx/vp8/decoder/onyxd_if.c',
     'libvpx/vp8/decoder/threading.c',
     'libvpx/vp8/encoder/bitstream.c',
     'libvpx/vp8/encoder/boolhuff.c',
     'libvpx/vp8/encoder/dct.c',
     'libvpx/vp8/encoder/denoising.c',
     'libvpx/vp8/encoder/encodeframe.c',
     'libvpx/vp8/encoder/encodeintra.c',
--- a/old-configure.in
+++ b/old-configure.in
@@ -2213,17 +2213,16 @@ MOZ_WEBRTC=1
 MOZ_PEERCONNECTION=
 MOZ_SRTP=
 MOZ_WEBRTC_SIGNALING=
 MOZ_WEBRTC_ASSERT_ALWAYS=1
 MOZ_WEBRTC_HARDWARE_AEC_NS=
 MOZ_SCTP=
 MOZ_ANDROID_OMX=
 MOZ_OMX_PLUGIN=
-MOZ_VPX_ERROR_CONCEALMENT=
 VPX_USE_YASM=
 VPX_ASFLAGS=
 VPX_AS_CONVERSION=
 VPX_X86_ASM=
 VPX_ARM_ASM=
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
 MOZ_PREF_EXTENSIONS=1
@@ -2813,17 +2812,16 @@ MOZ_ARG_DISABLE_BOOL(webrtc,
     MOZ_WEBRTC=1)
 
 if test -n "$MOZ_WEBRTC"; then
     AC_DEFINE(MOZ_WEBRTC)
     dnl MOZ_WEBRTC_ASSERT_ALWAYS turns on a number of safety asserts in
     dnl opt/production builds (via MOZ_CRASH())
     AC_DEFINE(MOZ_WEBRTC_ASSERT_ALWAYS)
     MOZ_RAW=1
-    MOZ_VPX_ERROR_CONCEALMENT=1
 
 dnl enable once Signaling lands
     MOZ_WEBRTC_SIGNALING=1
     AC_DEFINE(MOZ_WEBRTC_SIGNALING)
 dnl enable once PeerConnection lands
     MOZ_PEERCONNECTION=1
     AC_DEFINE(MOZ_PEERCONNECTION)
     MOZ_SCTP=1
@@ -2974,20 +2972,16 @@ dnl system libvpx Support
 dnl ========================================================
 MOZ_ARG_WITH_BOOL(system-libvpx,
 [  --with-system-libvpx    Use system libvpx (located with pkgconfig)],
     MOZ_SYSTEM_LIBVPX=1)
 
 MOZ_LIBVPX_CFLAGS=
 MOZ_LIBVPX_LIBS=
 
-if test -n "$MOZ_VPX_ERROR_CONCEALMENT" ; then
-    AC_DEFINE(MOZ_VPX_ERROR_CONCEALMENT)
-fi
-
 _SAVE_CFLAGS=$CFLAGS
 _SAVE_LIBS=$LIBS
 if test -n "$MOZ_SYSTEM_LIBVPX"; then
     dnl ============================
     dnl === libvpx Version check ===
     dnl ============================
     dnl Check to see if we have a system libvpx package.
     PKG_CHECK_MODULES(MOZ_LIBVPX, vpx >= 1.5.0)
@@ -5483,17 +5477,16 @@ AC_SUBST(WIN32_GUI_EXE_LDFLAGS)
 
 AC_SUBST(MOZ_VORBIS)
 AC_SUBST(MOZ_TREMOR)
 AC_SUBST(MOZ_FFVPX)
 AC_SUBST_LIST(FFVPX_ASFLAGS)
 AC_SUBST(MOZ_DIRECTSHOW)
 AC_SUBST(MOZ_ANDROID_OMX)
 AC_SUBST(MOZ_OMX_PLUGIN)
-AC_SUBST(MOZ_VPX_ERROR_CONCEALMENT)
 AC_SUBST(VPX_USE_YASM)
 AC_SUBST_LIST(VPX_ASFLAGS)
 AC_SUBST(VPX_AS_CONVERSION)
 AC_SUBST(VPX_X86_ASM)
 AC_SUBST(VPX_ARM_ASM)
 AC_SUBST(MOZ_CODE_COVERAGE)
 AC_SUBST(LIBJPEG_TURBO_USE_YASM)
 AC_SUBST_LIST(LIBJPEG_TURBO_ASFLAGS)