[llvm-commits] CVS: llvm-test/MultiSource/Applications/JM/lencod/cabac.c global.h loopFilter.c mbuffer.h md_high.c md_highfast.c md_highloss.c md_low.c me_epzs.c me_epzs.h me_fullfast.c me_umhex.c me_umhex.h mode_decision.c mode_decision.h mv-search.c rdopt.c sei.c sei.h transform8x8.c
Lauro Ramos Venancio
lauro.venancio at gmail.com
Fri Mar 23 18:33:33 PDT 2007
Changes in directory llvm-test/MultiSource/Applications/JM/lencod:
cabac.c updated: 1.4 -> 1.5
global.h updated: 1.4 -> 1.5
loopFilter.c updated: 1.4 -> 1.5
mbuffer.h updated: 1.4 -> 1.5
md_high.c updated: 1.2 -> 1.3
md_highfast.c updated: 1.2 -> 1.3
md_highloss.c updated: 1.2 -> 1.3
md_low.c updated: 1.2 -> 1.3
me_epzs.c updated: 1.2 -> 1.3
me_epzs.h updated: 1.2 -> 1.3
me_fullfast.c updated: 1.2 -> 1.3
me_umhex.c updated: 1.2 -> 1.3
me_umhex.h updated: 1.2 -> 1.3
mode_decision.c updated: 1.4 -> 1.5
mode_decision.h updated: 1.4 -> 1.5
mv-search.c updated: 1.4 -> 1.5
rdopt.c updated: 1.4 -> 1.5
sei.c updated: 1.4 -> 1.5
sei.h updated: 1.4 -> 1.5
transform8x8.c updated: 1.4 -> 1.5
---
Log message:
"The C standards do say that "char" may either be a "signed char" or "unsigned
char" and it is up to the compilers implementation or the platform which is
followed."
http://www.arm.linux.org.uk/docs/faqs/signedchar.php
---
Diffs of the changes: (+80 -80)
cabac.c | 2 +-
global.h | 28 ++++++++++++++--------------
loopFilter.c | 6 +++---
mbuffer.h | 8 ++++----
md_high.c | 6 +++---
md_highfast.c | 4 ++--
md_highloss.c | 4 ++--
md_low.c | 6 +++---
me_epzs.c | 6 +++---
me_epzs.h | 4 ++--
me_fullfast.c | 2 +-
me_umhex.c | 2 +-
me_umhex.h | 2 +-
mode_decision.c | 10 +++++-----
mode_decision.h | 14 +++++++-------
mv-search.c | 18 +++++++++---------
rdopt.c | 24 ++++++++++++------------
sei.c | 4 ++--
sei.h | 4 ++--
transform8x8.c | 6 +++---
20 files changed, 80 insertions(+), 80 deletions(-)
Index: llvm-test/MultiSource/Applications/JM/lencod/cabac.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/cabac.c:1.4 llvm-test/MultiSource/Applications/JM/lencod/cabac.c:1.5
--- llvm-test/MultiSource/Applications/JM/lencod/cabac.c:1.4 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/cabac.c Fri Mar 23 20:33:11 2007
@@ -689,7 +689,7 @@
int a, b;
int act_ctx;
int act_sym;
- char** refframe_array = enc_picture->ref_idx[se->value2];
+ signed char** refframe_array = enc_picture->ref_idx[se->value2];
int bslice = (img->type==B_SLICE);
Index: llvm-test/MultiSource/Applications/JM/lencod/global.h
diff -u llvm-test/MultiSource/Applications/JM/lencod/global.h:1.4 llvm-test/MultiSource/Applications/JM/lencod/global.h:1.5
--- llvm-test/MultiSource/Applications/JM/lencod/global.h:1.4 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/global.h Fri Mar 23 20:33:11 2007
@@ -368,8 +368,8 @@
int mb_type;
int mvd[2][BLOCK_MULTIPLE][BLOCK_MULTIPLE][2]; //!< indices correspond to [list][block_y][block_x][x,y]
- char intra_pred_modes[MB_BLOCK_PARTITIONS];
- char intra_pred_modes8x8[MB_BLOCK_PARTITIONS]; //!< four 8x8 blocks in a macroblock
+ signed char intra_pred_modes[MB_BLOCK_PARTITIONS];
+ signed char intra_pred_modes8x8[MB_BLOCK_PARTITIONS]; //!< four 8x8 blocks in a macroblock
int cbp ;
int64 cbp_blk ; //!< 1 bit set for every 4x4 block with coefs (not implemented for INTRA)
int b8mode[4];
@@ -539,8 +539,8 @@
imgpel **imgY_com; //!< Encoded luma images
imgpel ***imgUV_com; //!< Encoded croma images
-char ***direct_ref_idx; //!< direct mode reference index buffer
-char **direct_pdir; //!< direct mode reference index buffer
+signed char ***direct_ref_idx; //!< direct mode reference index buffer
+signed char **direct_pdir; //!< direct mode reference index buffer
// Buffers for rd optimization with packet losses, Dim. Kontopodis
byte **pixel_map; //!< Shows the latest reference frame that is reliable for each pixel
@@ -556,7 +556,7 @@
char errortext[ET_SIZE]; //!< buffer for error message for exit with error()
// Residue Color Transform
-char b8_ipredmode8x8[4][4], b8_intra_pred_modes8x8[16];
+signed char b8_ipredmode8x8[4][4], b8_intra_pred_modes8x8[16];
//! Info for the "decoders-in-the-encoder" used for rdoptimization with packet losses
typedef struct
@@ -899,8 +899,8 @@
int mb_y_upd;
int mb_y_intra; //!< which GOB to intra code
int block_c_x; //!< current block chroma vertical
- char **ipredmode; //!< intra prediction mode
- char **ipredmode8x8; //!< help storage for 8x8 modes, inserted by YV
+ signed char **ipredmode; //!< intra prediction mode
+ signed char **ipredmode8x8; //!< help storage for 8x8 modes, inserted by YV
int cod_counter; //!< Current count of number of skipped macroblocks in a row
int ***nz_coeff; //!< number of coefficients per block (CAVLC)
@@ -1161,15 +1161,15 @@
short bi_pred_me;
int b8mode[4], b8pdir[4];
- char **ipredmode;
- char intra_pred_modes[16];
- char intra_pred_modes8x8[16];
+ signed char **ipredmode;
+ signed char intra_pred_modes[16];
+ signed char intra_pred_modes8x8[16];
int cbp;
int64 cbp_blk;
int mode;
short ******pred_mv; //!< predicted motion vectors
short ******all_mv; //!< all modes motion vectors
- char refar[2][4][4]; //!< reference frame array [list][y][x]
+ signed char refar[2][4][4];//!< reference frame array [list][y][x]
int i16offset;
int c_ipred_mode;
@@ -1205,9 +1205,9 @@
int resTrans_B_8x8[16][16];
int mprRGB_8x8[3][16][16];
short part8x8mode[4];
- char part8x8pdir[4];
- char part8x8fwref[4];
- char part8x8bwref[4];
+ signed char part8x8pdir[4];
+ signed char part8x8fwref[4];
+ signed char part8x8bwref[4];
imgpel rec_mbY8x8[16][16];
imgpel mpr8x8[16][16];
int lrec[16][16]; // transform and quantized coefficients will be stored here for SP frames
Index: llvm-test/MultiSource/Applications/JM/lencod/loopFilter.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/loopFilter.c:1.4 llvm-test/MultiSource/Applications/JM/lencod/loopFilter.c:1.5
--- llvm-test/MultiSource/Applications/JM/lencod/loopFilter.c:1.4 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/loopFilter.c Fri Mar 23 20:33:11 2007
@@ -51,7 +51,7 @@
{ 0, 9,12,18,18},{ 0,10,13,20,20},{ 0,11,15,23,23},{ 0,13,17,25,25}
} ;
-static const char chroma_edge[2][4][4] = //[dir][edge][yuv_format]
+static const signed char chroma_edge[2][4][4] = //[dir][edge][yuv_format]
{ { {-1, 0, 0, 0},
{-1,-1,-1, 1},
{-1, 1, 1, 2},
@@ -221,8 +221,8 @@
int blk_x, blk_x2, blk_y, blk_y2 ;
short ***list0_mv = enc_picture->mv[LIST_0];
short ***list1_mv = enc_picture->mv[LIST_1];
- char **list0_refIdxArr = enc_picture->ref_idx[LIST_0];
- char **list1_refIdxArr = enc_picture->ref_idx[LIST_1];
+ signed char **list0_refIdxArr = enc_picture->ref_idx[LIST_0];
+ signed char **list1_refIdxArr = enc_picture->ref_idx[LIST_1];
int64 **list0_refPicIdArr = enc_picture->ref_pic_id[LIST_0];
int64 **list1_refPicIdArr = enc_picture->ref_pic_id[LIST_1];
int64 ref_p0,ref_p1,ref_q0,ref_q1;
Index: llvm-test/MultiSource/Applications/JM/lencod/mbuffer.h
diff -u llvm-test/MultiSource/Applications/JM/lencod/mbuffer.h:1.4 llvm-test/MultiSource/Applications/JM/lencod/mbuffer.h:1.5
--- llvm-test/MultiSource/Applications/JM/lencod/mbuffer.h:1.4 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/mbuffer.h Fri Mar 23 20:33:11 2007
@@ -56,7 +56,7 @@
byte * mb_field; //!< field macroblock indicator
- char *** ref_idx; //!< reference picture [list][subblock_y][subblock_x]
+ signed char *** ref_idx; //!< reference picture [list][subblock_y][subblock_x]
int64 *** ref_pic_id; //!< reference picture identifier [list][subblock_y][subblock_x]
// (not simply index)
@@ -91,21 +91,21 @@
int64 ref_pic_num[6][MAX_LIST_SIZE];
- char *** ref_idx; //!< reference picture [list][subblock_y][subblock_x]
+ signed char *** ref_idx; //!< reference picture [list][subblock_y][subblock_x]
int64 *** ref_pic_id; //!< reference picture identifier [list][subblock_y][subblock_x]
short **** mv; //!< motion vector [list][subblock_x][subblock_y][component]
byte ** moving_block;
// Top field params
int64 top_ref_pic_num[6][MAX_LIST_SIZE];
- char *** top_ref_idx; //!< reference picture [list][subblock_y][subblock_x]
+ signed char *** top_ref_idx; //!< reference picture [list][subblock_y][subblock_x]
int64 *** top_ref_pic_id; //!< reference picture identifier [list][subblock_y][subblock_x]
short **** top_mv; //!< motion vector [list][subblock_x][subblock_y][component]
byte ** top_moving_block;
// Bottom field params
int64 bottom_ref_pic_num[6][MAX_LIST_SIZE];
- char *** bottom_ref_idx; //!< reference picture [list][subblock_y][subblock_x]
+ signed char *** bottom_ref_idx; //!< reference picture [list][subblock_y][subblock_x]
int64 *** bottom_ref_pic_id; //!< reference picture identifier [list][subblock_y][subblock_x]
short **** bottom_mv; //!< motion vector [list][subblock_x][subblock_y][component]
byte ** bottom_moving_block;
Index: llvm-test/MultiSource/Applications/JM/lencod/md_high.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/md_high.c:1.2 llvm-test/MultiSource/Applications/JM/lencod/md_high.c:1.3
--- llvm-test/MultiSource/Applications/JM/lencod/md_high.c:1.2 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/md_high.c Fri Mar 23 20:33:11 2007
@@ -40,10 +40,10 @@
{
int max_index;
int block, index, mode, i, j, ctr16x16, MEPos;
- char best_pdir;
+ signed char best_pdir;
RD_PARAMS enc_mb;
double min_rdcost, max_rdcost=1e30;
- char best_ref[2] = {0, -1};
+ signed char best_ref[2] = {0, -1};
int bmcost[5] = {INT_MAX};
int cost=0;
int min_cost = INT_MAX, cost_direct=0, have_direct=0, i16mode=0;
@@ -338,7 +338,7 @@
//--- for INTER16x16 check all prediction directions ---
if (mode==1 && bslice)
{
- best8x8pdir[1][0] = best8x8pdir[1][1] = best8x8pdir[1][2] = best8x8pdir[1][3] = (char) ctr16x16;
+ best8x8pdir[1][0] = best8x8pdir[1][1] = best8x8pdir[1][2] = best8x8pdir[1][3] = (signed char) ctr16x16;
if ( (bslice) && (input->BiPredMotionEstimation)
&& (ctr16x16 == 2 && img->bi_pred_me[mode] < 2 && mode == 1))
Index: llvm-test/MultiSource/Applications/JM/lencod/md_highfast.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/md_highfast.c:1.2 llvm-test/MultiSource/Applications/JM/lencod/md_highfast.c:1.3
--- llvm-test/MultiSource/Applications/JM/lencod/md_highfast.c:1.2 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/md_highfast.c Fri Mar 23 20:33:11 2007
@@ -41,10 +41,10 @@
int max_index;
int rerun, block, index, mode, i, j, k, ctr16x16, MEPos;
- char best_pdir;
+ signed char best_pdir;
RD_PARAMS enc_mb;
double min_rdcost, max_rdcost=1e30;
- char best_ref[2] = {0, -1};
+ signed char best_ref[2] = {0, -1};
int bmcost[5] = {INT_MAX};
int cost=0;
int min_cost = INT_MAX, cost_direct=0, have_direct=0, i16mode=0;
Index: llvm-test/MultiSource/Applications/JM/lencod/md_highloss.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/md_highloss.c:1.2 llvm-test/MultiSource/Applications/JM/lencod/md_highloss.c:1.3
--- llvm-test/MultiSource/Applications/JM/lencod/md_highloss.c:1.2 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/md_highloss.c Fri Mar 23 20:33:11 2007
@@ -41,10 +41,10 @@
int max_index;
int rerun, block, index, mode, i, j, ctr16x16, MEPos;
- char best_pdir;
+ signed char best_pdir;
RD_PARAMS enc_mb;
double min_rdcost = 0, max_rdcost=1e30;
- char best_ref[2] = {0, -1};
+ signed char best_ref[2] = {0, -1};
int bmcost[5] = {INT_MAX};
int cost=0;
int min_cost = INT_MAX, cost_direct=0, have_direct=0, i16mode=0;
Index: llvm-test/MultiSource/Applications/JM/lencod/md_low.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/md_low.c:1.2 llvm-test/MultiSource/Applications/JM/lencod/md_low.c:1.3
--- llvm-test/MultiSource/Applications/JM/lencod/md_low.c:1.2 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/md_low.c Fri Mar 23 20:33:11 2007
@@ -45,9 +45,9 @@
{
int block, mode, i, j, k, dummy, MEPos;
- char best_pdir;
+ signed char best_pdir;
RD_PARAMS enc_mb;
- char best_ref[2] = {0, -1};
+ signed char best_ref[2] = {0, -1};
int bmcost[5] = {INT_MAX};
int cost=0;
int min_cost = INT_MAX, cost_direct=0, have_direct=0, i16mode=0;
@@ -65,7 +65,7 @@
int prev_mb_nr = FmoGetPreviousMBNr(img->current_mb_nr);
Macroblock* prevMB = (prev_mb_nr >= 0) ? &img->mb_data[prev_mb_nr]:NULL ;
- char **ipredmodes = img->ipredmode;
+ signed char **ipredmodes = img->ipredmode;
short *allmvs = img->all_mv[0][0][0][0][0];
int ****i4p; //for non-RD-opt. mode
Index: llvm-test/MultiSource/Applications/JM/lencod/me_epzs.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/me_epzs.c:1.2 llvm-test/MultiSource/Applications/JM/lencod/me_epzs.c:1.3
--- llvm-test/MultiSource/Applications/JM/lencod/me_epzs.c:1.2 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/me_epzs.c Fri Mar 23 20:33:11 2007
@@ -1063,7 +1063,7 @@
int list,
int list_offset,
short ref,
- char **refPic,
+ signed char **refPic,
short ***tmp_mv,
EPZSStructure * predictor)
{
@@ -1499,7 +1499,7 @@
short ref, // <-- reference picture
int list, // <-- reference list
int list_offset, // <-- offset for Mbaff
- char ***refPic, // <-- reference array
+ signed char ***refPic, // <-- reference array
short ****tmp_mv, // <-- mv array
int pic_pix_x, // <-- absolute x-coordinate of regarded AxB block
int pic_pix_y, // <-- absolute y-coordinate of regarded AxB block
@@ -1967,7 +1967,7 @@
short ref, // <-- reference picture
int list, // <-- reference list
int list_offset, // <-- offset for Mbaff
- char ***refPic, // <-- reference array
+ signed char ***refPic, // <-- reference array
short ****tmp_mv, // <-- mv array
int pic_pix_x, // <-- absolute x-coordinate of regarded AxB block
int pic_pix_y, // <-- absolute y-coordinate of regarded AxB block
Index: llvm-test/MultiSource/Applications/JM/lencod/me_epzs.h
diff -u llvm-test/MultiSource/Applications/JM/lencod/me_epzs.h:1.2 llvm-test/MultiSource/Applications/JM/lencod/me_epzs.h:1.3
--- llvm-test/MultiSource/Applications/JM/lencod/me_epzs.h:1.2 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/me_epzs.h Fri Mar 23 20:33:11 2007
@@ -71,10 +71,10 @@
extern void EPZSDelete (void);
extern void EPZSOutputStats(FILE *stat,short stats_file);
extern void EPZSSliceInit(EPZSColocParams* p, StorablePicture **listX[6]);
-extern int EPZSPelBlockMotionSearch (imgpel *, short, int, int, char ***, short ****,
+extern int EPZSPelBlockMotionSearch (imgpel *, short, int, int, signed char ***, short ****,
int, int, int, short[2], short[2], int, int, int);
-extern int EPZSBiPredBlockMotionSearch (imgpel *, short, int, int, char ***, short ****,
+extern int EPZSBiPredBlockMotionSearch (imgpel *, short, int, int, signed char ***, short ****,
int, int, int, short*, short *,
short[2], short[2], int, int, int);
Index: llvm-test/MultiSource/Applications/JM/lencod/me_fullfast.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/me_fullfast.c:1.2 llvm-test/MultiSource/Applications/JM/lencod/me_fullfast.c:1.3
--- llvm-test/MultiSource/Applications/JM/lencod/me_fullfast.c:1.2 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/me_fullfast.c Fri Mar 23 20:33:11 2007
@@ -46,7 +46,7 @@
static distpel *****BlockSAD; //!< SAD for all blocksize, ref. frames and motion vectors
static int **max_search_range;
-extern void SetMotionVectorPredictor (short pmv[2], char **refPic,
+extern void SetMotionVectorPredictor (short pmv[2], signed char **refPic,
short ***tmp_mv, short ref_frame,
int list, int block_x,
int block_y, int blockshape_x,
Index: llvm-test/MultiSource/Applications/JM/lencod/me_umhex.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/me_umhex.c:1.2 llvm-test/MultiSource/Applications/JM/lencod/me_umhex.c:1.3
--- llvm-test/MultiSource/Applications/JM/lencod/me_umhex.c:1.2 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/me_umhex.c Fri Mar 23 20:33:11 2007
@@ -1293,7 +1293,7 @@
************************************************************************
*/
void UMHEXSetMotionVectorPredictor (short pmv[2],
- char **refPic,
+ signed char **refPic,
short ***tmp_mv,
short ref_frame,
int list,
Index: llvm-test/MultiSource/Applications/JM/lencod/me_umhex.h
diff -u llvm-test/MultiSource/Applications/JM/lencod/me_umhex.h:1.2 llvm-test/MultiSource/Applications/JM/lencod/me_umhex.h:1.3
--- llvm-test/MultiSource/Applications/JM/lencod/me_umhex.h:1.2 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/me_umhex.h Fri Mar 23 20:33:11 2007
@@ -184,7 +184,7 @@
int lambda_factor // <-- lagrangian parameter for determining motion cost
);
-void UMHEXSetMotionVectorPredictor (short pmv[2], char **refPic, short ***tmp_mv,
+void UMHEXSetMotionVectorPredictor (short pmv[2], signed char **refPic, short ***tmp_mv,
short ref_frame, int list, int block_x, int block_y,
int blockshape_x, int blockshape_y, int *search_range);
Index: llvm-test/MultiSource/Applications/JM/lencod/mode_decision.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/mode_decision.c:1.4 llvm-test/MultiSource/Applications/JM/lencod/mode_decision.c:1.5
--- llvm-test/MultiSource/Applications/JM/lencod/mode_decision.c:1.4 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/mode_decision.c Fri Mar 23 20:33:11 2007
@@ -298,7 +298,7 @@
* computation of prediction list (including biprediction) cost
*************************************************************************************
*/
-void list_prediction_cost(int list, int block, int mode, RD_PARAMS enc_mb, int bmcost[5], char best_ref[2])
+void list_prediction_cost(int list, int block, int mode, RD_PARAMS enc_mb, int bmcost[5], signed char best_ref[2])
{
short ref;
int mcost;
@@ -325,7 +325,7 @@
if (mcost < bmcost[list])
{
bmcost[list] = mcost;
- best_ref[list] = (char)ref;
+ best_ref[list] = (signed char)ref;
}
}
}
@@ -379,7 +379,7 @@
* Determination of prediction list based on simple distortion computation
*************************************************************************************
*/
-void determine_prediction_list(int mode, int bmcost[5], char best_ref[2], char *best_pdir, int *cost, short *bi_pred_me)
+void determine_prediction_list(int mode, int bmcost[5], signed char best_ref[2], signed char *best_pdir, int *cost, short *bi_pred_me)
{
if ((!input->BiPredMotionEstimation) || (mode != 1))
{
@@ -607,8 +607,8 @@
short pdir;
short bi_pred_me;
- char best_pdir = 0;
- char best_ref[2] = {0, -1};
+ signed char best_pdir = 0;
+ signed char best_ref[2] = {0, -1};
#ifdef BEST_NZ_COEFF
int best_nz_coeff[2][2];
#endif
Index: llvm-test/MultiSource/Applications/JM/lencod/mode_decision.h
diff -u llvm-test/MultiSource/Applications/JM/lencod/mode_decision.h:1.4 llvm-test/MultiSource/Applications/JM/lencod/mode_decision.h:1.5
--- llvm-test/MultiSource/Applications/JM/lencod/mode_decision.h:1.4 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/mode_decision.h Fri Mar 23 20:33:11 2007
@@ -40,14 +40,14 @@
extern int delta_qp_mbaff[2][2],delta_qp_mbaff[2][2];
// Residue Color Transform
-extern char b4_ipredmode[16], b4_intra_pred_modes[16];
+extern signed char b4_ipredmode[16], b4_intra_pred_modes[16];
extern short bi_pred_me;
extern short best_mode;
extern short best8x8mode [4]; // [block]
-extern char best8x8pdir [MAXMODE][4]; // [mode][block]
-extern char best8x8fwref[MAXMODE][4]; // [mode][block]
-extern char best8x8bwref[MAXMODE][4]; // [mode][block]
+extern signed char best8x8pdir [MAXMODE][4]; // [mode][block]
+extern signed char best8x8fwref[MAXMODE][4]; // [mode][block]
+extern signed char best8x8bwref[MAXMODE][4]; // [mode][block]
extern imgpel pred[16][16];
extern void set_stored_macroblock_parameters (void);
@@ -57,7 +57,7 @@
extern void SetModesAndRefframeForBlocks (int);
extern void SetRefAndMotionVectors (int, int, int, int, int);
extern void StoreNewMotionVectorsBlock8x8(int, int, int, int, int, int, int);
-extern void assign_enc_picture_params(int, char, int, int, int, int, int);
+extern void assign_enc_picture_params(int, signed char, int, int, int, int, int);
extern void update_refresh_map(int intra, int intra1, Macroblock *currMB);
extern void SetMotionVectorsMB (Macroblock*, int);
extern void SetCoeffAndReconstruction8x8 (Macroblock*);
@@ -77,8 +77,8 @@
void rc_store_diff(int cpix_x, int cpix_y, imgpel prediction[16][16]);
void submacroblock_mode_decision(RD_PARAMS, RD_8x8DATA *, Macroblock *,int ***, int *, short, int, int *, int *, int *, int);
void init_enc_mb_params(Macroblock* currMB, RD_PARAMS *enc_mb, int intra, int bslice);
-void list_prediction_cost(int list, int block, int mode, RD_PARAMS enc_mb, int bmcost[5], char best_ref[2]);
-void determine_prediction_list(int, int [5], char [2], char *, int *, short *);
+void list_prediction_cost(int list, int block, int mode, RD_PARAMS enc_mb, int bmcost[5], signed char best_ref[2]);
+void determine_prediction_list(int, int [5], signed char [2], signed char *, int *, short *);
void compute_mode_RD_cost(int mode, Macroblock *currMB, RD_PARAMS enc_mb,
double *min_rdcost, double *min_rate,
int i16mode, short bslice, short *inter_skip);
Index: llvm-test/MultiSource/Applications/JM/lencod/mv-search.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/mv-search.c:1.4 llvm-test/MultiSource/Applications/JM/lencod/mv-search.c:1.5
--- llvm-test/MultiSource/Applications/JM/lencod/mv-search.c:1.4 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/mv-search.c Fri Mar 23 20:33:11 2007
@@ -66,7 +66,7 @@
static int diff64[64];
static imgpel orig_pic [768];
void SetMotionVectorPredictor (short pmv[2],
- char **refPic,
+ signed char **refPic,
short ***tmp_mv,
short ref_frame,
int list,
@@ -85,7 +85,7 @@
************************************************************************
*/
void SetMotionVectorPredictor (short pmv[2],
- char **refPic,
+ signed char **refPic,
short ***tmp_mv,
short ref_frame,
int list,
@@ -1367,7 +1367,7 @@
static int bx0[5][4] = {{0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,2,0,0}, {0,2,0,2}};
static int by0[5][4] = {{0,0,0,0}, {0,0,0,0}, {0,2,0,0}, {0,0,0,0}, {0,0,2,2}};
- char **ref_array;
+ signed char **ref_array;
short ***mv_array;
short *all_mv;
short ref;
@@ -1459,10 +1459,10 @@
byte ** moving_block;
short **** co_located_mv;
- char *** co_located_ref_idx;
+ signed char *** co_located_ref_idx;
int64 *** co_located_ref_id;
- char ** ref_pic_l0 = enc_picture->ref_idx[LIST_0];
- char ** ref_pic_l1 = enc_picture->ref_idx[LIST_1];
+ signed char ** ref_pic_l0 = enc_picture->ref_idx[LIST_0];
+ signed char ** ref_pic_l1 = enc_picture->ref_idx[LIST_1];
Macroblock *currMB = &img->mb_data[img->current_mb_nr];
if (currMB->list_offset)
@@ -1641,7 +1641,7 @@
{
all_mvs[LIST_0][l0_refX][0][0] = pmvfw[0];
all_mvs[LIST_0][l0_refX][0][1] = pmvfw[1];
- direct_ref_idx[LIST_0][pic_block_y][pic_block_x]= (char)l0_refX;
+ direct_ref_idx[LIST_0][pic_block_y][pic_block_x]= (signed char)l0_refX;
}
}
else
@@ -1657,13 +1657,13 @@
{
all_mvs[LIST_1][0][0][0] = 0;
all_mvs[LIST_1][0][0][1] = 0;
- direct_ref_idx[LIST_1][pic_block_y][pic_block_x]= (char)l1_refX;
+ direct_ref_idx[LIST_1][pic_block_y][pic_block_x]= (signed char)l1_refX;
}
else
{
all_mvs[LIST_1][l1_refX][0][0] = pmvbw[0];
all_mvs[LIST_1][l1_refX][0][1] = pmvbw[1];
- direct_ref_idx[LIST_1][pic_block_y][pic_block_x]= (char)l1_refX;
+ direct_ref_idx[LIST_1][pic_block_y][pic_block_x]= (signed char)l1_refX;
}
}
else
Index: llvm-test/MultiSource/Applications/JM/lencod/rdopt.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/rdopt.c:1.4 llvm-test/MultiSource/Applications/JM/lencod/rdopt.c:1.5
--- llvm-test/MultiSource/Applications/JM/lencod/rdopt.c:1.4 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/rdopt.c Fri Mar 23 20:33:12 2007
@@ -86,12 +86,12 @@
int cbp, cbp8x8, cnt_nonz_8x8;
int64 cbp_blk;
int cbp_blk8x8;
-char frefframe[4][4], brefframe[4][4];
+signed char frefframe[4][4], brefframe[4][4];
int b8mode[4], b8pdir[4];
short best8x8mode [4]; // [block]
-char best8x8pdir [MAXMODE][4]; // [mode][block]
-char best8x8fwref [MAXMODE][4]; // [mode][block]
-char best8x8bwref [MAXMODE][4]; // [mode][block]
+signed char best8x8pdir [MAXMODE][4]; // [mode][block]
+signed char best8x8fwref [MAXMODE][4]; // [mode][block]
+signed char best8x8bwref [MAXMODE][4]; // [mode][block]
CSptr cs_mb=NULL, cs_b8=NULL, cs_cm=NULL, cs_imb=NULL, cs_ib8=NULL, cs_ib4=NULL, cs_pc=NULL;
@@ -124,7 +124,7 @@
//Adaptive Rounding update function
void update_offset_params(int mode, int luma_transform_size_8x8_flag);
-char b4_ipredmode[16], b4_intra_pred_modes[16];
+signed char b4_ipredmode[16], b4_intra_pred_modes[16];
/*!
************************************************************************
@@ -544,8 +544,8 @@
int left_available, up_available, all_available;
- char upMode;
- char leftMode;
+ signed char upMode;
+ signed char leftMode;
int mostProbableMode;
PixelPos left_block;
@@ -685,9 +685,9 @@
cbp_bits |= (int64)(best_coded_block_flag<<bit_pos);
#endif
//===== set intra mode prediction =====
- img->ipredmode[pic_block_y][pic_block_x] = (char) best_ipmode;
+ img->ipredmode[pic_block_y][pic_block_x] = (signed char) best_ipmode;
img->mb_data[img->current_mb_nr].intra_pred_modes[4*b8+b4] =
- (char) (mostProbableMode == best_ipmode ? -1 : (best_ipmode < mostProbableMode ? best_ipmode : best_ipmode-1));
+ (signed char) (mostProbableMode == best_ipmode ? -1 : (best_ipmode < mostProbableMode ? best_ipmode : best_ipmode-1));
if (!input->rdopt)
{
@@ -1927,7 +1927,7 @@
int bframe = (img->type==B_SLICE);
int i, j, k, ****i4p, ***i3p;
int block_x, block_y;
- char **ipredmodes = img->ipredmode;
+ signed char **ipredmodes = img->ipredmode;
short *cur_mv;
//===== reconstruction values =====
@@ -2758,7 +2758,7 @@
Macroblock *currMB = &img->mb_data[img->current_mb_nr];
int mode = best_mode;
int bframe = (img->type==B_SLICE);
- char **ipredmodes = img->ipredmode;
+ signed char **ipredmodes = img->ipredmode;
//===== reconstruction values =====
@@ -2906,7 +2906,7 @@
}
}
-void assign_enc_picture_params(int mode, char best_pdir, int block, int list_offset, int best_fw_ref, int best_bw_ref, int bframe)
+void assign_enc_picture_params(int mode, signed char best_pdir, int block, int list_offset, int best_fw_ref, int best_bw_ref, int bframe)
{
int i,j;
int block_x, block_y;
Index: llvm-test/MultiSource/Applications/JM/lencod/sei.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/sei.c:1.4 llvm-test/MultiSource/Applications/JM/lencod/sei.c:1.5
--- llvm-test/MultiSource/Applications/JM/lencod/sei.c:1.4 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/sei.c Fri Mar 23 20:33:12 2007
@@ -1350,7 +1350,7 @@
for(i = 0; i < total_byte; i++)
{
temp_data = i * 4;
- seiUser_data_unregistered.byte[i] = (char) iClip3(0, 255, temp_data);
+ seiUser_data_unregistered.byte[i] = (signed char) iClip3(0, 255, temp_data);
}
seiUser_data_unregistered.total_byte = total_byte;
}
@@ -1469,7 +1469,7 @@
for(i = 0; i < total_byte; i++)
{
temp_data = i * 3;
- seiUser_data_registered_itu_t_t35.byte[i] = (char) iClip3(0, 255, temp_data);
+ seiUser_data_registered_itu_t_t35.byte[i] = (signed char) iClip3(0, 255, temp_data);
}
seiUser_data_registered_itu_t_t35.total_byte = total_byte;
}
Index: llvm-test/MultiSource/Applications/JM/lencod/sei.h
diff -u llvm-test/MultiSource/Applications/JM/lencod/sei.h:1.4 llvm-test/MultiSource/Applications/JM/lencod/sei.h:1.5
--- llvm-test/MultiSource/Applications/JM/lencod/sei.h:1.4 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/sei.h Fri Mar 23 20:33:12 2007
@@ -208,7 +208,7 @@
//! User_data_unregistered Information
typedef struct
{
- char *byte;
+ signed char *byte;
int total_byte;
Bitstream *data;
int payloadSize;
@@ -226,7 +226,7 @@
//! User_data_registered_itu_t_t35 Information
typedef struct
{
- char *byte;
+ signed char *byte;
int total_byte;
int itu_t_t35_country_code;
int itu_t_t35_country_code_extension_byte;
Index: llvm-test/MultiSource/Applications/JM/lencod/transform8x8.c
diff -u llvm-test/MultiSource/Applications/JM/lencod/transform8x8.c:1.4 llvm-test/MultiSource/Applications/JM/lencod/transform8x8.c:1.5
--- llvm-test/MultiSource/Applications/JM/lencod/transform8x8.c:1.4 Thu Feb 8 17:05:31 2007
+++ llvm-test/MultiSource/Applications/JM/lencod/transform8x8.c Fri Mar 23 20:33:12 2007
@@ -258,8 +258,8 @@
int fadjust8x8[2][16][16];
int left_available, up_available, all_available;
- char upMode;
- char leftMode;
+ signed char upMode;
+ signed char leftMode;
int mostProbableMode;
PixelPos left_block;
@@ -364,7 +364,7 @@
}
//===== set intra mode prediction =====
- img->ipredmode8x8[pic_block_y][pic_block_x] = (char) best_ipmode;
+ img->ipredmode8x8[pic_block_y][pic_block_x] = (signed char) best_ipmode;
currMB->intra_pred_modes8x8[4*b8] = (mostProbableMode == best_ipmode)
? -1
: (best_ipmode < mostProbableMode ? best_ipmode : best_ipmode-1);
More information about the llvm-commits
mailing list