From cbf923b12cec2fe7ceea0b94091d64953e56b1fe Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Thu, 17 Feb 2011 06:59:48 -0500 Subject: clean up unused files Removed a number of files that were unused or little-used. Change-Id: If9ae5e5b11390077581a9a879e8a0defe709f5da --- vp8/common/alloccommon.c | 11 +- vp8/common/boolcoder.h | 570 ------------------------------------ vp8/common/codec_common_interface.h | 93 ------ vp8/common/fourcc.hpp | 121 -------- vp8/common/mac_specs.h | 31 -- vp8/common/partialgfupdate.h | 19 -- vp8/common/proposed.h | 71 ----- vp8/common/vfwsetting.hpp | 76 ----- vp8/common/vpx_ref_build_prefix.h | 24 -- vp8/common/vpxblit.h | 112 ------- vp8/common/vpxblit_c64.h | 48 --- vp8/common/vpxerrors.h | 13 - 12 files changed, 5 insertions(+), 1184 deletions(-) delete mode 100644 vp8/common/boolcoder.h delete mode 100644 vp8/common/codec_common_interface.h delete mode 100644 vp8/common/fourcc.hpp delete mode 100644 vp8/common/mac_specs.h delete mode 100644 vp8/common/partialgfupdate.h delete mode 100644 vp8/common/proposed.h delete mode 100644 vp8/common/vfwsetting.hpp delete mode 100644 vp8/common/vpx_ref_build_prefix.h delete mode 100644 vp8/common/vpxblit.h delete mode 100644 vp8/common/vpxblit_c64.h delete mode 100644 vp8/common/vpxerrors.h (limited to 'vp8/common') diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c index 9dce8c8f6..ceb9e525f 100644 --- a/vp8/common/alloccommon.c +++ b/vp8/common/alloccommon.c @@ -16,7 +16,6 @@ #include "findnearmv.h" #include "entropymode.h" #include "systemdependent.h" -#include "vpxerrors.h" extern void vp8_init_scan_order_mask(); @@ -71,7 +70,7 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) if (vp8_yv12_alloc_frame_buffer(&oci->yv12_fb[i], width, height, VP8BORDERINPIXELS) < 0) { vp8_de_alloc_frame_buffers(oci); - return ALLOC_FAILURE; + return 1; } } @@ -88,13 +87,13 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) if (vp8_yv12_alloc_frame_buffer(&oci->temp_scale_frame, width, 16, VP8BORDERINPIXELS) < 0) { vp8_de_alloc_frame_buffers(oci); - return ALLOC_FAILURE; + return 1; } if (vp8_yv12_alloc_frame_buffer(&oci->post_proc_buffer, width, height, VP8BORDERINPIXELS) < 0) { vp8_de_alloc_frame_buffers(oci); - return ALLOC_FAILURE; + return 1; } oci->mb_rows = height >> 4; @@ -106,7 +105,7 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) if (!oci->mip) { vp8_de_alloc_frame_buffers(oci); - return ALLOC_FAILURE; + return 1; } oci->mi = oci->mip + oci->mode_info_stride + 1; @@ -117,7 +116,7 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) if (!oci->above_context) { vp8_de_alloc_frame_buffers(oci); - return ALLOC_FAILURE; + return 1; } vp8_update_mode_info_border(oci->mi, oci->mb_rows, oci->mb_cols); diff --git a/vp8/common/boolcoder.h b/vp8/common/boolcoder.h deleted file mode 100644 index 5658868a6..000000000 --- a/vp8/common/boolcoder.h +++ /dev/null @@ -1,570 +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 bool_coder_h -#define bool_coder_h 1 - -/* Arithmetic bool coder with largish probability range. - Timothy S Murphy 6 August 2004 */ - -/* So as not to force users to drag in too much of my idiosyncratic C++ world, - I avoid fancy storage management. */ - -#include - -#include -#include - -typedef unsigned char vp8bc_index_t; // probability index - -/* There are a couple of slight variants in the details of finite-precision - arithmetic coding. May be safely ignored by most users. */ - -enum vp8bc_rounding -{ - vp8bc_down = 0, // just like VP8 - vp8bc_down_full = 1, // handles minimum probability correctly - vp8bc_up = 2 -}; - -#if _MSC_VER - -/* Note that msvc by default does not inline _anything_ (regardless of the - setting of inline_depth) and that a command-line option (-Ob1 or -Ob2) - is required to inline even the smallest functions. */ - -# pragma inline_depth( 255) // I mean it when I inline something -# pragma warning( disable : 4099) // No class vs. struct harassment -# pragma warning( disable : 4250) // dominance complaints -# pragma warning( disable : 4284) // operator-> in templates -# pragma warning( disable : 4800) // bool conversion - -// don't let prefix ++,-- stand in for postfix, disaster would ensue - -# pragma warning( error : 4620 4621) - -#endif // _MSC_VER - - -#if __cplusplus - -// Sometimes one wishes to be definite about integer lengths. - -struct int_types -{ - typedef const bool cbool; - typedef const signed char cchar; - typedef const short cshort; - typedef const int cint; - typedef const int clong; - - typedef const double cdouble; - typedef const size_t csize_t; - - typedef unsigned char uchar; // 8 bits - typedef const uchar cuchar; - - typedef short int16; - typedef unsigned short uint16; - typedef const int16 cint16; - typedef const uint16 cuint16; - - typedef int int32; - typedef unsigned int uint32; - typedef const int32 cint32; - typedef const uint32 cuint32; - - typedef unsigned int uint; - typedef unsigned int ulong; - typedef const uint cuint; - typedef const ulong culong; - - - // All structs consume space, may as well have a vptr. - - virtual ~int_types(); -}; - - -struct bool_coder_spec; -struct bool_coder; -struct bool_writer; -struct bool_reader; - - -struct bool_coder_namespace : int_types -{ - typedef vp8bc_index_t Index; - typedef bool_coder_spec Spec; - typedef const Spec c_spec; - - enum Rounding - { - Down = vp8bc_down, - down_full = vp8bc_down_full, - Up = vp8bc_up - }; -}; - - -// Archivable specification of a bool coder includes rounding spec -// and probability mapping table. The latter replaces a uchar j -// (0 <= j < 256) with an arbitrary uint16 tbl[j] = p. -// p/65536 is then the probability of a zero. - -struct bool_coder_spec : bool_coder_namespace -{ - friend struct bool_coder; - friend struct bool_writer; - friend struct bool_reader; - friend struct bool_coder_spec_float; - friend struct bool_coder_spec_explicit_table; - friend struct bool_coder_spec_exponential_table; - friend struct BPsrc; -private: - uint w; // precision - Rounding r; - - uint ebits, mbits, ebias; - uint32 mmask; - - Index max_index, half_index; - - uint32 mantissa(Index i) const - { - assert(i < half_index); - return (1 << mbits) + (i & mmask); - } - uint exponent(Index i) const - { - assert(i < half_index); - return ebias - (i >> mbits); - } - - uint16 Ptbl[256]; // kinda clunky, but so is storage management. - - /* Cost in bits of encoding a zero at every probability, scaled by 2^20. - Assumes that index is at most 8 bits wide. */ - - uint32 Ctbl[256]; - - uint32 split(Index i, uint32 R) const // 1 <= split <= max( 1, R-1) - { - if (!ebias) - return 1 + (((R - 1) * Ptbl[i]) >> 16); - - if (i >= half_index) - return R - split(max_index - i, R); - - return 1 + (((R - 1) * mantissa(i)) >> exponent(i)); - } - - uint32 max_range() const - { - return (1 << w) - (r == down_full ? 0 : 1); - } - uint32 min_range() const - { - return (1 << (w - 1)) + (r == down_full ? 1 : 0); - } - uint32 Rinc() const - { - return r == Up ? 1 : 0; - } - - void check_prec() const; - - bool float_init(uint Ebits, uint Mbits); - - void cost_init(); - - bool_coder_spec( - uint prec, Rounding rr, uint Ebits = 0, uint Mbits = 0 - ) - : w(prec), r(rr) - { - float_init(Ebits, Mbits); - } -public: - // Read complete spec from file. - bool_coder_spec(FILE *); - - // Write spec to file. - void dump(FILE *) const; - - // return probability index best approximating prob. - Index operator()(double prob) const; - - // probability corresponding to index - double operator()(Index i) const; - - Index complement(Index i) const - { - return max_index - i; - } - - Index max_index() const - { - return max_index; - } - Index half_index() const - { - return half_index; - } - - uint32 cost_zero(Index i) const - { - return Ctbl[i]; - } - uint32 cost_one(Index i) const - { - return Ctbl[ max_index - i]; - } - uint32 cost_bit(Index i, bool b) const - { - return Ctbl[b? max_index-i:i]; - } -}; - - -/* Pseudo floating-point probability specification. - - At least one of Ebits and Mbits must be nonzero. - - Since all arithmetic is done at 32 bits, Ebits is at most 5. - - Total significant bits in index is Ebits + Mbits + 1. - - Below the halfway point (i.e. when the top significant bit is 0), - the index is (e << Mbits) + m. - - The exponent e is between 0 and (2**Ebits) - 1, - the mantissa m is between 0 and (2**Mbits) - 1. - - Prepending an implicit 1 to the mantissa, the probability is then - - (2**Mbits + m) >> (e - 2**Ebits - 1 - Mbits), - - which has (1/2)**(2**Ebits + 1) as a minimum - and (1/2) * [1 - 2**(Mbits + 1)] as a maximum. - - When the index is above the halfway point, the probability is the - complement of the probability associated to the complement of the index. - - Note that the probability increases with the index and that, because of - the symmetry, we cannot encode probability exactly 1/2; though we - can get as close to 1/2 as we like, provided we have enough Mbits. - - The latter is of course not a problem in practice, one never has - exact probabilities and entropy errors are second order, that is, the - "overcoding" of a zero will be largely compensated for by the - "undercoding" of a one (or vice-versa). - - Compared to arithmetic probability specs (a la VP8), this will do better - at very high and low probabilities and worse at probabilities near 1/2, - as well as facilitating the usage of wider or narrower probability indices. -*/ - -struct bool_coder_spec_float : bool_coder_spec -{ - bool_coder_spec_float( - uint Ebits = 3, uint Mbits = 4, Rounding rr = down_full, uint prec = 12 - ) - : bool_coder_spec(prec, rr, Ebits, Mbits) - { - cost_init(); - } -}; - - -struct bool_coder_spec_explicit_table : bool_coder_spec -{ - bool_coder_spec_explicit_table( - cuint16 probability_table[256] = 0, // default is tbl[i] = i << 8. - Rounding = down_full, - uint precision = 16 - ); -}; - -// Contruct table via multiplicative interpolation between -// p[128] = 1/2 and p[0] = (1/2)^x. -// Since we are working with 16-bit precision, x is at most 16. -// For probabilities to increase with i, we must have x > 1. -// For 0 <= i <= 128, p[i] = (1/2)^{ 1 + [1 - (i/128)]*[x-1] }. -// Finally, p[128+i] = 1 - p[128 - i]. - -struct bool_coder_spec_exponential_table : bool_coder_spec -{ - bool_coder_spec_exponential_table(uint x, Rounding = down_full, uint prec = 16); -}; - - -// Commonalities between writer and reader. - -struct bool_coder : bool_coder_namespace -{ - friend struct bool_writer; - friend struct bool_reader; - friend struct BPsrc; -private: - uint32 Low, Range; - cuint32 min_range; - cuint32 rinc; - c_spec spec; - - void _reset() - { - Low = 0; - Range = spec.max_range(); - } - - bool_coder(c_spec &s) - : min_range(s.min_range()), - rinc(s.Rinc()), - spec(s) - { - _reset(); - } - - uint32 half() const - { - return 1 + ((Range - 1) >> 1); - } -public: - c_spec &Spec() const - { - return spec; - } -}; - - -struct bool_writer : bool_coder -{ - friend struct BPsrc; -private: - uchar *Bstart, *Bend, *B; - int bit_lag; - bool is_toast; - void carry(); - void reset() - { - _reset(); - bit_lag = 32 - spec.w; - is_toast = 0; - } - void raw(bool value, uint32 split); -public: - bool_writer(c_spec &, uchar *Dest, size_t Len); - virtual ~bool_writer(); - - void operator()(Index p, bool v) - { - raw(v, spec.split(p, Range)); - } - - uchar *buf() const - { - return Bstart; - } - size_t bytes_written() const - { - return B - Bstart; - } - - // Call when done with input, flushes internal state. - // DO NOT write any more data after calling this. - - bool_writer &flush(); - - void write_bits(int n, uint val) - { - if (n) - { - uint m = 1 << (n - 1); - - do - { - raw((bool)(val & m), half()); - } - while (m >>= 1); - } - } - -# if 0 - // We are agnostic about storage management. - // By default, overflows throw an assert but user can - // override to provide an expanding buffer using ... - - virtual void overflow(uint Len) const; - - // ... this function copies already-written data into new buffer - // and retains new buffer location. - - void new_buffer(uchar *dest, uint Len); - - // Note that storage management is the user's responsibility. -# endif -}; - - -// This could be adjusted to use a little less lookahead. - -struct bool_reader : bool_coder -{ - friend struct BPsrc; -private: - cuchar *const Bstart; // for debugging - cuchar *B; - cuchar *const Bend; - cuint shf; - uint bct; - bool raw(uint32 split); -public: - bool_reader(c_spec &s, cuchar *src, size_t Len); - - bool operator()(Index p) - { - return raw(spec.split(p, Range)); - } - - uint read_bits(int num_bits) - { - uint v = 0; - - while (--num_bits >= 0) - v += v + (raw(half()) ? 1 : 0); - - return v; - } -}; - -extern "C" { - -#endif /* __cplusplus */ - - - /* C interface */ - - typedef struct bool_coder_spec bool_coder_spec; - typedef struct bool_writer bool_writer; - typedef struct bool_reader bool_reader; - - typedef const bool_coder_spec c_bool_coder_spec; - typedef const bool_writer c_bool_writer; - typedef const bool_reader c_bool_reader; - - - /* Optionally override default precision when constructing coder_specs. - Just pass a zero pointer if you don't care. - Precision is at most 16 bits for table specs, at most 23 otherwise. */ - - struct vp8bc_prec - { - enum vp8bc_rounding r; /* see top header file for def */ - unsigned int prec; /* range precision in bits */ - }; - - typedef const struct vp8bc_prec vp8bc_c_prec; - - /* bool_coder_spec contains mapping of uchars to actual probabilities - (16 bit uints) as well as (usually immaterial) selection of - exact finite-precision algorithm used (for now, the latter can only - be overridden using the C++ interface). - See comments above the corresponding C++ constructors for discussion, - especially of exponential probability table generation. */ - - bool_coder_spec *vp8bc_vp8spec(); // just like vp8 - - bool_coder_spec *vp8bc_literal_spec( - const unsigned short prob_map[256], // 0 is like vp8 w/more precision - vp8bc_c_prec* - ); - - bool_coder_spec *vp8bc_float_spec( - unsigned int exponent_bits, unsigned int mantissa_bits, vp8bc_c_prec* - ); - - bool_coder_spec *vp8bc_exponential_spec(unsigned int min_exp, vp8bc_c_prec *); - - bool_coder_spec *vp8bc_spec_from_file(FILE *); - - - void vp8bc_destroy_spec(c_bool_coder_spec *); - - void vp8bc_spec_to_file(c_bool_coder_spec *, FILE *); - - - /* Nearest index to supplied probability of zero, 0 <= prob <= 1. */ - - vp8bc_index_t vp8bc_index(c_bool_coder_spec *, double prob); - - vp8bc_index_t vp8bc_index_from_counts( - c_bool_coder_spec *p, unsigned int zero_ct, unsigned int one_ct - ); - - /* In case you want to look */ - - double vp8bc_probability(c_bool_coder_spec *, vp8bc_index_t); - - /* Opposite index */ - - vp8bc_index_t vp8bc_complement(c_bool_coder_spec *, vp8bc_index_t); - - /* Cost in bits of encoding a zero at given probability, scaled by 2^20. - (assumes that an int holds at least 32 bits). */ - - unsigned int vp8bc_cost_zero(c_bool_coder_spec *, vp8bc_index_t); - - unsigned int vp8bc_cost_one(c_bool_coder_spec *, vp8bc_index_t); - unsigned int vp8bc_cost_bit(c_bool_coder_spec *, vp8bc_index_t, int); - - - /* bool_writer interface */ - - /* Length = 0 disables checking for writes beyond buffer end. */ - - bool_writer *vp8bc_create_writer( - c_bool_coder_spec *, unsigned char *Destination, size_t Length - ); - - /* Flushes out any buffered data and returns total # of bytes written. */ - - size_t vp8bc_destroy_writer(bool_writer *); - - void vp8bc_write_bool(bool_writer *, int boolean_val, vp8bc_index_t false_prob); - - void vp8bc_write_bits( - bool_writer *, unsigned int integer_value, int number_of_bits - ); - - c_bool_coder_spec *vp8bc_writer_spec(c_bool_writer *); - - - /* bool_reader interface */ - - /* Length = 0 disables checking for reads beyond buffer end. */ - - bool_reader *vp8bc_create_reader( - c_bool_coder_spec *, const unsigned char *Source, size_t Length - ); - void vp8bc_destroy_reader(bool_reader *); - - int vp8bc_read_bool(bool_reader *, vp8bc_index_t false_prob); - - unsigned int vp8bc_read_bits(bool_reader *, int number_of_bits); - - c_bool_coder_spec *vp8bc_reader_spec(c_bool_reader *); - -#if __cplusplus -} -#endif - -#endif /* bool_coder_h */ diff --git a/vp8/common/codec_common_interface.h b/vp8/common/codec_common_interface.h deleted file mode 100644 index 7a7db3847..000000000 --- a/vp8/common/codec_common_interface.h +++ /dev/null @@ -1,93 +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 CODEC_COMMON_INTERFACE_H -#define CODEC_COMMON_INTERFACE_H - -#define __export -#define _export -#define dll_export __declspec( dllexport ) -#define dll_import __declspec( dllimport ) - -// Playback ERROR Codes. -#define NO_DECODER_ERROR 0 -#define REMOTE_DECODER_ERROR -1 - -#define DFR_BAD_DCT_COEFF -100 -#define DFR_ZERO_LENGTH_FRAME -101 -#define DFR_FRAME_SIZE_INVALID -102 -#define DFR_OUTPUT_BUFFER_OVERFLOW -103 -#define DFR_INVALID_FRAME_HEADER -104 -#define FR_INVALID_MODE_TOKEN -110 -#define ETR_ALLOCATION_ERROR -200 -#define ETR_INVALID_ROOT_PTR -201 -#define SYNCH_ERROR -400 -#define BUFFER_UNDERFLOW_ERROR -500 -#define PB_IB_OVERFLOW_ERROR -501 - -// External error triggers -#define PB_HEADER_CHECKSUM_ERROR -601 -#define PB_DATA_CHECKSUM_ERROR -602 - -// DCT Error Codes -#define DDCT_EXPANSION_ERROR -700 -#define DDCT_INVALID_TOKEN_ERROR -701 - -// exception_errors -#define GEN_EXCEPTIONS -800 -#define EX_UNQUAL_ERROR -801 - -// Unrecoverable error codes -#define FATAL_PLAYBACK_ERROR -1000 -#define GEN_ERROR_CREATING_CDC -1001 -#define GEN_THREAD_CREATION_ERROR -1002 -#define DFR_CREATE_BMP_FAILED -1003 - -// YUV buffer configuration structure -typedef struct -{ - int y_width; - int y_height; - int y_stride; - - int uv_width; - int uv_height; - int uv_stride; - - unsigned char *y_buffer; - unsigned char *u_buffer; - unsigned char *v_buffer; - -} YUV_BUFFER_CONFIG; -typedef enum -{ - C_SET_KEY_FRAME, - C_SET_FIXED_Q, - C_SET_FIRSTPASS_FILE, - C_SET_EXPERIMENTAL_MIN, - C_SET_EXPERIMENTAL_MAX = C_SET_EXPERIMENTAL_MIN + 255, - C_SET_CHECKPROTECT, - C_SET_TESTMODE, - C_SET_INTERNAL_SIZE, - C_SET_RECOVERY_FRAME, - C_SET_REFERENCEFRAME, - C_SET_GOLDENFRAME - -#ifndef VP50_COMP_INTERFACE - // Specialist test facilities. -// C_VCAP_PARAMS, // DO NOT USE FOR NOW WITH VFW CODEC -#endif - -} C_SETTING; - -typedef unsigned long C_SET_VALUE; - - -#endif diff --git a/vp8/common/fourcc.hpp b/vp8/common/fourcc.hpp deleted file mode 100644 index c5826285e..000000000 --- a/vp8/common/fourcc.hpp +++ /dev/null @@ -1,121 +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 FOURCC_HPP -#define FOURCC_HPP - -#include -#include - - -#if defined(__POWERPC__) || defined(__APPLE__) || defined(__MERKS__) -using namespace std; -#endif - -class four_cc -{ -public: - - four_cc(); - four_cc(const char*); - explicit four_cc(unsigned long); - - bool operator==(const four_cc&) const; - bool operator!=(const four_cc&) const; - - bool operator==(const char*) const; - bool operator!=(const char*) const; - - operator unsigned long() const; - unsigned long as_long() const; - - four_cc& operator=(unsigned long); - - char operator[](int) const; - - std::ostream& put(std::ostream&) const; - - bool printable() const; - -private: - - union - { - char code[4]; - unsigned long code_as_long; - }; - -}; - - -inline four_cc::four_cc() -{ -} - -inline four_cc::four_cc(unsigned long x) - : code_as_long(x) -{ -} - -inline four_cc::four_cc(const char* str) -{ - memcpy(code, str, 4); -} - - -inline bool four_cc::operator==(const four_cc& rhs) const -{ - return code_as_long == rhs.code_as_long; -} - -inline bool four_cc::operator!=(const four_cc& rhs) const -{ - return !operator==(rhs); -} - -inline bool four_cc::operator==(const char* rhs) const -{ - return (memcmp(code, rhs, 4) == 0); -} - -inline bool four_cc::operator!=(const char* rhs) const -{ - return !operator==(rhs); -} - - -inline four_cc::operator unsigned long() const -{ - return code_as_long; -} - -inline unsigned long four_cc::as_long() const -{ - return code_as_long; -} - -inline char four_cc::operator[](int i) const -{ - return code[i]; -} - -inline four_cc& four_cc::operator=(unsigned long val) -{ - code_as_long = val; - return *this; -} - -inline std::ostream& operator<<(std::ostream& os, const four_cc& rhs) -{ - return rhs.put(os); -} - -#endif diff --git a/vp8/common/mac_specs.h b/vp8/common/mac_specs.h deleted file mode 100644 index 4b8ee5877..000000000 --- a/vp8/common/mac_specs.h +++ /dev/null @@ -1,31 +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. - */ - - -#if !defined(_mac_specs_h) -#define _mac_specs_h - - -#if defined(__cplusplus) -extern "C" { -#endif - - extern unsigned int vp8_read_tsc(); - - extern unsigned int vp8_get_processor_freq(); - - extern unsigned int vpx_has_altivec(); - -#if defined(__cplusplus) -} -#endif - - -#endif diff --git a/vp8/common/partialgfupdate.h b/vp8/common/partialgfupdate.h deleted file mode 100644 index 115134a53..000000000 --- a/vp8/common/partialgfupdate.h +++ /dev/null @@ -1,19 +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 __INC_PARTIALGFUPDATE_H -#define __INC_PARTIALGFUPDATE_H - -#include "onyxc_int.h" - -extern void update_gf_selective(ONYX_COMMON *cm, MACROBLOCKD *x); - -#endif diff --git a/vp8/common/proposed.h b/vp8/common/proposed.h deleted file mode 100644 index c9659902b..000000000 --- a/vp8/common/proposed.h +++ /dev/null @@ -1,71 +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. - */ - - -typedef struct core_codec *codec_ptr; -typedef struct interface_table *interface_ptr; - -typedef struct -{ - void (*Initialize)(); - void (*Shutdown)(); - codec_ptr(*Create)(); - int (*compress_frame)(codec_ptr, unsigned int *frame_flags, YV12_BUFFER_CONFIG *sd, unsigned long *size, char *dest, INT64 time_stamp); - int (*show_frame)(codec_ptr , YV12_BUFFER_CONFIG *dest, int deblock_level, int noise_level, int flags); - void (*Remove)(codec_ptr *comp); - interface_ptr(*get_interface)(unsigned int id); - -} core_codec; - -typedef struct -{ - int (*set_bitrate)(codec_ptr, END_USAGE usage, int Datarate); - int (*get_bitrate)(codec_ptr, END_USAGE *usage, int *Datarate); - int (*set_mode)(codec_ptr, MODE mode, int Speed, char *File); - int (*get_mode)(codec_ptr, MODE *mode, int *Speed, char **File); -} codec_settings_basic; - -typedef struct -{ - int (*set_bitrate)(codec_ptr, END_USAGE usage, int Datarate); - int (*get_bitrate)(codec_ptr, END_USAGE *usage, int *Datarate); - int (*set_mode)(codec_ptr, MODE mode, int Speed, char *File); - int (*get_mode)(codec_ptr, MODE *mode, int *Speed, char **File); - int (*set_denoise)(codec_ptr, int Level); - int (*get_denoise)(codec_ptr, int *Level); - int (*set_sharpness)(codec_ptr, int sharpness); - int (*get_sharpness)(codec_ptr, int *sharpness); - int (*set_keyframing)(codec_ptr, int Auto, int max_distance); - int (*get_keyframing)(codec_ptr, int *Auto, int *max_distance); - int (*set_buffering)(codec_ptr, int buffer_level, int max_buffer_level); - int (*get_buffering)(codec_ptr, int *buffer_level, int *max_buffer_level); - int (*set_adjust_frame_rate)(codec_ptr, int Allowed, int at_buffer_level_pct); - int (*get_adjust_frame_rate)(codec_ptr, int *Allowed, int *at_buffer_level_pct); - int (*set_adjust_frame_size)(codec_ptr, int Allowed, int down_at_buffer_level_pct, int up_at_buffer_level_pct); - int (*get_adjust_frame_size)(codec_ptr, int *Allowed, int *down_at_buffer_level_pct, int *up_at_buffer_level_pct); - int (*set_adjust_quality)(codec_ptr, int Allowed, int min_quantizer, int max_quantizer); - int (*get_adjust_quality)(codec_ptr, int *Allowed, int *min_quantizer, int *max_quantizer); - int (*set_vbrparms)(codec_ptr, int Bias, int Min, int Max); - int (*get_vbrparms)(codec_ptr, int *Bias, int *Min, int *Max); - -} codec_settings_v1; - -typedef struct -{ - int (*request_recovery)(codec_ptr); - int (*request_droppable)(codec_ptr); - int (*internal_size)(codec_ptr, VPX_SCALING Vertical, VPX_SCALING Horizontal); - int (*update_last)(codec_ptr); - int (*update_gold)(codec_ptr); - int (*use_only_last)(codec_ptr); - int (*use_only_gold)(codec_ptr); - int (*update_entropy)(codec_ptr); - -} codec_realtime_requests; diff --git a/vp8/common/vfwsetting.hpp b/vp8/common/vfwsetting.hpp deleted file mode 100644 index 44869ecc7..000000000 --- a/vp8/common/vfwsetting.hpp +++ /dev/null @@ -1,76 +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. - */ - - -#if !defined(VFWSETTING_HPP) -#define VFWSETTING_HPP -//______________________________________________________________________________ -// -// VFWSetting.hpp -// - -#include "four_cc.hpp" -#include - -namespace vpxvp -{ - - //-------------------------------------- - class VFWSetting - { - friend std::ostream& operator<<(std::ostream& os, const VFWSetting& vfws); - - public: - - enum Mode - { - m_setting, - m_config - }; - - enum - { - header_size = 8, - Size = 16 - }; - - VFWSetting(four_cc fcc); - ~VFWSetting(); - - four_cc fcc() const; - Mode mode() const; - - int setting() const; - int value() const; - void setting_value(int i_setting, int i_value); // Sets mode to m_setting - - long size() const; - const void* data() const; - int data(const void* p_data, unsigned long ul_size); - - private: - - VFWSetting(const VFWSetting& vfws); // Not implemented - VFWSetting& operator=(const VFWSetting& vfws); // Not implemented - - int extract_(const void* p_data, unsigned long ul_size); - void update_() const; - - four_cc m_fcc; - Mode m_mode; - int m_i_setting; - int m_i_value; - - mutable unsigned char m_p_data[Size]; - }; - -} // namespace vpxvp - -#endif // VFWSETTING_HPP diff --git a/vp8/common/vpx_ref_build_prefix.h b/vp8/common/vpx_ref_build_prefix.h deleted file mode 100644 index a2fce65dc..000000000 --- a/vp8/common/vpx_ref_build_prefix.h +++ /dev/null @@ -1,24 +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 _VPX_REF_BUILD_PREFIX_h -#define _VPX_REF_BUILD_PREFIX_h - -#if defined(__cplusplus) -extern "C" { -#endif - - -#if defined(__cplusplus) -} -#endif - -#endif /* include guards */ diff --git a/vp8/common/vpxblit.h b/vp8/common/vpxblit.h deleted file mode 100644 index a95d90574..000000000 --- a/vp8/common/vpxblit.h +++ /dev/null @@ -1,112 +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 VPXBLIT_H_INCL -#define VPXBLIT_H_INCL -/*============================================================================== - Includes -==============================================================================*/ - -/*============================================================================== - Defines -==============================================================================*/ - - -#ifdef VPX_BIG_ENDIAN -#define BYTE_ZERO(X) ((X & 0xFF000000) >> (24 - 2) ) -#define BYTE_ONE(X) ((X & 0x00FF0000) >> (16 - 2) ) -#define BYTE_TWO(X) ((X & 0x0000FF00) >> (8 - 2) ) -#define BYTE_THREE(X) ((X & 0x000000FF) << (0 + 2) ) - -#define BYTE_ZERO_UV(X) ((X & 0x0000FF00) >> (8 - 2) ) -#define BYTE_ONE_UV(X) ((X & 0x000000FF) << (0 + 2) ) - -#define REREFERENCE(X) (*((int *) &(X))) - -#else - -#define BYTE_THREE(X) ((X & 0xFF000000) >> (24 - 2) ) -#define BYTE_TWO(X) ((X & 0x00FF0000) >> (16 - 2) ) -#define BYTE_ONE(X) ((X & 0x0000FF00) >> (8 - 2) ) -#define BYTE_ZERO(X) ((X & 0x000000FF) << (0 + 2) ) - -#define BYTE_ONE_UV(X) ((X & 0x0000FF00) >> (8 - 2) ) -#define BYTE_ZERO_UV(X) ((X & 0x000000FF) << (0 + 2) ) - -#define REREFERENCE(X) (*((int *) &(X))) - -#endif - - -/*============================================================================== - Type Definitions -==============================================================================*/ -typedef struct // YUV buffer configuration structure -{ - int y_width; - int y_height; - int y_stride; - - int uv_width; - int uv_height; - int uv_stride; - - char *y_buffer; - char *u_buffer; - char *v_buffer; - - char *uv_start; - int uv_dst_area; - int uv_used_area; - -} VPX_BLIT_CONFIG; - -typedef struct tx86_params -{ - unsigned int pushed_registers[6]; - unsigned int return_address; - unsigned int dst; - unsigned int scrn_pitch; - VPX_BLIT_CONFIG *buff_config; -} x86_params; - -/*============================================================================= - Enums -==============================================================================*/ - - -/*============================================================================== - Structures -==============================================================================*/ - -/*============================================================================== - Constants -==============================================================================*/ - - -/*============================================================================== - Variables -==============================================================================*/ - - - - -/*============================================================================== - Function Protoypes/MICROS -==============================================================================*/ -int vpx_get_size_of_pixel(unsigned int bd); -void *vpx_get_blitter(unsigned int bd); -void vpx_set_blit(void); -void vpx_destroy_blit(void); - - - -#endif //VPXBLIT_H_INCL diff --git a/vp8/common/vpxblit_c64.h b/vp8/common/vpxblit_c64.h deleted file mode 100644 index 4ee617f6c..000000000 --- a/vp8/common/vpxblit_c64.h +++ /dev/null @@ -1,48 +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 _VPX_BLIT_C64_h -#define _VPX_BLIT_C64_h - -/**************************************************************************** -* Typedefs -****************************************************************************/ - -typedef struct // YUV buffer configuration structure -{ - int y_width; - int y_height; - int y_stride; - - int uv_width; - int uv_height; - int uv_stride; - - unsigned char *y_buffer; - unsigned char *u_buffer; - unsigned char *v_buffer; - - unsigned char *y_ptr_scrn; - unsigned char *u_ptr_scrn; - unsigned char *v_ptr_scrn; - -} DXV_YUV_BUFFER_CONFIG; - -typedef struct -{ - unsigned char *rgbptr_scrn; - unsigned char *y_ptr_scrn; - unsigned char *u_ptr_scrn; - unsigned char *v_ptr_scrn; - unsigned char *rgbptr_scrn2; -} DXV_FINAL_VIDEO; - -#endif /* include guards */ diff --git a/vp8/common/vpxerrors.h b/vp8/common/vpxerrors.h deleted file mode 100644 index b70f29673..000000000 --- a/vp8/common/vpxerrors.h +++ /dev/null @@ -1,13 +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. - */ - - - -#define ALLOC_FAILURE -2 -- cgit v1.2.3