aboutsummaryrefslogtreecommitdiffstats
path: root/postproc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-10-30 20:50:33 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-10-30 20:50:33 +0000
commit4407a3c47a1c39271e563df784616e4c1a0a41ca (patch)
treea1802c2e02e6b68928e30765cbbb532e2c7f9997 /postproc
parent6b72ac6323ec656fd0df6460ef844c83b5e76433 (diff)
downloadffmpeg-4407a3c47a1c39271e563df784616e4c1a0a41ca.tar.gz
change qscale type to int8 and fix qscale ordering
Originally committed as revision 7985 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
Diffstat (limited to 'postproc')
-rw-r--r--postproc/postprocess.c2
-rw-r--r--postproc/postprocess.h12
-rw-r--r--postproc/postprocess_template.c4
3 files changed, 10 insertions, 8 deletions
diff --git a/postproc/postprocess.c b/postproc/postprocess.c
index c804e1d568..42c8fc820c 100644
--- a/postproc/postprocess.c
+++ b/postproc/postprocess.c
@@ -535,7 +535,7 @@ static inline void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int
/* -pp Command line Help
*/
-char *postproc_help=
+char *pp_help=
"-npp <filterName>[:<option>[:<option>...]][,[-]<filterName>[:<option>...]]...\n"
"long form example:\n"
"-npp vdeblock:autoq,hdeblock:autoq,linblenddeint -npp default,-vdeblock\n"
diff --git a/postproc/postprocess.h b/postproc/postprocess.h
index 4caba6d4e2..36f3566b6a 100644
--- a/postproc/postprocess.h
+++ b/postproc/postprocess.h
@@ -62,9 +62,11 @@
//filters on
//#define COMPILE_TIME_MODE 0x77
-#define QP_STORE_T int
+#define QP_STORE_T int8_t
-char *pp_help;
+typedef void pp_context;
+
+extern char *pp_help;
//FIXME decide if this should be exported at all
typedef struct PPMode{
@@ -88,13 +90,13 @@ 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);
+ PPMode *mode, pp_context *ppContext, int pict_type);
// name is the stuff after "-pp" on the command line
PPMode pp_get_mode_by_name_and_quality(char *name, int quality);
-void *pp_get_context(int width, int height);
-void pp_free_context(void *ppContext);
+pp_context *pp_get_context(int width, int height);
+void pp_free_context(pp_context *ppContext);
int pp_init(int cpuCaps);
#define PP_CPU_CAPS_MMX 0x80000000
diff --git a/postproc/postprocess_template.c b/postproc/postprocess_template.c
index d9cdb658c0..efaaad7c47 100644
--- a/postproc/postprocess_template.c
+++ b/postproc/postprocess_template.c
@@ -2835,8 +2835,8 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int
uint8_t *tempBlock1= c.tempBlocks;
uint8_t *tempBlock2= c.tempBlocks + 8;
#endif
- int *QPptr= isColor ? &QPs[(y>>3)*QPStride] :&QPs[(y>>4)*QPStride];
- int *nonBQPptr= isColor ? &c.nonBQPTable[(y>>3)*mbWidth] :&c.nonBQPTable[(y>>4)*mbWidth];
+ int8_t *QPptr= isColor ? &QPs[(y>>3)*QPStride] :&QPs[(y>>4)*QPStride];
+ int8_t *nonBQPptr= isColor ? &c.nonBQPTable[(y>>3)*mbWidth] :&c.nonBQPTable[(y>>4)*mbWidth];
int QP=0;
/* can we mess with a 8x16 block from srcBlock/dstBlock downwards and 1 line upwards
if not than use a temporary buffer */