Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
05563cca
Commit
05563cca
authored
Dec 22, 2013
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names
Also switch from "tbl" to "tab" name suffixes.
parent
635ec127
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
51 additions
and
51 deletions
+51
-51
vp3_bfin.c
libavcodec/bfin/vp3_bfin.c
+2
-2
bit_depth_template.c
libavcodec/bit_depth_template.c
+1
-1
cavs.c
libavcodec/cavs.c
+1
-1
cavsdsp.c
libavcodec/cavsdsp.c
+4
-4
dsputil.c
libavcodec/dsputil.c
+12
-12
dsputil.h
libavcodec/dsputil.h
+2
-2
dvbsubdec.c
libavcodec/dvbsubdec.c
+1
-1
dvdsubdec.c
libavcodec/dvdsubdec.c
+1
-1
error_resilience.c
libavcodec/error_resilience.c
+2
-2
h264pred.c
libavcodec/h264pred.c
+3
-3
imgconvert.c
libavcodec/imgconvert.c
+2
-2
mathtables.c
libavcodec/mathtables.c
+1
-1
motionpixels_tablegen.c
libavcodec/motionpixels_tablegen.c
+1
-1
motionpixels_tablegen.h
libavcodec/motionpixels_tablegen.h
+1
-1
mpegvideo_enc.c
libavcodec/mpegvideo_enc.c
+1
-1
pgssubdec.c
libavcodec/pgssubdec.c
+1
-1
rv30.c
libavcodec/rv30.c
+1
-1
rv30dsp.c
libavcodec/rv30dsp.c
+6
-6
rv40dsp.c
libavcodec/rv40dsp.c
+3
-3
vp8dsp.c
libavcodec/vp8dsp.c
+5
-5
No files found.
libavcodec/bfin/vp3_bfin.c
View file @
05563cca
...
...
@@ -30,7 +30,7 @@
/* Intra iDCT offset 128 */
static
void
bfin_vp3_idct_put
(
uint8_t
*
dest
,
int
line_size
,
int16_t
*
block
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
+
128
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
+
128
;
int
i
,
j
;
ff_bfin_vp3_idct
(
block
);
...
...
@@ -45,7 +45,7 @@ static void bfin_vp3_idct_put(uint8_t *dest, int line_size, int16_t *block)
/* Inter iDCT */
static
void
bfin_vp3_idct_add
(
uint8_t
*
dest
,
int
line_size
,
int16_t
*
block
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
int
i
,
j
;
ff_bfin_vp3_idct
(
block
);
...
...
libavcodec/bit_depth_template.c
View file @
05563cca
...
...
@@ -70,7 +70,7 @@
# define pixel4 uint32_t
# define dctcoef int16_t
# define INIT_CLIP const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;
# define INIT_CLIP const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;
# define no_rnd_avg_pixel4 no_rnd_avg32
# define rnd_avg_pixel4 rnd_avg32
# define AV_RN2P AV_RN16
...
...
libavcodec/cavs.c
View file @
05563cca
...
...
@@ -275,7 +275,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
;
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
for
(
x
=
0
;
x
<
4
;
x
++
)
{
ih
+=
(
x
+
1
)
*
(
top
[
5
+
x
]
-
top
[
3
-
x
]);
...
...
libavcodec/cavsdsp.c
View file @
05563cca
...
...
@@ -186,7 +186,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
,
int16_t
*
block
,
int
stride
)
{
int
i
;
int16_t
(
*
src
)[
8
]
=
(
int16_t
(
*
)[
8
])
block
;
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
src
[
0
][
0
]
+=
8
;
...
...
@@ -261,7 +261,7 @@ static void cavs_idct8_add_c(uint8_t *dst, int16_t *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;\
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;\
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;\
int i;\
for(i=0; i<h; i++)\
{\
...
...
@@ -280,7 +280,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;\
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;\
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;\
int i;\
for(i=0; i<w; i++)\
{\
...
...
@@ -334,7 +334,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;\
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;\
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;\
int i;\
src1 -= 2*srcStride;\
for(i=0; i<h+5; i++)\
...
...
libavcodec/dsputil.c
View file @
05563cca
...
...
@@ -41,7 +41,7 @@
#include "mpegvideo.h"
#include "config.h"
uint32_t
ff_square
Tbl
[
512
]
=
{
0
,
};
uint32_t
ff_square
_tab
[
512
]
=
{
0
,
};
#define BIT_DEPTH 16
#include "dsputil_template.c"
...
...
@@ -184,7 +184,7 @@ static int pix_sum_c(uint8_t *pix, int line_size)
static
int
pix_norm1_c
(
uint8_t
*
pix
,
int
line_size
)
{
int
s
=
0
,
i
,
j
;
uint32_t
*
sq
=
ff_square
Tbl
+
256
;
uint32_t
*
sq
=
ff_square
_tab
+
256
;
for
(
i
=
0
;
i
<
16
;
i
++
)
{
for
(
j
=
0
;
j
<
16
;
j
+=
8
)
{
...
...
@@ -255,7 +255,7 @@ static void bswap16_buf(uint16_t *dst, const uint16_t *src, int len)
static
int
sse4_c
(
void
*
v
,
uint8_t
*
pix1
,
uint8_t
*
pix2
,
int
line_size
,
int
h
)
{
int
s
=
0
,
i
;
uint32_t
*
sq
=
ff_square
Tbl
+
256
;
uint32_t
*
sq
=
ff_square
_tab
+
256
;
for
(
i
=
0
;
i
<
h
;
i
++
)
{
s
+=
sq
[
pix1
[
0
]
-
pix2
[
0
]];
...
...
@@ -271,7 +271,7 @@ static int sse4_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
static
int
sse8_c
(
void
*
v
,
uint8_t
*
pix1
,
uint8_t
*
pix2
,
int
line_size
,
int
h
)
{
int
s
=
0
,
i
;
uint32_t
*
sq
=
ff_square
Tbl
+
256
;
uint32_t
*
sq
=
ff_square
_tab
+
256
;
for
(
i
=
0
;
i
<
h
;
i
++
)
{
s
+=
sq
[
pix1
[
0
]
-
pix2
[
0
]];
...
...
@@ -291,7 +291,7 @@ static int sse8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
static
int
sse16_c
(
void
*
v
,
uint8_t
*
pix1
,
uint8_t
*
pix2
,
int
line_size
,
int
h
)
{
int
s
=
0
,
i
;
uint32_t
*
sq
=
ff_square
Tbl
+
256
;
uint32_t
*
sq
=
ff_square
_tab
+
256
;
for
(
i
=
0
;
i
<
h
;
i
++
)
{
s
+=
sq
[
pix1
[
0
]
-
pix2
[
0
]];
...
...
@@ -820,7 +820,7 @@ static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, \
int dstStride, int srcStride, \
int h) \
{ \
const uint8_t *cm = ff_crop
Tbl + MAX_NEG_CROP;
\
const uint8_t *cm = ff_crop
_tab + MAX_NEG_CROP;
\
int i; \
\
for (i = 0; i < h; i++) { \
...
...
@@ -840,7 +840,7 @@ static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, \
static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, \
int dstStride, int srcStride) \
{ \
const uint8_t *cm = ff_crop
Tbl + MAX_NEG_CROP;
\
const uint8_t *cm = ff_crop
_tab + MAX_NEG_CROP;
\
const int w = 8; \
int i; \
\
...
...
@@ -871,7 +871,7 @@ static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, \
int dstStride, int srcStride, \
int h) \
{ \
const uint8_t *cm = ff_crop
Tbl + MAX_NEG_CROP;
\
const uint8_t *cm = ff_crop
_tab + MAX_NEG_CROP;
\
int i; \
\
for (i = 0; i < h; i++) { \
...
...
@@ -899,7 +899,7 @@ static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, \
static void OPNAME ## mpeg4_qpel16_v_lowpass(uint8_t *dst, uint8_t *src, \
int dstStride, int srcStride) \
{ \
const uint8_t *cm = ff_crop
Tbl + MAX_NEG_CROP;
\
const uint8_t *cm = ff_crop
_tab + MAX_NEG_CROP;
\
const int w = 16; \
int i; \
\
...
...
@@ -1505,7 +1505,7 @@ void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
static
void
wmv2_mspel8_h_lowpass
(
uint8_t
*
dst
,
uint8_t
*
src
,
int
dstStride
,
int
srcStride
,
int
h
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
int
i
;
for
(
i
=
0
;
i
<
h
;
i
++
)
{
...
...
@@ -1547,7 +1547,7 @@ void ff_avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
static
void
wmv2_mspel8_v_lowpass
(
uint8_t
*
dst
,
uint8_t
*
src
,
int
dstStride
,
int
srcStride
,
int
w
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
int
i
;
for
(
i
=
0
;
i
<
w
;
i
++
)
{
...
...
@@ -2710,7 +2710,7 @@ av_cold void ff_dsputil_static_init(void)
int
i
;
for
(
i
=
0
;
i
<
512
;
i
++
)
ff_square
Tbl
[
i
]
=
(
i
-
256
)
*
(
i
-
256
);
ff_square
_tab
[
i
]
=
(
i
-
256
)
*
(
i
-
256
);
}
av_cold
void
ff_dsputil_init
(
DSPContext
*
c
,
AVCodecContext
*
avctx
)
...
...
libavcodec/dsputil.h
View file @
05563cca
...
...
@@ -43,8 +43,8 @@ extern const uint8_t ff_zigzag248_direct[64];
#define MAX_NEG_CROP 1024
/* temporary */
extern
uint32_t
ff_square
Tbl
[
512
];
extern
const
uint8_t
ff_crop
Tbl
[
256
+
2
*
MAX_NEG_CROP
];
extern
uint32_t
ff_square
_tab
[
512
];
extern
const
uint8_t
ff_crop
_tab
[
256
+
2
*
MAX_NEG_CROP
];
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
);
...
...
libavcodec/dvbsubdec.c
View file @
05563cca
...
...
@@ -31,7 +31,7 @@
#define DVBSUB_DISPLAYDEFINITION_SEGMENT 0x14
#define DVBSUB_DISPLAY_SEGMENT 0x80
#define cm (ff_crop
Tbl
+ MAX_NEG_CROP)
#define cm (ff_crop
_tab
+ MAX_NEG_CROP)
#ifdef DEBUG
#if 0
...
...
libavcodec/dvdsubdec.c
View file @
05563cca
...
...
@@ -35,7 +35,7 @@ typedef struct DVDSubContext {
static
void
yuv_a_to_rgba
(
const
uint8_t
*
ycbcr
,
const
uint8_t
*
alpha
,
uint32_t
*
rgba
,
int
num_values
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
uint8_t
r
,
g
,
b
;
int
i
,
y
,
cb
,
cr
;
int
r_add
,
g_add
,
b_add
;
...
...
libavcodec/error_resilience.c
View file @
05563cca
...
...
@@ -221,7 +221,7 @@ static void h_block_filter(ERContext *s, uint8_t *dst, int w,
int
h
,
int
stride
,
int
is_luma
)
{
int
b_x
,
b_y
,
mvx_stride
,
mvy_stride
;
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
set_mv_strides
(
s
,
&
mvx_stride
,
&
mvy_stride
);
mvx_stride
>>=
is_luma
;
mvy_stride
*=
mvx_stride
;
...
...
@@ -289,7 +289,7 @@ static void v_block_filter(ERContext *s, uint8_t *dst, int w, int h,
int
stride
,
int
is_luma
)
{
int
b_x
,
b_y
,
mvx_stride
,
mvy_stride
;
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
set_mv_strides
(
s
,
&
mvx_stride
,
&
mvy_stride
);
mvx_stride
>>=
is_luma
;
mvy_stride
*=
mvx_stride
;
...
...
libavcodec/h264pred.c
View file @
05563cca
...
...
@@ -269,7 +269,7 @@ static void pred4x4_horizontal_up_rv40_nodown_c(uint8_t *src,
static
void
pred4x4_tm_vp8_c
(
uint8_t
*
src
,
const
uint8_t
*
topright
,
ptrdiff_t
stride
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
-
src
[
-
1
-
stride
];
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
-
src
[
-
1
-
stride
];
uint8_t
*
top
=
src
-
stride
;
int
y
;
...
...
@@ -295,7 +295,7 @@ static void pred16x16_plane_rv40_c(uint8_t *src, ptrdiff_t stride)
static
void
pred16x16_tm_vp8_c
(
uint8_t
*
src
,
ptrdiff_t
stride
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
-
src
[
-
1
-
stride
];
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
-
src
[
-
1
-
stride
];
uint8_t
*
top
=
src
-
stride
;
int
y
;
...
...
@@ -377,7 +377,7 @@ static void pred8x8_dc_rv40_c(uint8_t *src, ptrdiff_t stride)
static
void
pred8x8_tm_vp8_c
(
uint8_t
*
src
,
ptrdiff_t
stride
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
-
src
[
-
1
-
stride
];
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
-
src
[
-
1
-
stride
];
uint8_t
*
top
=
src
-
stride
;
int
y
;
...
...
libavcodec/imgconvert.c
View file @
05563cca
...
...
@@ -358,7 +358,7 @@ static void deinterlace_line_c(uint8_t *dst,
const
uint8_t
*
lum
,
int
size
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
int
sum
;
for
(;
size
>
0
;
size
--
)
{
...
...
@@ -381,7 +381,7 @@ static void deinterlace_line_inplace_c(uint8_t *lum_m4, uint8_t *lum_m3,
uint8_t
*
lum_m2
,
uint8_t
*
lum_m1
,
uint8_t
*
lum
,
int
size
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
int
sum
;
for
(;
size
>
0
;
size
--
)
{
...
...
libavcodec/mathtables.c
View file @
05563cca
...
...
@@ -89,7 +89,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
Tbl
[
256
+
2
*
1024
]
=
{
const
uint8_t
ff_crop
_tab
[
256
+
2
*
1024
]
=
{
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
,
...
...
libavcodec/motionpixels_tablegen.c
View file @
05563cca
...
...
@@ -23,7 +23,7 @@
#include <stdlib.h>
#define CONFIG_HARDCODED_TABLES 0
#define MAX_NEG_CROP 0
#define ff_crop
Tbl
((uint8_t *)NULL)
#define ff_crop
_tab
((uint8_t *)NULL)
#include "motionpixels_tablegen.h"
#include "tableprint.h"
...
...
libavcodec/motionpixels_tablegen.h
View file @
05563cca
...
...
@@ -30,7 +30,7 @@ typedef struct YuvPixel {
}
YuvPixel
;
static
int
mp_yuv_to_rgb
(
int
y
,
int
v
,
int
u
,
int
clip_rgb
)
{
static
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
static
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
int
r
,
g
,
b
;
r
=
(
1000
*
y
+
701
*
v
)
/
1000
;
...
...
libavcodec/mpegvideo_enc.c
View file @
05563cca
...
...
@@ -2292,7 +2292,7 @@ static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegE
}
static
int
sse
(
MpegEncContext
*
s
,
uint8_t
*
src1
,
uint8_t
*
src2
,
int
w
,
int
h
,
int
stride
){
uint32_t
*
sq
=
ff_square
Tbl
+
256
;
uint32_t
*
sq
=
ff_square
_tab
+
256
;
int
acc
=
0
;
int
x
,
y
;
...
...
libavcodec/pgssubdec.c
View file @
05563cca
...
...
@@ -237,7 +237,7 @@ static void parse_palette_segment(AVCodecContext *avctx,
PGSSubContext
*
ctx
=
avctx
->
priv_data
;
const
uint8_t
*
buf_end
=
buf
+
buf_size
;
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
int
color_id
;
int
y
,
cb
,
cr
,
alpha
;
int
r
,
g
,
b
,
r_add
,
g_add
,
b_add
;
...
...
libavcodec/rv30.c
View file @
05563cca
...
...
@@ -127,7 +127,7 @@ static int rv30_decode_mb_info(RV34DecContext *r)
static
inline
void
rv30_weak_loop_filter
(
uint8_t
*
src
,
const
int
step
,
const
int
stride
,
const
int
lim
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
int
i
,
diff
;
for
(
i
=
0
;
i
<
4
;
i
++
){
...
...
libavcodec/rv30dsp.c
View file @
05563cca
...
...
@@ -32,7 +32,7 @@
#define RV30_LOWPASS(OPNAME, OP) \
static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\
const int h = 8;\
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;\
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;\
int i;\
for(i = 0; i < h; i++)\
{\
...
...
@@ -51,7 +51,7 @@ static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src,
\
static void OPNAME ## rv30_tpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\
const int w = 8;\
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;\
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;\
int i;\
for(i = 0; i < w; i++)\
{\
...
...
@@ -82,7 +82,7 @@ static void OPNAME ## rv30_tpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstSt
static void OPNAME ## rv30_tpel8_hv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w = 8;\
const int h = 8;\
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;\
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;\
int i, j;\
for(j = 0; j < h; j++){\
for(i = 0; i < w; i++){\
...
...
@@ -101,7 +101,7 @@ static void OPNAME ## rv30_tpel8_hv_lowpass(uint8_t *dst, uint8_t *src, int dstS
static void OPNAME ## rv30_tpel8_hhv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w = 8;\
const int h = 8;\
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;\
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;\
int i, j;\
for(j = 0; j < h; j++){\
for(i = 0; i < w; i++){\
...
...
@@ -120,7 +120,7 @@ static void OPNAME ## rv30_tpel8_hhv_lowpass(uint8_t *dst, uint8_t *src, int dst
static void OPNAME ## rv30_tpel8_hvv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w = 8;\
const int h = 8;\
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;\
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;\
int i, j;\
for(j = 0; j < h; j++){\
for(i = 0; i < w; i++){\
...
...
@@ -139,7 +139,7 @@ static void OPNAME ## rv30_tpel8_hvv_lowpass(uint8_t *dst, uint8_t *src, int dst
static void OPNAME ## rv30_tpel8_hhvv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w = 8;\
const int h = 8;\
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;\
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;\
int i, j;\
for(j = 0; j < h; j++){\
for(i = 0; i < w; i++){\
...
...
libavcodec/rv40dsp.c
View file @
05563cca
...
...
@@ -32,7 +32,7 @@
#define RV40_LOWPASS(OPNAME, OP) \
static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\
const int h, const int C1, const int C2, const int SHIFT){\
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;\
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;\
int i;\
for(i = 0; i < h; i++)\
{\
...
...
@@ -51,7 +51,7 @@ static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src,
\
static void OPNAME ## rv40_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\
const int w, const int C1, const int C2, const int SHIFT){\
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP;\
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP;\
int i;\
for(i = 0; i < w; i++)\
{\
...
...
@@ -350,7 +350,7 @@ static av_always_inline void rv40_weak_loop_filter(uint8_t *src,
const
int
lim_q1
,
const
int
lim_p1
)
{
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
int
i
,
t
,
u
,
diff
;
for
(
i
=
0
;
i
<
4
;
i
++
,
src
+=
stride
)
{
...
...
libavcodec/vp8dsp.c
View file @
05563cca
...
...
@@ -160,7 +160,7 @@ static av_always_inline void filter_common(uint8_t *p, ptrdiff_t stride, int is4
{
LOAD_PIXELS
int
a
,
f1
,
f2
;
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
a
=
3
*
(
q0
-
p0
);
...
...
@@ -215,7 +215,7 @@ static av_always_inline int hev(uint8_t *p, ptrdiff_t stride, int thresh)
static
av_always_inline
void
filter_mbedge
(
uint8_t
*
p
,
ptrdiff_t
stride
)
{
int
a0
,
a1
,
a2
,
w
;
const
uint8_t
*
cm
=
ff_crop
Tbl
+
MAX_NEG_CROP
;
const
uint8_t
*
cm
=
ff_crop
_tab
+
MAX_NEG_CROP
;
LOAD_PIXELS
...
...
@@ -337,7 +337,7 @@ PUT_PIXELS(4)
static void put_vp8_epel ## SIZE ## _h ## TAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \
{ \
const uint8_t *filter = subpel_filters[mx-1]; \
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP; \
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP; \
int x, y; \
\
for (y = 0; y < h; y++) { \
...
...
@@ -351,7 +351,7 @@ static void put_vp8_epel ## SIZE ## _h ## TAPS ## _c(uint8_t *dst, ptrdiff_t dst
static void put_vp8_epel ## SIZE ## _v ## TAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \
{ \
const uint8_t *filter = subpel_filters[my-1]; \
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP; \
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP; \
int x, y; \
\
for (y = 0; y < h; y++) { \
...
...
@@ -365,7 +365,7 @@ static void put_vp8_epel ## SIZE ## _v ## TAPS ## _c(uint8_t *dst, ptrdiff_t dst
static void put_vp8_epel ## SIZE ## _h ## HTAPS ## v ## VTAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \
{ \
const uint8_t *filter = subpel_filters[mx-1]; \
const uint8_t *cm = ff_crop
Tbl
+ MAX_NEG_CROP; \
const uint8_t *cm = ff_crop
_tab
+ MAX_NEG_CROP; \
int x, y; \
uint8_t tmp_array[(2*SIZE+VTAPS-1)*SIZE]; \
uint8_t *tmp = tmp_array; \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment