summaryrefslogtreecommitdiff
path: root/vp10
diff options
context:
space:
mode:
Diffstat (limited to 'vp10')
-rw-r--r--vp10/common/alloccommon.c1
-rw-r--r--vp10/common/common.h2
-rw-r--r--vp10/common/idct.c1
-rw-r--r--vp10/common/postproc.c2
-rw-r--r--vp10/common/systemdependent.h84
-rw-r--r--vp10/decoder/decoder.c2
-rw-r--r--vp10/encoder/aq_complexity.c1
-rw-r--r--vp10/encoder/aq_cyclicrefresh.c5
-rw-r--r--vp10/encoder/aq_variance.c3
-rw-r--r--vp10/encoder/bitstream.c2
-rw-r--r--vp10/encoder/blockiness.c1
-rw-r--r--vp10/encoder/dct.c1
-rw-r--r--vp10/encoder/encodeframe.c2
-rw-r--r--vp10/encoder/encodemb.c1
-rw-r--r--vp10/encoder/encodemv.c1
-rw-r--r--vp10/encoder/encoder.c2
-rw-r--r--vp10/encoder/firstpass.c2
-rw-r--r--vp10/encoder/mbgraph.c2
-rw-r--r--vp10/encoder/ratectrl.c2
-rw-r--r--vp10/encoder/rd.c3
-rw-r--r--vp10/encoder/rdopt.c2
-rw-r--r--vp10/encoder/temporal_filter.c1
-rw-r--r--vp10/vp10_common.mk1
23 files changed, 17 insertions, 107 deletions
diff --git a/vp10/common/alloccommon.c b/vp10/common/alloccommon.c
index e554f100c..409af985e 100644
--- a/vp10/common/alloccommon.c
+++ b/vp10/common/alloccommon.c
@@ -16,7 +16,6 @@
#include "vp10/common/entropymode.h"
#include "vp10/common/entropymv.h"
#include "vp10/common/onyxc_int.h"
-#include "vp10/common/systemdependent.h"
void vp10_set_mb_mi(VP9_COMMON *cm, int width, int height) {
const int aligned_width = ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2);
diff --git a/vp10/common/common.h b/vp10/common/common.h
index cccf7c229..6cd1c9cf6 100644
--- a/vp10/common/common.h
+++ b/vp10/common/common.h
@@ -19,7 +19,7 @@
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx/vpx_integer.h"
-#include "vp10/common/systemdependent.h"
+#include "vpx_ports/bitops.h"
#ifdef __cplusplus
extern "C" {
diff --git a/vp10/common/idct.c b/vp10/common/idct.c
index 4eff7d108..ae99b3518 100644
--- a/vp10/common/idct.c
+++ b/vp10/common/idct.c
@@ -14,7 +14,6 @@
#include "./vpx_dsp_rtcd.h"
#include "vp10/common/blockd.h"
#include "vp10/common/idct.h"
-#include "vp10/common/systemdependent.h"
#include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h"
diff --git a/vp10/common/postproc.c b/vp10/common/postproc.c
index 25e1da88c..3bc1b5717 100644
--- a/vp10/common/postproc.c
+++ b/vp10/common/postproc.c
@@ -17,12 +17,12 @@
#include "./vp10_rtcd.h"
#include "vpx_ports/mem.h"
+#include "vpx_ports/system_state.h"
#include "vpx_scale/vpx_scale.h"
#include "vpx_scale/yv12config.h"
#include "vp10/common/onyxc_int.h"
#include "vp10/common/postproc.h"
-#include "vp10/common/systemdependent.h"
#include "vp10/common/textblit.h"
#if CONFIG_VP9_POSTPROC
diff --git a/vp10/common/systemdependent.h b/vp10/common/systemdependent.h
deleted file mode 100644
index 5940d7336..000000000
--- a/vp10/common/systemdependent.h
+++ /dev/null
@@ -1,84 +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 VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
-#define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
-
-#include "vpx_ports/msvc.h"
-
-#ifdef _MSC_VER
-# include <math.h> // the ceil() definition must precede intrin.h
-# if _MSC_VER > 1310 && (defined(_M_X64) || defined(_M_IX86))
-# include <intrin.h>
-# define USE_MSC_INTRINSICS
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "./vpx_config.h"
-#if ARCH_X86 || ARCH_X86_64
-void vpx_reset_mmx_state(void);
-#define vpx_clear_system_state() vpx_reset_mmx_state()
-#else
-#define vpx_clear_system_state()
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1800
-// round is not defined in MSVC before VS2013.
-static INLINE int round(double x) {
- if (x < 0)
- return (int)ceil(x - 0.5);
- else
- return (int)floor(x + 0.5);
-}
-#endif
-
-// use GNU builtins where available.
-#if defined(__GNUC__) && \
- ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
-static INLINE int get_msb(unsigned int n) {
- return 31 ^ __builtin_clz(n);
-}
-#elif defined(USE_MSC_INTRINSICS)
-#pragma intrinsic(_BitScanReverse)
-
-static INLINE int get_msb(unsigned int n) {
- unsigned long first_set_bit;
- _BitScanReverse(&first_set_bit, n);
- return first_set_bit;
-}
-#undef USE_MSC_INTRINSICS
-#else
-// Returns (int)floor(log2(n)). n must be > 0.
-static INLINE int get_msb(unsigned int n) {
- int log = 0;
- unsigned int value = n;
- int i;
-
- for (i = 4; i >= 0; --i) {
- const int shift = (1 << i);
- const unsigned int x = value >> shift;
- if (x != 0) {
- value = x;
- log += shift;
- }
- }
- return log;
-}
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif // VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
diff --git a/vp10/decoder/decoder.c b/vp10/decoder/decoder.c
index dda5d6cd3..2bbc22e3a 100644
--- a/vp10/decoder/decoder.c
+++ b/vp10/decoder/decoder.c
@@ -17,6 +17,7 @@
#include "./vpx_scale_rtcd.h"
#include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/system_state.h"
#include "vpx_ports/vpx_once.h"
#include "vpx_ports/vpx_timer.h"
#include "vpx_scale/vpx_scale.h"
@@ -30,7 +31,6 @@
#endif
#include "vp10/common/quant_common.h"
#include "vp10/common/reconintra.h"
-#include "vp10/common/systemdependent.h"
#include "vp10/decoder/decodeframe.h"
#include "vp10/decoder/decoder.h"
diff --git a/vp10/encoder/aq_complexity.c b/vp10/encoder/aq_complexity.c
index 35ead9577..3887616fd 100644
--- a/vp10/encoder/aq_complexity.c
+++ b/vp10/encoder/aq_complexity.c
@@ -16,6 +16,7 @@
#include "vp10/encoder/encodeframe.h"
#include "vp10/common/seg_common.h"
#include "vp10/encoder/segmentation.h"
+#include "vpx_ports/system_state.h"
#define AQ_C_SEGMENTS 5
#define DEFAULT_AQ2_SEG 3 // Neutral Q segment
diff --git a/vp10/encoder/aq_cyclicrefresh.c b/vp10/encoder/aq_cyclicrefresh.c
index dcf2ca33c..b0a989459 100644
--- a/vp10/encoder/aq_cyclicrefresh.c
+++ b/vp10/encoder/aq_cyclicrefresh.c
@@ -11,12 +11,11 @@
#include <limits.h>
#include <math.h>
-#include "vp10/encoder/aq_cyclicrefresh.h"
-
#include "vp10/common/seg_common.h"
-
+#include "vp10/encoder/aq_cyclicrefresh.h"
#include "vp10/encoder/ratectrl.h"
#include "vp10/encoder/segmentation.h"
+#include "vpx_ports/system_state.h"
struct CYCLIC_REFRESH {
// Percentage of blocks per frame that are targeted as candidates
diff --git a/vp10/encoder/aq_variance.c b/vp10/encoder/aq_variance.c
index b88a3fb5f..239afbbb8 100644
--- a/vp10/encoder/aq_variance.c
+++ b/vp10/encoder/aq_variance.c
@@ -15,11 +15,10 @@
#include "vp10/encoder/aq_variance.h"
#include "vp10/common/seg_common.h"
-
#include "vp10/encoder/ratectrl.h"
#include "vp10/encoder/rd.h"
#include "vp10/encoder/segmentation.h"
-#include "vp10/common/systemdependent.h"
+#include "vpx_ports/system_state.h"
#define ENERGY_MIN (-4)
#define ENERGY_MAX (1)
diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index 43fa23513..63779f4ec 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -16,6 +16,7 @@
#include "vpx_dsp/bitwriter_buffer.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem_ops.h"
+#include "vpx_ports/system_state.h"
#include "vp10/common/entropy.h"
#include "vp10/common/entropymode.h"
@@ -23,7 +24,6 @@
#include "vp10/common/mvref_common.h"
#include "vp10/common/pred_common.h"
#include "vp10/common/seg_common.h"
-#include "vp10/common/systemdependent.h"
#include "vp10/common/tile_common.h"
#include "vp10/encoder/cost.h"
diff --git a/vp10/encoder/blockiness.c b/vp10/encoder/blockiness.c
index 5c09b0b0f..ede13e0e5 100644
--- a/vp10/encoder/blockiness.c
+++ b/vp10/encoder/blockiness.c
@@ -17,6 +17,7 @@
#include "vpx_dsp/vpx_convolve.h"
#include "vpx_dsp/vpx_filter.h"
#include "vpx_ports/mem.h"
+#include "vpx_ports/system_state.h"
static int horizontal_filter(const uint8_t *s) {
return (s[1] - s[-2]) * 2 + (s[-1] - s[0]) * 6;
diff --git a/vp10/encoder/dct.c b/vp10/encoder/dct.c
index 0581b1455..288d5d092 100644
--- a/vp10/encoder/dct.c
+++ b/vp10/encoder/dct.c
@@ -17,7 +17,6 @@
#include "vp10/common/blockd.h"
#include "vp10/common/idct.h"
-#include "vp10/common/systemdependent.h"
#include "vpx_dsp/fwd_txfm.h"
#include "vpx_ports/mem.h"
diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c
index bf496ff2f..56e9c0f4e 100644
--- a/vp10/encoder/encodeframe.c
+++ b/vp10/encoder/encodeframe.c
@@ -18,6 +18,7 @@
#include "vpx_ports/mem.h"
#include "vpx_ports/vpx_timer.h"
+#include "vpx_ports/system_state.h"
#include "vp10/common/common.h"
#include "vp10/common/entropy.h"
@@ -29,7 +30,6 @@
#include "vp10/common/reconintra.h"
#include "vp10/common/reconinter.h"
#include "vp10/common/seg_common.h"
-#include "vp10/common/systemdependent.h"
#include "vp10/common/tile_common.h"
#include "vp10/encoder/aq_complexity.h"
diff --git a/vp10/encoder/encodemb.c b/vp10/encoder/encodemb.c
index 105fac1a8..55a96097f 100644
--- a/vp10/encoder/encodemb.c
+++ b/vp10/encoder/encodemb.c
@@ -21,7 +21,6 @@
#include "vp10/common/reconinter.h"
#include "vp10/common/reconintra.h"
#include "vp10/common/scan.h"
-#include "vp10/common/systemdependent.h"
#include "vp10/encoder/encodemb.h"
#include "vp10/encoder/rd.h"
diff --git a/vp10/encoder/encodemv.c b/vp10/encoder/encodemv.c
index 90a9857bc..fca883caf 100644
--- a/vp10/encoder/encodemv.c
+++ b/vp10/encoder/encodemv.c
@@ -12,7 +12,6 @@
#include "vp10/common/common.h"
#include "vp10/common/entropymode.h"
-#include "vp10/common/systemdependent.h"
#include "vp10/encoder/cost.h"
#include "vp10/encoder/encodemv.h"
diff --git a/vp10/encoder/encoder.c b/vp10/encoder/encoder.c
index 46ece39cd..1d69cd041 100644
--- a/vp10/encoder/encoder.c
+++ b/vp10/encoder/encoder.c
@@ -22,7 +22,6 @@
#endif
#include "vp10/common/reconinter.h"
#include "vp10/common/reconintra.h"
-#include "vp10/common/systemdependent.h"
#include "vp10/common/tile_common.h"
#include "vp10/encoder/aq_complexity.h"
@@ -55,6 +54,7 @@
#endif
#include "vpx_dsp/vpx_filter.h"
#include "vpx_ports/mem.h"
+#include "vpx_ports/system_state.h"
#include "vpx_ports/vpx_timer.h"
#include "vpx_scale/vpx_scale.h"
diff --git a/vp10/encoder/firstpass.c b/vp10/encoder/firstpass.c
index 6f95eea04..20333766a 100644
--- a/vp10/encoder/firstpass.c
+++ b/vp10/encoder/firstpass.c
@@ -17,13 +17,13 @@
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
+#include "vpx_ports/system_state.h"
#include "vpx_scale/vpx_scale.h"
#include "vpx_scale/yv12config.h"
#include "vp10/common/entropymv.h"
#include "vp10/common/quant_common.h"
#include "vp10/common/reconinter.h" // vp10_setup_dst_planes()
-#include "vp10/common/systemdependent.h"
#include "vp10/encoder/aq_variance.h"
#include "vp10/encoder/block.h"
#include "vp10/encoder/encodeframe.h"
diff --git a/vp10/encoder/mbgraph.c b/vp10/encoder/mbgraph.c
index f676dd7da..a9d33be00 100644
--- a/vp10/encoder/mbgraph.c
+++ b/vp10/encoder/mbgraph.c
@@ -14,12 +14,12 @@
#include "./vpx_dsp_rtcd.h"
#include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/system_state.h"
#include "vp10/encoder/segmentation.h"
#include "vp10/encoder/mcomp.h"
#include "vp10/common/blockd.h"
#include "vp10/common/reconinter.h"
#include "vp10/common/reconintra.h"
-#include "vp10/common/systemdependent.h"
static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi,
diff --git a/vp10/encoder/ratectrl.c b/vp10/encoder/ratectrl.c
index a69504e71..b3364bfd9 100644
--- a/vp10/encoder/ratectrl.c
+++ b/vp10/encoder/ratectrl.c
@@ -17,6 +17,7 @@
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
+#include "vpx_ports/system_state.h"
#include "vp10/common/alloccommon.h"
#include "vp10/encoder/aq_cyclicrefresh.h"
@@ -24,7 +25,6 @@
#include "vp10/common/entropymode.h"
#include "vp10/common/quant_common.h"
#include "vp10/common/seg_common.h"
-#include "vp10/common/systemdependent.h"
#include "vp10/encoder/encodemv.h"
#include "vp10/encoder/ratectrl.h"
diff --git a/vp10/encoder/rd.c b/vp10/encoder/rd.c
index 74a63f95e..157c70661 100644
--- a/vp10/encoder/rd.c
+++ b/vp10/encoder/rd.c
@@ -15,7 +15,9 @@
#include "./vp10_rtcd.h"
#include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/bitops.h"
#include "vpx_ports/mem.h"
+#include "vpx_ports/system_state.h"
#include "vp10/common/common.h"
#include "vp10/common/entropy.h"
@@ -26,7 +28,6 @@
#include "vp10/common/reconinter.h"
#include "vp10/common/reconintra.h"
#include "vp10/common/seg_common.h"
-#include "vp10/common/systemdependent.h"
#include "vp10/encoder/cost.h"
#include "vp10/encoder/encodemb.h"
diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 343d6f236..677376817 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -16,6 +16,7 @@
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
+#include "vpx_ports/system_state.h"
#include "vp10/common/common.h"
#include "vp10/common/entropy.h"
@@ -28,7 +29,6 @@
#include "vp10/common/reconintra.h"
#include "vp10/common/scan.h"
#include "vp10/common/seg_common.h"
-#include "vp10/common/systemdependent.h"
#include "vp10/encoder/cost.h"
#include "vp10/encoder/encodemb.h"
diff --git a/vp10/encoder/temporal_filter.c b/vp10/encoder/temporal_filter.c
index 82e785496..5b7792cc7 100644
--- a/vp10/encoder/temporal_filter.c
+++ b/vp10/encoder/temporal_filter.c
@@ -15,7 +15,6 @@
#include "vp10/common/onyxc_int.h"
#include "vp10/common/quant_common.h"
#include "vp10/common/reconinter.h"
-#include "vp10/common/systemdependent.h"
#include "vp10/encoder/extend.h"
#include "vp10/encoder/firstpass.h"
#include "vp10/encoder/mcomp.h"
diff --git a/vp10/vp10_common.mk b/vp10/vp10_common.mk
index c0f5ae98a..cecbebe12 100644
--- a/vp10/vp10_common.mk
+++ b/vp10/vp10_common.mk
@@ -45,7 +45,6 @@ VP10_COMMON_SRCS-yes += common/scale.h
VP10_COMMON_SRCS-yes += common/scale.c
VP10_COMMON_SRCS-yes += common/seg_common.h
VP10_COMMON_SRCS-yes += common/seg_common.c
-VP10_COMMON_SRCS-yes += common/systemdependent.h
VP10_COMMON_SRCS-yes += common/textblit.h
VP10_COMMON_SRCS-yes += common/tile_common.h
VP10_COMMON_SRCS-yes += common/tile_common.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-10 09:30:50 +0000