shithub: libvpx

--- a/vp8/common/predictdc.c

+++ /dev/null

@@ -1,44 +1,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;

-}

--- a/vp8/common/predictdc.h

+++ /dev/null

@@ -1,18 +1,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

--- 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"

--- 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"

--- 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"

--- 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]) =

--- 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

--- a/vp8/vp8_common.mk

+++ b/vp8/vp8_common.mk

@@ -45,7 +45,6 @@

 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/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

--

⑨