diff --git a/vp8/common/predictdc.c b/vp8/common/predictdc.c deleted file mode 100644 index f315f50e03354264bf510e2fe0fb2d4829667566..0000000000000000000000000000000000000000 --- a/vp8/common/predictdc.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2010 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 <stdlib.h> -#include "blockd.h" - - -void vp8_predict_dc(short *lastdc, short *thisdc, short quant, short *cons) -{ - int diff; - int sign; - int last_dc = *lastdc; - int this_dc = *thisdc; - - if (*cons > DCPREDCNTTHRESH) - { - this_dc += last_dc; - } - - diff = abs(last_dc - this_dc); - sign = (last_dc >> 31) ^(this_dc >> 31); - sign |= (!last_dc | !this_dc); - - if (sign) - { - *cons = 0; - } - else - { - if (diff <= DCPREDSIMTHRESH * quant) - (*cons)++ ; - } - - *thisdc = this_dc; - *lastdc = this_dc; -} diff --git a/vp8/common/predictdc.h b/vp8/common/predictdc.h deleted file mode 100644 index fa85968220a7dd30173ca004d0d4d3e55b8eaddc..0000000000000000000000000000000000000000 --- a/vp8/common/predictdc.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2010 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. - */ - - -#ifndef __PREDICTDC_H -#define __PREDICTDC_H - -void uvvp8_predict_dc(short *lastdc, short *thisdc, short quant, short *cons); -void vp8_predict_dc(short *lastdc, short *thisdc, short quant, short *cons); - -#endif diff --git a/vp8/decoder/arm/dequantize_arm.c b/vp8/decoder/arm/dequantize_arm.c index b26af975f67d8189578003fa9fd787308b7e3eaf..d88adb729e37ebbfd69c77fbda47b56b7489d907 100644 --- a/vp8/decoder/arm/dequantize_arm.c +++ b/vp8/decoder/arm/dequantize_arm.c @@ -11,7 +11,6 @@ #include "vpx_ports/config.h" #include "vp8/decoder/dequantize.h" -#include "vp8/common/predictdc.h" #include "vp8/common/idct.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 5769100ec5931bd71d2cbfab7343b9f77b932593..c454bbc7064c901a05881d33d83e6d2a060cdd58 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -30,7 +30,6 @@ #include "vpx_mem/vpx_mem.h" #include "vp8/common/idct.h" #include "dequantize.h" -#include "vp8/common/predictdc.h" #include "vp8/common/threading.h" #include "decoderthreading.h" #include "dboolhuff.h" diff --git a/vp8/decoder/dequantize.c b/vp8/decoder/dequantize.c index 4e1a5e17a286d366b2722dc9fba2eb58e002211b..dd0c13b7dc1b6f9bb3b0c5d800f14eb8de1b82c2 100644 --- a/vp8/decoder/dequantize.c +++ b/vp8/decoder/dequantize.c @@ -11,7 +11,6 @@ #include "vpx_ports/config.h" #include "dequantize.h" -#include "vp8/common/predictdc.h" #include "vp8/common/idct.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp8/encoder/arm/quantize_arm.c b/vp8/encoder/arm/quantize_arm.c index 75ec205ccf16ba74486c13f6ec10bc35095fec68..0e3334ac7e21499b35c5a2283b8fa1c146525fb6 100644 --- a/vp8/encoder/arm/quantize_arm.c +++ b/vp8/encoder/arm/quantize_arm.c @@ -14,7 +14,6 @@ #include "vp8/encoder/quantize.h" #include "vp8/common/entropy.h" -#include "vp8/common/predictdc.h" DECLARE_ALIGNED(16, const short, vp8_rvsplus1_default_zig_zag1d[16]) = { diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index 02b9d7bd97f404b222ea3901db6d173f1008a787..803e3a51dd156a3360b0f2bb798beff76071beae 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -14,7 +14,6 @@ #include "quantize.h" #include "vp8/common/entropy.h" -#include "vp8/common/predictdc.h" #define EXACT_QUANT diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index 822af83a4235ef8fbb091d169c522a4f5ce28ed0..56e266087b2fc25e52086c54a45337102de9b8af 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -45,7 +45,6 @@ VP8_COMMON_SRCS-yes += common/loopfilter.h VP8_COMMON_SRCS-yes += common/modecont.h VP8_COMMON_SRCS-yes += common/mv.h VP8_COMMON_SRCS-yes += common/onyxc_int.h -VP8_COMMON_SRCS-yes += common/predictdc.h VP8_COMMON_SRCS-yes += common/quant_common.h VP8_COMMON_SRCS-yes += common/recon.h VP8_COMMON_SRCS-yes += common/reconinter.h @@ -63,7 +62,6 @@ VP8_COMMON_SRCS-yes += common/loopfilter_filters.c VP8_COMMON_SRCS-yes += common/mbpitch.c VP8_COMMON_SRCS-yes += common/modecont.c VP8_COMMON_SRCS-yes += common/modecontext.c -VP8_COMMON_SRCS-yes += common/predictdc.c VP8_COMMON_SRCS-yes += common/quant_common.c VP8_COMMON_SRCS-yes += common/recon.c VP8_COMMON_SRCS-yes += common/reconinter.c