Commit f9279ee7 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

parent 600b854a
......@@ -23,8 +23,8 @@
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/mathops.h"
#include "libavcodec/vp3dsp.h"
#include "libavcodec/dsputil.h"
void ff_bfin_vp3_idct(int16_t *block);
......
......@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "mathops.h"
#include "rnd_avg.h"
#ifndef BIT_DEPTH
......
......@@ -23,7 +23,9 @@
*/
#include <stdio.h>
#include "dsputil.h"
#include "mathops.h"
#include "cavsdsp.h"
#include "libavutil/common.h"
......
......@@ -36,16 +36,11 @@
/* encoding scans */
extern const uint8_t ff_alternate_horizontal_scan[64];
extern const uint8_t ff_alternate_vertical_scan[64];
extern const uint8_t ff_zigzag_direct[64];
extern const uint8_t ff_zigzag248_direct[64];
/* pixel operations */
#define MAX_NEG_CROP 1024
/* temporary */
extern uint32_t ff_square_tab[512];
extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP];
/* pixel operations */
void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
......
......@@ -31,9 +31,9 @@
*/
#include "avcodec.h"
#include "dsputil.h"
#include "imgconvert.h"
#include "internal.h"
#include "mathops.h"
#include "libavutil/colorspace.h"
#include "libavutil/common.h"
#include "libavutil/pixdesc.h"
......
......@@ -28,8 +28,9 @@
#define AVCODEC_INDEO4DATA_H
#include <stdint.h>
#include "dsputil.h"
#include "ivi_common.h"
#include "mathops.h"
/**
* standard picture dimensions
......
......@@ -27,9 +27,13 @@
#include "libavutil/common.h"
#include "config.h"
#define MAX_NEG_CROP 1024
extern const uint32_t ff_inverse[257];
extern const uint8_t ff_reverse[256];
extern const uint8_t ff_sqrt_tab[256];
extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP];
extern const uint8_t ff_zigzag_direct[64];
#if ARCH_ARM
# include "arm/mathops.h"
......
......@@ -18,6 +18,8 @@
#include <stdint.h>
#include "mathops.h"
/* a*inverse[b]>>32 == a/b for all 0<=a<=16909558 && 2<=b<=256
* for a>16909558, is an overestimate by less than 1 part in 1<<24 */
const uint32_t ff_inverse[257]={
......@@ -89,7 +91,7 @@ const uint8_t ff_reverse[256] = {
#define times4(x) x, x, x, x
#define times256(x) times4(times4(times4(times4(times4(x)))))
const uint8_t ff_crop_tab[256 + 2 * 1024] = {
const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP] = {
times256(0x00),
0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
......
......@@ -26,8 +26,8 @@
#include "avcodec.h"
#include "bytestream.h"
#include "dsputil.h"
#include "internal.h"
#include "mathops.h"
#include "mss34dsp.h"
#define HEADER_SIZE 27
......
......@@ -25,9 +25,9 @@
*/
#include "avcodec.h"
#include "dsputil.h"
#include "bytestream.h"
#include "internal.h"
#include "mathops.h"
#include "libavutil/colorspace.h"
#include "libavutil/imgutils.h"
......
......@@ -27,6 +27,7 @@
#include "avcodec.h"
#include "h264chroma.h"
#include "h264qpel.h"
#include "mathops.h"
#include "rv34dsp.h"
#define RV30_LOWPASS(OPNAME, OP) \
......
......@@ -26,6 +26,7 @@
#include "avcodec.h"
#include "h264qpel.h"
#include "mathops.h"
#include "rv34dsp.h"
#include "libavutil/common.h"
......
......@@ -36,9 +36,9 @@
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "internal.h"
#include "dsputil.h"
#include "get_bits.h"
#include "hpeldsp.h"
#include "mathops.h"
#include "videodsp.h"
#include "vp3data.h"
#include "vp3dsp.h"
......
......@@ -24,7 +24,7 @@
* VP8 compatible video decoder
*/
#include "dsputil.h"
#include "mathops.h"
#include "vp8dsp.h"
#include "libavutil/common.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment