[FFmpeg-cvslog] r16642 - in trunk/libavcodec: cavs.c cavs.h cavsdec.c
stefang
subversion
Fri Jan 16 18:45:54 CET 2009
Author: stefang
Date: Fri Jan 16 18:45:54 2009
New Revision: 16642
Log:
rename XXX_t enums to cavs_XXX to fix POSIX namespace issue
Modified:
trunk/libavcodec/cavs.c
trunk/libavcodec/cavs.h
trunk/libavcodec/cavsdec.c
Modified: trunk/libavcodec/cavs.c
==============================================================================
--- trunk/libavcodec/cavs.c Fri Jan 16 18:20:17 2009 (r16641)
+++ trunk/libavcodec/cavs.c Fri Jan 16 18:45:54 2009 (r16642)
@@ -71,7 +71,7 @@ static inline int get_bs(cavs_vector *mv
* ---------
*
*/
-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(AVSContex
}
}
-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(AVSCon
}
}
-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];
Modified: trunk/libavcodec/cavs.h
==============================================================================
--- trunk/libavcodec/cavs.h Fri Jan 16 18:20:17 2009 (r16641)
+++ trunk/libavcodec/cavs.h Fri Jan 16 18:45:54 2009 (r16642)
@@ -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_defaul
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,
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);
Modified: trunk/libavcodec/cavsdec.c
==============================================================================
--- trunk/libavcodec/cavsdec.c Fri Jan 16 18:20:17 2009 (r16641)
+++ trunk/libavcodec/cavsdec.c Fri Jan 16 18:45:54 2009 (r16642)
@@ -77,7 +77,7 @@ static inline void mv_pred_direct(AVSCon
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, in
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, e
*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(AVSCo
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;
More information about the ffmpeg-cvslog
mailing list