falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

rename cropTbl -> ff_cropTbl 

Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Måns Rullgård 19 years ago
parent
d136d2fcea
commit
55fde95e3b
18 changed files with 70 additions and 70 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      libavcodec/cavs.c
  2. +4
    -4
      libavcodec/cavsdsp.c
  3. +27
    -27
      libavcodec/dsputil.c
  4. +1
    -1
      libavcodec/dsputil.h
  5. +1
    -1
      libavcodec/dvbsubdec.c
  6. +2
    -2
      libavcodec/error_resilience.c
  7. +2
    -2
      libavcodec/h264.c
  8. +4
    -4
      libavcodec/h264idct.c
  9. +3
    -3
      libavcodec/imgconvert.c
  10. +4
    -4
      libavcodec/imgconvert_template.h
  11. +1
    -1
      libavcodec/mlib/dsputil_mlib.c
  12. +2
    -2
      libavcodec/sh4/dsputil_sh4.c
  13. +9
    -9
      libavcodec/sh4/qpel.c
  14. +5
    -5
      libavcodec/simple_idct.c
  15. +1
    -1
      libavcodec/svq3.c
  16. +1
    -1
      libavcodec/vp3dsp.c
  17. +1
    -1
      libavformat/grab.c
  18. +1
    -1
      vhook/fish.c

+ 1
- 1
libavcodec/cavs.c View File

@@ -293,7 +293,7 @@ static void intra_pred_plane(uint8_t *d,uint8_t *top,uint8_t *left,int stride) {
int x,y,ia;
int ih = 0;
int iv = 0;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

for(x=0; x<4; x++) {
ih += (x+1)*(top[5+x]-top[3-x]);


+ 4
- 4
libavcodec/cavsdsp.c View File

@@ -184,7 +184,7 @@ static void cavs_filter_ch_c(uint8_t *d, int stride, int alpha, int beta, int tc
static void cavs_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride) {
int i;
DCTELEM (*src)[8] = (DCTELEM(*)[8])block;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

src[0][0] += 8;

@@ -260,7 +260,7 @@ static void cavs_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride) {
#define CAVS_SUBPIX(OPNAME, OP, NAME, A, B, C, D, E, F) \
static void OPNAME ## cavs_filt8_h_ ## NAME(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int h=8;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
for(i=0; i<h; i++)\
{\
@@ -279,7 +279,7 @@ static void OPNAME ## cavs_filt8_h_ ## NAME(uint8_t *dst, uint8_t *src, int dstS
\
static void OPNAME ## cavs_filt8_v_ ## NAME(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w=8;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
for(i=0; i<w; i++)\
{\
@@ -333,7 +333,7 @@ static void OPNAME ## cavs_filt8_hv_ ## NAME(uint8_t *dst, uint8_t *src1, uint8_
int16_t *tmp = temp;\
const int h=8;\
const int w=8;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
src1 -= 2*srcStride;\
for(i=0; i<h+5; i++)\


+ 27
- 27
libavcodec/dsputil.c View File

@@ -40,7 +40,7 @@ void ff_spatial_dwt(int *buffer, int width, int height, int stride, int type, in
/* vorbis.c */
void vorbis_inverse_coupling(float *mag, float *ang, int blocksize);

uint8_t cropTbl[256 + 2 * MAX_NEG_CROP] = {0, };
uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP] = {0, };
uint32_t squareTbl[512] = {0, };

const uint8_t ff_zigzag_direct[64] = {
@@ -436,7 +436,7 @@ static void put_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels,
int line_size)
{
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

/* read the pixels */
for(i=0;i<8;i++) {
@@ -458,7 +458,7 @@ static void put_pixels_clamped4_c(const DCTELEM *block, uint8_t *restrict pixels
int line_size)
{
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

/* read the pixels */
for(i=0;i<4;i++) {
@@ -476,7 +476,7 @@ static void put_pixels_clamped2_c(const DCTELEM *block, uint8_t *restrict pixels
int line_size)
{
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

/* read the pixels */
for(i=0;i<2;i++) {
@@ -513,7 +513,7 @@ static void add_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels,
int line_size)
{
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

/* read the pixels */
for(i=0;i<8;i++) {
@@ -534,7 +534,7 @@ static void add_pixels_clamped4_c(const DCTELEM *block, uint8_t *restrict pixels
int line_size)
{
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

/* read the pixels */
for(i=0;i<4;i++) {
@@ -551,7 +551,7 @@ static void add_pixels_clamped2_c(const DCTELEM *block, uint8_t *restrict pixels
int line_size)
{
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

/* read the pixels */
for(i=0;i<2;i++) {
@@ -1592,7 +1592,7 @@ static inline void copy_block9(uint8_t *dst, uint8_t *src, int dstStride, int sr

#define QPEL_MC(r, OPNAME, RND, OP) \
static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
for(i=0; i<h; i++)\
{\
@@ -1611,7 +1611,7 @@ static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstS
\
static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w=8;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
for(i=0; i<w; i++)\
{\
@@ -1638,7 +1638,7 @@ static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstS
}\
\
static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
\
for(i=0; i<h; i++)\
@@ -1665,7 +1665,7 @@ static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dst
}\
\
static void OPNAME ## mpeg4_qpel16_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
const int w=16;\
for(i=0; i<w; i++)\
@@ -2091,7 +2091,7 @@ QPEL_MC(0, avg_ , _ , op_avg)
#define H264_LOWPASS(OPNAME, OP, OP2) \
static void OPNAME ## h264_qpel2_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int h=2;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
for(i=0; i<h; i++)\
{\
@@ -2104,7 +2104,7 @@ static void OPNAME ## h264_qpel2_h_lowpass(uint8_t *dst, uint8_t *src, int dstSt
\
static void OPNAME ## h264_qpel2_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w=2;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
for(i=0; i<w; i++)\
{\
@@ -2125,7 +2125,7 @@ static void OPNAME ## h264_qpel2_v_lowpass(uint8_t *dst, uint8_t *src, int dstSt
static void OPNAME ## h264_qpel2_hv_lowpass(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride){\
const int h=2;\
const int w=2;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
src -= 2*srcStride;\
for(i=0; i<h+5; i++)\
@@ -2153,7 +2153,7 @@ static void OPNAME ## h264_qpel2_hv_lowpass(uint8_t *dst, int16_t *tmp, uint8_t
}\
static void OPNAME ## h264_qpel4_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int h=4;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
for(i=0; i<h; i++)\
{\
@@ -2168,7 +2168,7 @@ static void OPNAME ## h264_qpel4_h_lowpass(uint8_t *dst, uint8_t *src, int dstSt
\
static void OPNAME ## h264_qpel4_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w=4;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
for(i=0; i<w; i++)\
{\
@@ -2193,7 +2193,7 @@ static void OPNAME ## h264_qpel4_v_lowpass(uint8_t *dst, uint8_t *src, int dstSt
static void OPNAME ## h264_qpel4_hv_lowpass(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride){\
const int h=4;\
const int w=4;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
src -= 2*srcStride;\
for(i=0; i<h+5; i++)\
@@ -2228,7 +2228,7 @@ static void OPNAME ## h264_qpel4_hv_lowpass(uint8_t *dst, int16_t *tmp, uint8_t
\
static void OPNAME ## h264_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int h=8;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
for(i=0; i<h; i++)\
{\
@@ -2247,7 +2247,7 @@ static void OPNAME ## h264_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstSt
\
static void OPNAME ## h264_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w=8;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
for(i=0; i<w; i++)\
{\
@@ -2280,7 +2280,7 @@ static void OPNAME ## h264_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstSt
static void OPNAME ## h264_qpel8_hv_lowpass(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride){\
const int h=8;\
const int w=8;\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
src -= 2*srcStride;\
for(i=0; i<h+5; i++)\
@@ -2582,7 +2582,7 @@ H264_WEIGHT(2,2)
#undef H264_WEIGHT

static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
int i;

for(i=0; i<h; i++){
@@ -2627,7 +2627,7 @@ void ff_put_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) {
#endif /* CONFIG_VC1_DECODER||CONFIG_WMV3_DECODER */

static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
int i;

for(i=0; i<w; i++){
@@ -3847,13 +3847,13 @@ static void ff_jref_idct2_add(uint8_t *dest, int line_size, DCTELEM *block)

static void ff_jref_idct1_put(uint8_t *dest, int line_size, DCTELEM *block)
{
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

dest[0] = cm[(block[0] + 4)>>3];
}
static void ff_jref_idct1_add(uint8_t *dest, int line_size, DCTELEM *block)
{
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

dest[0] = cm[dest[0] + ((block[0] + 4)>>3)];
}
@@ -3865,10 +3865,10 @@ void dsputil_static_init(void)
{
int i;

for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i;
for(i=0;i<256;i++) ff_cropTbl[i + MAX_NEG_CROP] = i;
for(i=0;i<MAX_NEG_CROP;i++) {
cropTbl[i] = 0;
cropTbl[i + MAX_NEG_CROP + 256] = 255;
ff_cropTbl[i] = 0;
ff_cropTbl[i + MAX_NEG_CROP + 256] = 255;
}

for(i=0;i<512;i++) {


+ 1
- 1
libavcodec/dsputil.h View File

@@ -75,7 +75,7 @@ extern const uint8_t ff_zigzag248_direct[64];

/* temporary */
extern uint32_t squareTbl[512];
extern uint8_t cropTbl[256 + 2 * MAX_NEG_CROP];
extern uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP];

/* VP3 DSP functions */
void ff_vp3_idct_c(DCTELEM *block/* align 16*/);


+ 1
- 1
libavcodec/dvbsubdec.c View File

@@ -344,7 +344,7 @@ static int dvbsub_init_decoder(AVCodecContext *avctx)
int i, r, g, b, a = 0;
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;

cm = cropTbl + MAX_NEG_CROP;
cm = ff_cropTbl + MAX_NEG_CROP;

memset(avctx->priv_data, 0, sizeof(DVBSubContext));



+ 2
- 2
libavcodec/error_resilience.c View File

@@ -199,7 +199,7 @@ static void guess_dc(MpegEncContext *s, int16_t *dc, int w, int h, int stride, i
*/
static void h_block_filter(MpegEncContext *s, uint8_t *dst, int w, int h, int stride, int is_luma){
int b_x, b_y;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

for(b_y=0; b_y<h; b_y++){
for(b_x=0; b_x<w-1; b_x++){
@@ -259,7 +259,7 @@ static void h_block_filter(MpegEncContext *s, uint8_t *dst, int w, int h, int st
*/
static void v_block_filter(MpegEncContext *s, uint8_t *dst, int w, int h, int stride, int is_luma){
int b_x, b_y;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

for(b_y=0; b_y<h-1; b_y++){
for(b_x=0; b_x<w; b_x++){


+ 2
- 2
libavcodec/h264.c View File

@@ -2451,7 +2451,7 @@ static void pred16x16_128_dc_c(uint8_t *src, int stride){
static inline void pred16x16_plane_compat_c(uint8_t *src, int stride, const int svq3){
int i, j, k;
int a;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
const uint8_t * const src0 = src+7-stride;
const uint8_t *src1 = src+8*stride-1;
const uint8_t *src2 = src1-2*stride; // == src+6*stride-1;
@@ -2594,7 +2594,7 @@ static void pred8x8_dc_c(uint8_t *src, int stride){
static void pred8x8_plane_c(uint8_t *src, int stride){
int j, k;
int a;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
const uint8_t * const src0 = src+3-stride;
const uint8_t *src1 = src+4*stride-1;
const uint8_t *src2 = src1-2*stride; // == src+2*stride-1;


+ 4
- 4
libavcodec/h264idct.c View File

@@ -30,7 +30,7 @@

static always_inline void idct_internal(uint8_t *dst, DCTELEM *block, int stride, int block_stride, int shift, int add){
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

block[0] += 1<<(shift-1);

@@ -74,7 +74,7 @@ void ff_h264_lowres_idct_put_c(uint8_t *dst, int stride, DCTELEM *block){
void ff_h264_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride){
int i;
DCTELEM (*src)[8] = (DCTELEM(*)[8])block;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

block[0] += 32;

@@ -145,7 +145,7 @@ void ff_h264_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride){
// assumes all AC coefs are 0
void ff_h264_idct_dc_add_c(uint8_t *dst, DCTELEM *block, int stride){
int i, j;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
int dc = (block[0] + 32) >> 6;
for( j = 0; j < 4; j++ )
{
@@ -157,7 +157,7 @@ void ff_h264_idct_dc_add_c(uint8_t *dst, DCTELEM *block, int stride){

void ff_h264_idct8_dc_add_c(uint8_t *dst, DCTELEM *block, int stride){
int i, j;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
int dc = (block[0] + 32) >> 6;
for( j = 0; j < 8; j++ )
{


+ 3
- 3
libavcodec/imgconvert.c View File

@@ -1241,7 +1241,7 @@ static uint8_t c_jpeg_to_ccir[256];
static void img_convert_init(void)
{
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

for(i = 0;i < 256; i++) {
y_ccir_to_jpeg[i] = Y_CCIR_TO_JPEG(i);
@@ -2653,7 +2653,7 @@ static void deinterlace_line(uint8_t *dst,
int size)
{
#ifndef HAVE_MMX
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
int sum;

for(;size > 0;size--) {
@@ -2696,7 +2696,7 @@ static void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, uint8_t *
int size)
{
#ifndef HAVE_MMX
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
int sum;

for(;size > 0;size--) {


+ 4
- 4
libavcodec/imgconvert_template.h View File

@@ -29,7 +29,7 @@ static void glue(yuv420p_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src,
const uint8_t *y1_ptr, *y2_ptr, *cb_ptr, *cr_ptr;
uint8_t *d, *d1, *d2;
int w, y, cb, cr, r_add, g_add, b_add, width2;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
unsigned int r, g, b;

d = dst->data[0];
@@ -123,7 +123,7 @@ static void glue(yuvj420p_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src,
const uint8_t *y1_ptr, *y2_ptr, *cb_ptr, *cr_ptr;
uint8_t *d, *d1, *d2;
int w, y, cb, cr, r_add, g_add, b_add, width2;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
unsigned int r, g, b;

d = dst->data[0];
@@ -539,7 +539,7 @@ static void yuv444p_to_rgb24(AVPicture *dst, const AVPicture *src,
const uint8_t *y1_ptr, *cb_ptr, *cr_ptr;
uint8_t *d, *d1;
int w, y, cb, cr, r_add, g_add, b_add;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
unsigned int r, g, b;

d = dst->data[0];
@@ -572,7 +572,7 @@ static void yuvj444p_to_rgb24(AVPicture *dst, const AVPicture *src,
const uint8_t *y1_ptr, *cb_ptr, *cr_ptr;
uint8_t *d, *d1;
int w, y, cb, cr, r_add, g_add, b_add;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
unsigned int r, g, b;

d = dst->data[0];


+ 1
- 1
libavcodec/mlib/dsputil_mlib.c View File

@@ -384,7 +384,7 @@ static void bswap_buf_mlib(uint32_t *dst, uint32_t *src, int w)
static void ff_idct_put_mlib(uint8_t *dest, int line_size, DCTELEM *data)
{
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

mlib_VideoIDCT8x8_S16_S16 (data, data);



+ 2
- 2
libavcodec/sh4/dsputil_sh4.c View File

@@ -70,7 +70,7 @@ static void idct_put(uint8_t *dest, int line_size, DCTELEM *block)
{
idct_sh4(block);
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
for(i=0;i<8;i++) {
dest[0] = cm[block[0]];
dest[1] = cm[block[1]];
@@ -88,7 +88,7 @@ static void idct_add(uint8_t *dest, int line_size, DCTELEM *block)
{
idct_sh4(block);
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
for(i=0;i<8;i++) {
dest[0] = cm[dest[0]+block[0]];
dest[1] = cm[dest[1]+block[1]];


+ 9
- 9
libavcodec/sh4/qpel.c View File

@@ -633,7 +633,7 @@ static inline void copy_block9(uint8_t *dst, uint8_t *src, int dstStride, int sr

#define QPEL_MC(r, OPNAME, RND, OP) \
static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
do {\
uint8_t *s = src; \
int src0,src1,src2,src3,src4,src5,src6,src7,src8;\
@@ -660,7 +660,7 @@ static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstS
}\
\
static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int w=8;\
do{\
uint8_t *s = src, *d=dst;\
@@ -688,7 +688,7 @@ static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstS
}\
\
static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
do {\
uint8_t *s = src;\
int src0,src1,src2,src3,src4,src5,src6,src7,src8;\
@@ -732,7 +732,7 @@ static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dst
}\
\
static void OPNAME ## mpeg4_qpel16_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int w=16;\
do {\
uint8_t *s = src, *d=dst;\
@@ -1158,7 +1158,7 @@ QPEL_MC(0, avg_ , _ , op_avg)
#if 1
#define H264_LOWPASS(OPNAME, OP, OP2) \
static inline void OPNAME ## h264_qpel_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,int w,int h){\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
do {\
int srcB,srcA,src0,src1,src2,src3,src4,src5,src6;\
uint8_t *s = src-2;\
@@ -1211,7 +1211,7 @@ static inline void OPNAME ## h264_qpel_h_lowpass(uint8_t *dst, uint8_t *src, int
}\
\
static inline void OPNAME ## h264_qpel_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,int w,int h){\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
do{\
int srcB,srcA,src0,src1,src2,src3,src4,src5,src6;\
uint8_t *s = src-2*srcStride,*d=dst;\
@@ -1264,7 +1264,7 @@ static inline void OPNAME ## h264_qpel_v_lowpass(uint8_t *dst, uint8_t *src, int
}\
\
static inline void OPNAME ## h264_qpel_hv_lowpass(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride,int w,int h){\
uint8_t *cm = cropTbl + MAX_NEG_CROP;\
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
int i;\
src -= 2*srcStride;\
i= h+5; \
@@ -1559,7 +1559,7 @@ H264_MC(avg_, 16)
#endif

static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

do{
int src_1,src0,src1,src2,src3,src4,src5,src6,src7,src8,src9;
@@ -1589,7 +1589,7 @@ static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int
}

static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

do{
int src_1,src0,src1,src2,src3,src4,src5,src6,src7,src8,src9;


+ 5
- 5
libavcodec/simple_idct.c View File

@@ -184,7 +184,7 @@ static inline void idctSparseColPut (uint8_t *dest, int line_size,
DCTELEM * col)
{
int a0, a1, a2, a3, b0, b1, b2, b3;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

/* XXX: I did that only to give same values as previous code */
a0 = W4 * (col[8*0] + ((1<<(COL_SHIFT-1))/W4));
@@ -256,7 +256,7 @@ static inline void idctSparseColAdd (uint8_t *dest, int line_size,
DCTELEM * col)
{
int a0, a1, a2, a3, b0, b1, b2, b3;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

/* XXX: I did that only to give same values as previous code */
a0 = W4 * (col[8*0] + ((1<<(COL_SHIFT-1))/W4));
@@ -431,7 +431,7 @@ void simple_idct(DCTELEM *block)
static inline void idct4col(uint8_t *dest, int line_size, const DCTELEM *col)
{
int c0, c1, c2, c3, a0, a1, a2, a3;
const uint8_t *cm = cropTbl + MAX_NEG_CROP;
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

a0 = col[8*0];
a1 = col[8*2];
@@ -511,7 +511,7 @@ void simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block)
static inline void idct4col_add(uint8_t *dest, int line_size, const DCTELEM *col)
{
int c0, c1, c2, c3, a0, a1, a2, a3;
const uint8_t *cm = cropTbl + MAX_NEG_CROP;
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

a0 = col[8*0];
a1 = col[8*1];
@@ -539,7 +539,7 @@ static inline void idct4col_add(uint8_t *dest, int line_size, const DCTELEM *col
static inline void idct4row(DCTELEM *row)
{
int c0, c1, c2, c3, a0, a1, a2, a3;
//const uint8_t *cm = cropTbl + MAX_NEG_CROP;
//const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

a0 = row[0];
a1 = row[1];


+ 1
- 1
libavcodec/svq3.c View File

@@ -147,7 +147,7 @@ static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp){
static void svq3_add_idct_c (uint8_t *dst, DCTELEM *block, int stride, int qp, int dc){
const int qmul= svq3_dequant_coeff[qp];
int i;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

if (dc) {
dc = 13*13*((dc == 1) ? 1538*block[0] : ((qmul*(block[0] >> 3)) / 2));


+ 1
- 1
libavcodec/vp3dsp.c View File

@@ -42,7 +42,7 @@
static always_inline void idct(uint8_t *dst, int stride, int16_t *input, int type)
{
int16_t *ip = input;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;

int A, B, C, D, Ad, Bd, Cd, Dd, E, F, G, H;
int Ed, Gd, Add, Bdd, Fd, Hd;


+ 1
- 1
libavformat/grab.c View File

@@ -760,7 +760,7 @@ static int aiw_read_picture(VideoData *s, uint8_t *data)
movq_m2r(rounder,mm6);
pxor_r2r(mm7,mm7);
#else
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
#endif

/* read two fields and deinterlace them */


+ 1
- 1
vhook/fish.c View File

@@ -230,7 +230,7 @@ static void get_hsv(HSV *hsv, int r, int g, int b)
void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, int height, int64_t pts)
{
ContextInfo *ci = (ContextInfo *) ctx;
uint8_t *cm = cropTbl + MAX_NEG_CROP;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
int rowsize = picture->linesize[0];

#if 0


Write Preview
Loading…
Cancel
Save