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

Avoid POSIX reserved _t suffix.

Browse Source 
Originally committed as revision 16060 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-12-11 19:36:25 +00:00
parent 259037d099
commit c9bea488fe
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libavcodec/roqvideoenc.c
View File

@ -190,20 +190,20 @@ typedef struct
int subCels[4]; int subCels[4];
motion_vect motion; motion_vect motion;
int cbEntry; int cbEntry;
} subcel_evaluation_t; } SubcelEvaluation;
typedef struct typedef struct
{ {
int eval_dist[4]; int eval_dist[4];
int best_coding; int best_coding;
subcel_evaluation_t subCels[4]; SubcelEvaluation subCels[4];
motion_vect motion; motion_vect motion;
int cbEntry; int cbEntry;
int sourceX, sourceY; int sourceX, sourceY;
} cel_evaluation_t; } CelEvaluation;
typedef struct typedef struct
{ {
@ -214,14 +214,14 @@ typedef struct
uint8_t unpacked_cb2[MAX_CBS_2x2*2*2*3]; uint8_t unpacked_cb2[MAX_CBS_2x2*2*2*3];
uint8_t unpacked_cb4[MAX_CBS_4x4*4*4*3]; uint8_t unpacked_cb4[MAX_CBS_4x4*4*4*3];
uint8_t unpacked_cb4_enlarged[MAX_CBS_4x4*8*8*3]; uint8_t unpacked_cb4_enlarged[MAX_CBS_4x4*8*8*3];
} roq_codebooks_t; } RoqCodebooks;
/** /**
* Temporary vars * Temporary vars
*/ */
typedef struct typedef struct
{ {
cel_evaluation_t *cel_evals; CelEvaluation *cel_evals;
int f2i4[MAX_CBS_4x4]; int f2i4[MAX_CBS_4x4];
int i2f4[MAX_CBS_4x4]; int i2f4[MAX_CBS_4x4];
@ -233,20 +233,20 @@ typedef struct
int numCB4; int numCB4;
int numCB2; int numCB2;
roq_codebooks_t codebooks; RoqCodebooks codebooks;
int *closest_cb2; int *closest_cb2;
int used_option[4]; int used_option[4];
} roq_tempdata_t; } RoqTempdata;
/** /**
* Initializes cel evaluators and sets their source coordinates * Initializes cel evaluators and sets their source coordinates
*/ */
static void create_cel_evals(RoqContext *enc, roq_tempdata_t *tempData) static void create_cel_evals(RoqContext *enc, RoqTempdata *tempData)
{ {
int n=0, x, y, i; int n=0, x, y, i;
tempData->cel_evals = av_malloc(enc->width*enc->height/64 * sizeof(cel_evaluation_t)); tempData->cel_evals = av_malloc(enc->width*enc->height/64 * sizeof(CelEvaluation));
/* Map to the ROQ quadtree order */ /* Map to the ROQ quadtree order */
for (y=0; y<enc->height; y+=16) for (y=0; y<enc->height; y+=16)
@ -395,8 +395,8 @@ static void motion_search(RoqContext *enc, int blocksize)
/** /**
* Gets distortion for all options available to a subcel * Gets distortion for all options available to a subcel
*/ */
static void gather_data_for_subcel(subcel_evaluation_t *subcel, int x, static void gather_data_for_subcel(SubcelEvaluation *subcel, int x,
int y, RoqContext *enc, roq_tempdata_t *tempData) int y, RoqContext *enc, RoqTempdata *tempData)
{ {
uint8_t mb4[4*4*3]; uint8_t mb4[4*4*3];
uint8_t mb2[2*2*3]; uint8_t mb2[2*2*3];
@ -459,8 +459,8 @@ static void gather_data_for_subcel(subcel_evaluation_t *subcel, int x,
/** /**
* Gets distortion for all options available to a cel * Gets distortion for all options available to a cel
*/ */
static void gather_data_for_cel(cel_evaluation_t *cel, RoqContext *enc, static void gather_data_for_cel(CelEvaluation *cel, RoqContext *enc,
roq_tempdata_t *tempData) RoqTempdata *tempData)
{ {
uint8_t mb8[8*8*3]; uint8_t mb8[8*8*3];
int index = cel->sourceY*enc->width/64 + cel->sourceX/8; int index = cel->sourceY*enc->width/64 + cel->sourceX/8;
@ -533,7 +533,7 @@ static void gather_data_for_cel(cel_evaluation_t *cel, RoqContext *enc,
} }
} }
static void remap_codebooks(RoqContext *enc, roq_tempdata_t *tempData) static void remap_codebooks(RoqContext *enc, RoqTempdata *tempData)
{ {
int i, j, idx=0; int i, j, idx=0;
@ -565,7 +565,7 @@ static void remap_codebooks(RoqContext *enc, roq_tempdata_t *tempData)
/** /**
* Write codebook chunk * Write codebook chunk
*/ */
static void write_codebooks(RoqContext *enc, roq_tempdata_t *tempData) static void write_codebooks(RoqContext *enc, RoqTempdata *tempData)
{ {
int i, j; int i, j;
uint8_t **outp= &enc->out_buf; uint8_t **outp= &enc->out_buf;
@ -620,7 +620,7 @@ static void write_typecode(CodingSpool *s, uint8_t type)
} }
} }
static void reconstruct_and_encode_image(RoqContext *enc, roq_tempdata_t *tempData, int w, int h, int numBlocks) static void reconstruct_and_encode_image(RoqContext *enc, RoqTempdata *tempData, int w, int h, int numBlocks)
{ {
int i, j, k; int i, j, k;
int x, y; int x, y;
@ -628,7 +628,7 @@ static void reconstruct_and_encode_image(RoqContext *enc, roq_tempdata_t *tempDa
int dist=0; int dist=0;
roq_qcell *qcell; roq_qcell *qcell;
cel_evaluation_t *eval; CelEvaluation *eval;
CodingSpool spool; CodingSpool spool;
@ -789,7 +789,7 @@ static void create_clusters(AVFrame *frame, int w, int h, uint8_t *yuvClusters)
} }
} }
static void generate_codebook(RoqContext *enc, roq_tempdata_t *tempdata, static void generate_codebook(RoqContext *enc, RoqTempdata *tempdata,
int *points, int inputCount, roq_cell *results, int *points, int inputCount, roq_cell *results,
int size, int cbsize) int size, int cbsize)
{ {
@ -824,10 +824,10 @@ static void generate_codebook(RoqContext *enc, roq_tempdata_t *tempdata,
av_free(codebook); av_free(codebook);
} }
static void generate_new_codebooks(RoqContext *enc, roq_tempdata_t *tempData) static void generate_new_codebooks(RoqContext *enc, RoqTempdata *tempData)
{ {
int i,j; int i,j;
roq_codebooks_t *codebooks = &tempData->codebooks; RoqCodebooks *codebooks = &tempData->codebooks;
int max = enc->width*enc->height/16; int max = enc->width*enc->height/16;
uint8_t mb2[3*4]; uint8_t mb2[3*4];
roq_cell *results4 = av_malloc(sizeof(roq_cell)*MAX_CBS_4x4*4); roq_cell *results4 = av_malloc(sizeof(roq_cell)*MAX_CBS_4x4*4);
@ -880,7 +880,7 @@ static void generate_new_codebooks(RoqContext *enc, roq_tempdata_t *tempData)
static void roq_encode_video(RoqContext *enc) static void roq_encode_video(RoqContext *enc)
{ {
roq_tempdata_t tempData; RoqTempdata tempData;
int i; int i;
memset(&tempData, 0, sizeof(tempData)); memset(&tempData, 0, sizeof(tempData));