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

rename XXX_t enums to cavs_XXX to fix POSIX namespace issue

Browse Source 
Originally committed as revision 16642 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefan Gehrer 2009-01-16 17:45:54 +00:00
parent e685e8eada
commit bef01ca08f
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/cavs.c
View File

@ -71,7 +71,7 @@ static inline int get_bs(cavs_vector *mvP, cavs_vector *mvQ, int b) {
* ---------
*
*/
void ff_cavs_filter(AVSContext *h, enum mb_t mb_type) {
void ff_cavs_filter(AVSContext *h, enum cavs_mb mb_type) {
DECLARE_ALIGNED_8(uint8_t, bs[8]);
int qp_avg, alpha, beta, tc;
int i;
@ -410,7 +410,7 @@ static inline void mc_part_std(AVSContext *h,int square,int chroma_height,int de
}
}
void ff_cavs_inter(AVSContext *h, enum mb_t mb_type) {
void ff_cavs_inter(AVSContext *h, enum cavs_mb mb_type) {
if(ff_cavs_partition_flags[mb_type] == 0){ // 16x16
mc_part_std(h, 1, 8, 0, h->cy, h->cu, h->cv, 0, 0,
h->s.dsp.put_cavs_qpel_pixels_tab[0],
@ -480,8 +480,8 @@ static inline void mv_pred_median(AVSContext *h, cavs_vector *mvP,
}
}
void ff_cavs_mv(AVSContext *h, enum mv_loc_t nP, enum mv_loc_t nC,
enum mv_pred_t mode, enum block_t size, int ref) {
void ff_cavs_mv(AVSContext *h, enum cavs_mv_loc nP, enum cavs_mv_loc nC,
enum cavs_mv_pred mode, enum cavs_block size, int ref) {
cavs_vector *mvP = &h->mv[nP];
cavs_vector *mvA = &h->mv[nP-1];
cavs_vector *mvB = &h->mv[nP-4];

24
libavcodec/cavs.h
View File

@ -55,7 +55,7 @@
#define MV_BWD_OFFS 12
#define MV_STRIDE 4
enum mb_t {
enum cavs_mb {
I_8X8 = 0,
P_SKIP,
P_16X16,
@ -70,14 +70,14 @@ enum mb_t {
B_8X8 = 29
};
enum sub_mb_t {
enum cavs_sub_mb {
B_SUB_DIRECT,
B_SUB_FWD,
B_SUB_BWD,
B_SUB_SYM
};
enum intra_luma_t {
enum cavs_intra_luma {
INTRA_L_VERT,
INTRA_L_HORIZ,
INTRA_L_LP,
@ -88,7 +88,7 @@ enum intra_luma_t {
INTRA_L_DC_128
};
enum intra_chroma_t {
enum cavs_intra_chroma {
INTRA_C_LP,
INTRA_C_HORIZ,
INTRA_C_VERT,
@ -98,7 +98,7 @@ enum intra_chroma_t {
INTRA_C_DC_128,
};
enum mv_pred_t {
enum cavs_mv_pred {
MV_PRED_MEDIAN,
MV_PRED_LEFT,
MV_PRED_TOP,
@ -107,14 +107,14 @@ enum mv_pred_t {
MV_PRED_BSKIP
};
enum block_t {
enum cavs_block {
BLK_16X16,
BLK_16X8,
BLK_8X16,
BLK_8X8
};
enum mv_loc_t {
enum cavs_mv_loc {
MV_FWD_D3 = 0,
MV_FWD_B2,
MV_FWD_B3,
@ -253,7 +253,7 @@ static inline void set_intra_mode_default(AVSContext *h) {
h->top_pred_Y[h->mbx*2+0] = h->top_pred_Y[h->mbx*2+1] = INTRA_L_LP;
}
static inline void set_mvs(cavs_vector *mv, enum block_t size) {
static inline void set_mvs(cavs_vector *mv, enum cavs_block size) {
switch(size) {
case BLK_16X16:
mv[MV_STRIDE ] = mv[0];
@ -296,14 +296,14 @@ static inline int dequant(AVSContext *h, DCTELEM *level_buf, uint8_t *run_buf,
return 0;
}
void ff_cavs_filter(AVSContext *h, enum mb_t mb_type);
void ff_cavs_filter(AVSContext *h, enum cavs_mb mb_type);
void ff_cavs_load_intra_pred_luma(AVSContext *h, uint8_t *top, uint8_t **left,
int block);
void ff_cavs_load_intra_pred_chroma(AVSContext *h);
void ff_cavs_modify_mb_i(AVSContext *h, int *pred_mode_uv);
void ff_cavs_inter(AVSContext *h, enum mb_t mb_type);
void ff_cavs_mv(AVSContext *h, enum mv_loc_t nP, enum mv_loc_t nC,
enum mv_pred_t mode, enum block_t size, int ref);
void ff_cavs_inter(AVSContext *h, enum cavs_mb mb_type);
void ff_cavs_mv(AVSContext *h, enum cavs_mv_loc nP, enum cavs_mv_loc nC,
enum cavs_mv_pred mode, enum cavs_block size, int ref);
void ff_cavs_init_mb(AVSContext *h);
int ff_cavs_next_mb(AVSContext *h);
void ff_cavs_init_pic(AVSContext *h);

10
libavcodec/cavsdec.c
View File

@ -77,7 +77,7 @@ static inline void mv_pred_direct(AVSContext *h, cavs_vector *pmv_fw,
pmv_bw->y = m-(((den+(den*col_mv->y*pmv_bw->dist^m)-m-1)>>14)^m);
}
static inline void mv_pred_sym(AVSContext *h, cavs_vector *src, enum block_t size) {
static inline void mv_pred_sym(AVSContext *h, cavs_vector *src, enum cavs_block size) {
cavs_vector *dst = src + MV_BWD_OFFS;
/* backward mv is the scaled and negated forward mv */
@ -252,7 +252,7 @@ static int decode_mb_i(AVSContext *h, int cbp_code) {
return 0;
}
static void decode_mb_p(AVSContext *h, enum mb_t mb_type) {
static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type) {
GetBitContext *gb = &h->s.gb;
int ref[4];
@ -296,9 +296,9 @@ static void decode_mb_p(AVSContext *h, enum mb_t mb_type) {
*h->col_type = mb_type;
}
static void decode_mb_b(AVSContext *h, enum mb_t mb_type) {
static void decode_mb_b(AVSContext *h, enum cavs_mb mb_type) {
int block;
enum sub_mb_t sub_type[4];
enum cavs_sub_mb sub_type[4];
int flags;
ff_cavs_init_mb(h);
@ -447,7 +447,7 @@ static inline void check_for_slice(AVSContext *h) {
static int decode_pic(AVSContext *h) {
MpegEncContext *s = &h->s;
int skip_count;
enum mb_t mb_type;
enum cavs_mb mb_type;
if (!s->context_initialized) {
s->avctx->idct_algo = FF_IDCT_CAVS;