Merge "Remove un-necessary memory initialization"
diff --git a/build/make/configure.sh b/build/make/configure.sh
index 26c6af0..1f4f24d 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1,13 +1,13 @@
#!/bin/bash
##
-## Copyright (c) 2010 The VP8 project authors. All Rights Reserved.
+## configure.sh
##
-## Use of this source code is governed by a BSD-style license and patent
-## grant that can be found in the LICENSE file in the root of the source
-## tree. All contributing project authors may be found in the AUTHORS
-## file in the root of the source tree.
+## This script is sourced by the main configure script and contains
+## utility functions and other common bits that aren't strictly libvpx
+## related.
##
-
+## This build system is based in part on the FFmpeg configure script.
+##
#
diff --git a/configure b/configure
index b7fac9a..d7d041c 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,15 @@
#!/bin/bash
##
-## Copyright (c) 2010 The VP8 project authors. All Rights Reserved.
+## configure
##
-## Use of this source code is governed by a BSD-style license and patent
-## grant that can be found in the LICENSE file in the root of the source
-## tree. All contributing project authors may be found in the AUTHORS
-## file in the root of the source tree.
+## This script is the front-end to the build system. It provides a similar
+## interface to standard configure scripts with some extra bits for dealing
+## with toolchains that differ from the standard POSIX interface and
+## for extracting subsets of the source tree. In theory, reusable parts
+## of this script were intended to live in build/make/configure.sh,
+## but in practice, the line is pretty blurry.
+##
+## This build system is based in part on the FFmpeg configure script.
##
#source_path="`dirname \"$0\"`"
diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c
index f019925..0979185 100644
--- a/vp8/common/postproc.c
+++ b/vp8/common/postproc.c
@@ -274,7 +274,7 @@
}
-extern void vp8_deblock(YV12_BUFFER_CONFIG *source,
+void vp8_deblock(YV12_BUFFER_CONFIG *source,
YV12_BUFFER_CONFIG *post,
int q,
int low_var_thresh,
diff --git a/vp8/common/postproc.h b/vp8/common/postproc.h
index c45fe92..cd99056 100644
--- a/vp8/common/postproc.h
+++ b/vp8/common/postproc.h
@@ -87,4 +87,11 @@
int low_var_thresh,
int flag,
vp8_postproc_rtcd_vtable_t *rtcd);
+
+void vp8_deblock(YV12_BUFFER_CONFIG *source,
+ YV12_BUFFER_CONFIG *post,
+ int q,
+ int low_var_thresh,
+ int flag,
+ vp8_postproc_rtcd_vtable_t *rtcd);
#endif
diff --git a/vp8/decoder/detokenize.c b/vp8/decoder/detokenize.c
index a42f18d..c081518 100644
--- a/vp8/decoder/detokenize.c
+++ b/vp8/decoder/detokenize.c
@@ -67,23 +67,42 @@
ENTROPY_CONTEXT *l;
int i;
- for (i = 0; i < 24; i++)
- {
+ /* Clear entropy contexts for Y blocks */
+ a = A[Y1CONTEXT];
+ l = L[Y1CONTEXT];
+ *a = 0;
+ *(a+1) = 0;
+ *(a+2) = 0;
+ *(a+3) = 0;
+ *l = 0;
+ *(l+1) = 0;
+ *(l+2) = 0;
+ *(l+3) = 0;
- a = A[ vp8_block2context[i] ] + vp8_block2above[i];
- l = L[ vp8_block2context[i] ] + vp8_block2left[i];
+ /* Clear entropy contexts for U blocks */
+ a = A[UCONTEXT];
+ l = L[UCONTEXT];
+ *a = 0;
+ *(a+1) = 0;
+ *l = 0;
+ *(l+1) = 0;
- *a = *l = 0;
- }
+ /* Clear entropy contexts for V blocks */
+ a = A[VCONTEXT];
+ l = L[VCONTEXT];
+ *a = 0;
+ *(a+1) = 0;
+ *l = 0;
+ *(l+1) = 0;
+ /* Clear entropy contexts for Y2 blocks */
if (x->mbmi.mode != B_PRED && x->mbmi.mode != SPLITMV)
{
- a = A[Y2CONTEXT] + vp8_block2above[24];
- l = L[Y2CONTEXT] + vp8_block2left[24];
- *a = *l = 0;
+ a = A[Y2CONTEXT];
+ l = L[Y2CONTEXT];
+ *a = 0;
+ *l = 0;
}
-
-
}
DECLARE_ALIGNED(16, extern const unsigned int, vp8dx_bitreader_norm[256]);
#define NORMALIZE \
