virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'

Browse Source 
* commit '05563ccacc98fd185affdbf8cbaf094caf36b852':
  dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names

Conflicts:
	libavcodec/bit_depth_template.c
	libavcodec/motionpixels_tablegen.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-14 00:38:47 +01:00
commit 6016b8329b
20 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/bfin/vp3_bfin.c
View File

@ -30,7 +30,7 @@
/* Intra iDCT offset 128 */ /* Intra iDCT offset 128 */
static void bfin_vp3_idct_put(uint8_t *dest, int line_size, int16_t *block) static void bfin_vp3_idct_put(uint8_t *dest, int line_size, int16_t *block)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP + 128; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP + 128;
int i,j; int i,j;
ff_bfin_vp3_idct (block); 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 */ /* Inter iDCT */
static void bfin_vp3_idct_add(uint8_t *dest, int line_size, int16_t *block) static void bfin_vp3_idct_add(uint8_t *dest, int line_size, int16_t *block)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int i, j; int i, j;
ff_bfin_vp3_idct (block); ff_bfin_vp3_idct (block);

2
libavcodec/cavs.c
View File

@ -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 x, y, ia;
int ih = 0; int ih = 0;
int iv = 0; int iv = 0;
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
for (x = 0; x < 4; x++) { for (x = 0; x < 4; x++) {
ih += (x + 1) * (top[5 + x] - top[3 - x]); ih += (x + 1) * (top[5 + x] - top[3 - x]);

8
libavcodec/cavsdsp.c
View File

@ -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) { static void cavs_idct8_add_c(uint8_t *dst, int16_t *block, int stride) {
int i; int i;
int16_t (*src)[8] = (int16_t(*)[8])block; int16_t (*src)[8] = (int16_t(*)[8])block;
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
src[0][0] += 8; 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) \ #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){\ static void OPNAME ## cavs_filt8_h_ ## NAME(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int h=8;\ const int h=8;\
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i;\ int i;\
for(i=0; i<h; 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){\ static void OPNAME ## cavs_filt8_v_ ## NAME(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w=8;\ const int w=8;\
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i;\ int i;\
for(i=0; i<w; 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;\ int16_t *tmp = temp;\
const int h=8;\ const int h=8;\
const int w=8;\ const int w=8;\
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i;\ int i;\
src1 -= 2*srcStride;\ src1 -= 2*srcStride;\
for(i=0; i<h+5; i++)\ for(i=0; i<h+5; i++)\

24
libavcodec/dsputil.c
View File

@ -43,7 +43,7 @@
#include "config.h" #include "config.h"
#include "diracdsp.h" #include "diracdsp.h"
uint32_t ff_squareTbl[512] = { 0, }; uint32_t ff_square_tab[512] = { 0, };
#define BIT_DEPTH 16 #define BIT_DEPTH 16
#include "dsputil_template.c" #include "dsputil_template.c"
@ -186,7 +186,7 @@ static int pix_sum_c(uint8_t *pix, int line_size)
static int pix_norm1_c(uint8_t *pix, int line_size) static int pix_norm1_c(uint8_t *pix, int line_size)
{ {
int s = 0, i, j; int s = 0, i, j;
uint32_t *sq = ff_squareTbl + 256; uint32_t *sq = ff_square_tab + 256;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
for (j = 0; j < 16; j += 8) { for (j = 0; j < 16; j += 8) {
@ -257,7 +257,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) static int sse4_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
int s = 0, i; int s = 0, i;
uint32_t *sq = ff_squareTbl + 256; uint32_t *sq = ff_square_tab + 256;
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
s += sq[pix1[0] - pix2[0]]; s += sq[pix1[0] - pix2[0]];
@ -273,7 +273,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) static int sse8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
int s = 0, i; int s = 0, i;
uint32_t *sq = ff_squareTbl + 256; uint32_t *sq = ff_square_tab + 256;
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
s += sq[pix1[0] - pix2[0]]; s += sq[pix1[0] - pix2[0]];
@ -293,7 +293,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) static int sse16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
int s = 0, i; int s = 0, i;
uint32_t *sq = ff_squareTbl + 256; uint32_t *sq = ff_square_tab + 256;
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
s += sq[pix1[0] - pix2[0]]; s += sq[pix1[0] - pix2[0]];
@ -884,7 +884,7 @@ static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, \
int dstStride, int srcStride, \ int dstStride, int srcStride, \
int h) \ int h) \
{ \ { \
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \
int i; \ int i; \
\ \
for (i = 0; i < h; i++) { \ for (i = 0; i < h; i++) { \
@ -904,7 +904,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, \ static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, \
int dstStride, int srcStride) \ int dstStride, int srcStride) \
{ \ { \
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \
const int w = 8; \ const int w = 8; \
int i; \ int i; \
\ \
@ -935,7 +935,7 @@ static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, \
int dstStride, int srcStride, \ int dstStride, int srcStride, \
int h) \ int h) \
{ \ { \
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \
int i; \ int i; \
\ \
for (i = 0; i < h; i++) { \ for (i = 0; i < h; i++) { \
@ -963,7 +963,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, \ static void OPNAME ## mpeg4_qpel16_v_lowpass(uint8_t *dst, uint8_t *src, \
int dstStride, int srcStride) \ int dstStride, int srcStride) \
{ \ { \
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \
const int w = 16; \ const int w = 16; \
int i; \ int i; \
\ \
@ -1569,7 +1569,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, static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src,
int dstStride, int srcStride, int h) int dstStride, int srcStride, int h)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int i; int i;
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
@ -1656,7 +1656,7 @@ DIRAC_MC(avg)
static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src,
int dstStride, int srcStride, int w) int dstStride, int srcStride, int w)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int i; int i;
for (i = 0; i < w; i++) { for (i = 0; i < w; i++) {
@ -2858,7 +2858,7 @@ av_cold void ff_dsputil_static_init(void)
int i; int i;
for (i = 0; i < 512; i++) for (i = 0; i < 512; i++)
ff_squareTbl[i] = (i - 256) * (i - 256); ff_square_tab[i] = (i - 256) * (i - 256);
} }
int ff_check_alignment(void) int ff_check_alignment(void)

4
libavcodec/dsputil.h
View File

@ -43,8 +43,8 @@ extern const uint8_t ff_zigzag248_direct[64];
#define MAX_NEG_CROP 1024 #define MAX_NEG_CROP 1024
/* temporary */ /* temporary */
extern uint32_t ff_squareTbl[512]; extern uint32_t ff_square_tab[512];
extern const uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP]; 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_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_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);

2
libavcodec/dvbsubdec.c
View File

@ -31,7 +31,7 @@
#define DVBSUB_DISPLAYDEFINITION_SEGMENT 0x14 #define DVBSUB_DISPLAYDEFINITION_SEGMENT 0x14
#define DVBSUB_DISPLAY_SEGMENT 0x80 #define DVBSUB_DISPLAY_SEGMENT 0x80
#define cm (ff_cropTbl + MAX_NEG_CROP) #define cm (ff_crop_tab + MAX_NEG_CROP)
#ifdef DEBUG #ifdef DEBUG
#if 0 #if 0

2
libavcodec/dvdsubdec.c
View File

@ -46,7 +46,7 @@ typedef struct DVDSubContext
static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *rgba, int num_values) 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_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
uint8_t r, g, b; uint8_t r, g, b;
int i, y, cb, cr; int i, y, cb, cr;
int r_add, g_add, b_add; int r_add, g_add, b_add;

4
libavcodec/error_resilience.c
View File

@ -238,7 +238,7 @@ static void h_block_filter(ERContext *s, uint8_t *dst, int w,
int h, int stride, int is_luma) int h, int stride, int is_luma)
{ {
int b_x, b_y, mvx_stride, mvy_stride; int b_x, b_y, mvx_stride, mvy_stride;
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
set_mv_strides(s, &mvx_stride, &mvy_stride); set_mv_strides(s, &mvx_stride, &mvy_stride);
mvx_stride >>= is_luma; mvx_stride >>= is_luma;
mvy_stride *= mvx_stride; mvy_stride *= mvx_stride;
@ -306,7 +306,7 @@ static void v_block_filter(ERContext *s, uint8_t *dst, int w, int h,
int stride, int is_luma) int stride, int is_luma)
{ {
int b_x, b_y, mvx_stride, mvy_stride; int b_x, b_y, mvx_stride, mvy_stride;
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
set_mv_strides(s, &mvx_stride, &mvy_stride); set_mv_strides(s, &mvx_stride, &mvy_stride);
mvx_stride >>= is_luma; mvx_stride >>= is_luma;
mvy_stride *= mvx_stride; mvy_stride *= mvx_stride;

6
libavcodec/h264pred.c
View File

@ -279,7 +279,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, static void pred4x4_tm_vp8_c(uint8_t *src, const uint8_t *topright,
ptrdiff_t stride) ptrdiff_t stride)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP - src[-1-stride];
uint8_t *top = src-stride; uint8_t *top = src-stride;
int y; int y;
@ -305,7 +305,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) static void pred16x16_tm_vp8_c(uint8_t *src, ptrdiff_t stride)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP - src[-1-stride];
uint8_t *top = src-stride; uint8_t *top = src-stride;
int y; int y;
@ -387,7 +387,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) static void pred8x8_tm_vp8_c(uint8_t *src, ptrdiff_t stride)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP - src[-1-stride];
uint8_t *top = src-stride; uint8_t *top = src-stride;
int y; int y;

4
libavcodec/imgconvert.c
View File

@ -486,7 +486,7 @@ static void deinterlace_line_c(uint8_t *dst,
const uint8_t *lum, const uint8_t *lum,
int size) int size)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int sum; int sum;
for(;size > 0;size--) { for(;size > 0;size--) {
@ -509,7 +509,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_m2, uint8_t *lum_m1,
uint8_t *lum, int size) uint8_t *lum, int size)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int sum; int sum;
for(;size > 0;size--) { for(;size > 0;size--) {

2
libavcodec/mathtables.c
View File

@ -91,7 +91,7 @@ const uint8_t ff_reverse[256] = {
#define times4(x) x, x, x, x #define times4(x) x, x, x, x
#define times256(x) times4(times4(times4(times4(times4(x))))) #define times256(x) times4(times4(times4(times4(times4(x)))))
const uint8_t ff_cropTbl[256 + 2 * 1024] = { const uint8_t ff_crop_tab[256 + 2 * 1024] = {
times256(0x00), times256(0x00),
0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 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, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,

2
libavcodec/motionpixels_tablegen.c
View File

@ -23,7 +23,7 @@
#include <stdlib.h> #include <stdlib.h>
#define CONFIG_HARDCODED_TABLES 0 #define CONFIG_HARDCODED_TABLES 0
#define MAX_NEG_CROP 0 #define MAX_NEG_CROP 0
#define ff_cropTbl ((uint8_t *)NULL) #define ff_crop_tab ((uint8_t *)NULL)
#include "motionpixels_tablegen.h" #include "motionpixels_tablegen.h"
#include "tableprint.h" #include "tableprint.h"

2
libavcodec/motionpixels_tablegen.h
View File

@ -30,7 +30,7 @@ typedef struct YuvPixel {
} YuvPixel; } YuvPixel;
static int mp_yuv_to_rgb(int y, int v, int u, int clip_rgb) { static int mp_yuv_to_rgb(int y, int v, int u, int clip_rgb) {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int r, g, b; int r, g, b;
r = (1000 * y + 701 * v) / 1000; r = (1000 * y + 701 * v) / 1000;

2
libavcodec/mpegvideo_enc.c
View File

@ -2443,7 +2443,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){ static int sse(MpegEncContext *s, uint8_t *src1, uint8_t *src2, int w, int h, int stride){
uint32_t *sq = ff_squareTbl + 256; uint32_t *sq = ff_square_tab + 256;
int acc=0; int acc=0;
int x,y; int x,y;

2
libavcodec/pgssubdec.c
View File

@ -260,7 +260,7 @@ static void parse_palette_segment(AVCodecContext *avctx,
PGSSubContext *ctx = avctx->priv_data; PGSSubContext *ctx = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int color_id; int color_id;
int y, cb, cr, alpha; int y, cb, cr, alpha;
int r, g, b, r_add, g_add, b_add; int r, g, b, r_add, g_add, b_add;

2
libavcodec/rv30.c
View File

@ -132,7 +132,7 @@ static int rv30_decode_mb_info(RV34DecContext *r)
static inline void rv30_weak_loop_filter(uint8_t *src, const int step, static inline void rv30_weak_loop_filter(uint8_t *src, const int step,
const int stride, const int lim) const int stride, const int lim)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int i, diff; int i, diff;
for(i = 0; i < 4; i++){ for(i = 0; i < 4; i++){

12
libavcodec/rv30dsp.c
View File

@ -32,7 +32,7 @@
#define RV30_LOWPASS(OPNAME, OP) \ #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){\ 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 int h = 8;\
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i;\ int i;\
for(i = 0; i < h; 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){\ 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 int w = 8;\
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i;\ int i;\
for(i = 0; i < w; 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){\ static void OPNAME ## rv30_tpel8_hv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w = 8;\ const int w = 8;\
const int h = 8;\ const int h = 8;\
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i, j;\ int i, j;\
for(j = 0; j < h; j++){\ for(j = 0; j < h; j++){\
for(i = 0; i < w; i++){\ 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){\ static void OPNAME ## rv30_tpel8_hhv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w = 8;\ const int w = 8;\
const int h = 8;\ const int h = 8;\
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i, j;\ int i, j;\
for(j = 0; j < h; j++){\ for(j = 0; j < h; j++){\
for(i = 0; i < w; i++){\ 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){\ static void OPNAME ## rv30_tpel8_hvv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w = 8;\ const int w = 8;\
const int h = 8;\ const int h = 8;\
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i, j;\ int i, j;\
for(j = 0; j < h; j++){\ for(j = 0; j < h; j++){\
for(i = 0; i < w; i++){\ 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){\ static void OPNAME ## rv30_tpel8_hhvv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
const int w = 8;\ const int w = 8;\
const int h = 8;\ const int h = 8;\
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i, j;\ int i, j;\
for(j = 0; j < h; j++){\ for(j = 0; j < h; j++){\
for(i = 0; i < w; i++){\ for(i = 0; i < w; i++){\

6
libavcodec/rv40dsp.c
View File

@ -33,7 +33,7 @@
#define RV40_LOWPASS(OPNAME, OP) \ #define RV40_LOWPASS(OPNAME, OP) \
static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ 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 int h, const int C1, const int C2, const int SHIFT){\
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i;\ int i;\
for(i = 0; i < h; i++)\ for(i = 0; i < h; i++)\
{\ {\
@ -52,7 +52,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,\ 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 int w, const int C1, const int C2, const int SHIFT){\
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i;\ int i;\
for(i = 0; i < w; i++)\ for(i = 0; i < w; i++)\
{\ {\
@ -351,7 +351,7 @@ static av_always_inline void rv40_weak_loop_filter(uint8_t *src,
const int lim_q1, const int lim_q1,
const int lim_p1) const int lim_p1)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int i, t, u, diff; int i, t, u, diff;
for (i = 0; i < 4; i++, src += stride) { for (i = 0; i < 4; i++, src += stride) {

2
libavcodec/snowenc.c
View File

@ -167,7 +167,7 @@ static int pix_sum(uint8_t * pix, int line_size, int w, int h)
static int pix_norm1(uint8_t * pix, int line_size, int w) static int pix_norm1(uint8_t * pix, int line_size, int w)
{ {
int s, i, j; int s, i, j;
uint32_t *sq = ff_squareTbl + 256; uint32_t *sq = ff_square_tab + 256;
s = 0; s = 0;
for (i = 0; i < w; i++) { for (i = 0; i < w; i++) {

10
libavcodec/vp8dsp.c
View File

@ -253,7 +253,7 @@ static av_always_inline void filter_common(uint8_t *p, ptrdiff_t stride, int is4
{ {
LOAD_PIXELS LOAD_PIXELS
int a, f1, f2; int a, f1, f2;
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
a = 3*(q0 - p0); a = 3*(q0 - p0);
@ -322,7 +322,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) static av_always_inline void filter_mbedge(uint8_t *p, ptrdiff_t stride)
{ {
int a0, a1, a2, w; int a0, a1, a2, w;
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
LOAD_PIXELS LOAD_PIXELS
@ -455,7 +455,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) \ 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 *filter = subpel_filters[mx-1]; \
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \
int x, y; \ int x, y; \
\ \
for (y = 0; y < h; y++) { \ for (y = 0; y < h; y++) { \
@ -469,7 +469,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) \ 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 *filter = subpel_filters[my-1]; \
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \
int x, y; \ int x, y; \
\ \
for (y = 0; y < h; y++) { \ for (y = 0; y < h; y++) { \
@ -483,7 +483,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) \ 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 *filter = subpel_filters[mx-1]; \
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \
int x, y; \ int x, y; \
uint8_t tmp_array[(2*SIZE+VTAPS-1)*SIZE]; \ uint8_t tmp_array[(2*SIZE+VTAPS-1)*SIZE]; \
uint8_t *tmp = tmp_array; \ uint8_t *tmp = tmp_array; \