cosmetics ;)

prefixing all functions with pp_ to avoid namespace issues


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7962 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael 2002-10-29 18:51:52 +00:00
parent 0f1d6aabec
commit 8b2f3eb5e4
3 changed files with 15 additions and 16 deletions

View File

@ -25,13 +25,13 @@ struct vf_priv_s {
static int config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
unsigned int voflags, unsigned int outfmt){
vf->priv->context= getPPContext(width, height);
vf->priv->context= pp_get_context(width, height);
return vf_next_config(vf,width,height,d_width,d_height,voflags,vf->priv->outfmt);
}
static void uninit(struct vf_instance_s* vf){
if(vf->priv->context) freePPContext(vf->priv->context);
if(vf->priv->context) pp_free_context(vf->priv->context);
}
static int query_format(struct vf_instance_s* vf, unsigned int fmt){
@ -89,7 +89,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
if(vf->priv->pp || !(mpi->flags&MP_IMGFLAG_DIRECT)){
// do the postprocessing! (or copy if no DR)
postprocess(mpi->planes ,mpi->stride,
pp_postprocess(mpi->planes ,mpi->stride,
vf->priv->dmpi->planes,vf->priv->dmpi->stride,
(mpi->w+7)&(~7),mpi->h,
mpi->qscale, mpi->qstride,
@ -132,7 +132,7 @@ static int open(vf_instance_t *vf, char* args){
if(args){
if(!strcmp("help", args)){
printf("%s", postproc_help);
printf("%s", pp_help);
exit(1);
}
@ -147,7 +147,7 @@ static int open(vf_instance_t *vf, char* args){
if(name){
for(i=0; i<=GET_PP_QUALITY_MAX; i++){
vf->priv->ppMode[i]= getPPModeByNameAndQuality(name, i);
vf->priv->ppMode[i]= pp_get_mode_by_name_and_quality(name, i);
if(vf->priv->ppMode[i].error) return -1;
}
}else{

View File

@ -587,7 +587,7 @@ char *postproc_help=
* name is the string after "-pp" on the command line
* quality is a number from 0 to GET_PP_QUALITY_MAX
*/
struct PPMode getPPModeByNameAndQuality(char *name, int quality)
struct PPMode pp_get_mode_by_name_and_quality(char *name, int quality)
{
char temp[GET_MODE_BUFFER_SIZE];
char *p= temp;
@ -765,7 +765,7 @@ struct PPMode getPPModeByNameAndQuality(char *name, int quality)
return ppMode;
}
void *getPPContext(int width, int height){
void *pp_get_context(int width, int height){
PPContext *c= memalign(32, sizeof(PPContext));
int i;
int mbWidth = (width+15)>>4;
@ -799,7 +799,7 @@ void *getPPContext(int width, int height){
return c;
}
void freePPContext(void *vc){
void pp_free_context(void *vc){
PPContext *c = (PPContext*)vc;
int i;
@ -844,7 +844,7 @@ void revertPPOpt(void *conf, char* opt)
}
void postprocess(uint8_t * src[3], int srcStride[3],
void pp_postprocess(uint8_t * src[3], int srcStride[3],
uint8_t * dst[3], int dstStride[3],
int width, int height,
QP_STORE_T *QP_store, int QPStride,

View File

@ -64,8 +64,9 @@
#define QP_STORE_T int
char *postproc_help;
char *pp_help;
//FIXME decide if this should be exported at all
typedef struct PPMode{
int lumMode; //acivates filters for luminance
int chromMode; //acivates filters for chrominance
@ -82,18 +83,16 @@ typedef struct PPMode{
int forcedQuant; // quantizer if FORCE_QUANT is used
} PPMode;
void postprocess(uint8_t * src[3], int srcStride[3],
void pp_postprocess(uint8_t * src[3], int srcStride[3],
uint8_t * dst[3], int dstStride[3],
int horizontalSize, int verticalSize,
QP_STORE_T *QP_store, int QP_stride,
PPMode *mode, void *ppContext, int pict_type);
// name is the stuff after "-pp" on the command line
PPMode getPPModeByNameAndQuality(char *name, int quality);
PPMode pp_get_mode_by_name_and_quality(char *name, int quality);
void *getPPContext(int width, int height);
void freePPContext(void *ppContext);
int readPPOpt(void *conf, char *arg);
void *pp_get_context(int width, int height);
void pp_free_context(void *ppContext);
#endif