change qscale type to int8 and fix qscale ordering

Originally committed as revision 7985 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc

diff --git a/postproc/postprocess.c b/postproc/postprocess.c
index c804e1d..42c8fc8 100644 (file)
--- 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 4caba6d..36f3566 100644 (file)
--- 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 d9cdb65..efaaad7 100644 (file)
--- 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 */