[Sumover-dev] [svn commit] r4174 - vic/branches/mpeg4/win32/libpostproc

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Fri Jun 13 14:52:35 2008
New Revision: 4174

Added:
   vic/branches/mpeg4/win32/libpostproc/
      - copied from r4172, /vic/branches/mpeg4/win32/postproc/
Modified:
   vic/branches/mpeg4/win32/libpostproc/postprocess.h

Log:


Modified: vic/branches/mpeg4/win32/libpostproc/postprocess.h
==============================================================================
--- /vic/branches/mpeg4/win32/postproc/postprocess.h	(original)
+++ vic/branches/mpeg4/win32/libpostproc/postprocess.h	Fri Jun 13 14:52:35 2008
@@ -18,21 +18,29 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NEWPOSTPROCESS_H
-#define NEWPOSTPROCESS_H
+#ifndef FFMPEG_POSTPROCESS_H
+#define FFMPEG_POSTPROCESS_H
 
 /**
  * @file postprocess.h
  * @brief
- *     external api for the pp stuff
+ *     external postprocessing API
  */
-
-#ifdef __cplusplus
-extern "C" {
+#ifdef __cplusplus
+extern "C" {
 #endif
+//#include "libavutil/avutil.h"
 
-#define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0)
-#define LIBPOSTPROC_VERSION     51.1.0
+#define LIBPOSTPROC_VERSION_MAJOR 51
+#define LIBPOSTPROC_VERSION_MINOR  1
+#define LIBPOSTPROC_VERSION_MICRO  0
+
+#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
+                                               LIBPOSTPROC_VERSION_MINOR, \
+                                               LIBPOSTPROC_VERSION_MICRO)
+#define LIBPOSTPROC_VERSION     AV_VERSION(LIBPOSTPROC_VERSION_MAJOR, \
+                                           LIBPOSTPROC_VERSION_MINOR, \
+                                           LIBPOSTPROC_VERSION_MICRO)
 #define LIBPOSTPROC_BUILD       LIBPOSTPROC_VERSION_INT
 
 #define LIBPOSTPROC_IDENT       "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
@@ -41,24 +49,30 @@
 
 #define QP_STORE_T int8_t
 
+#include <inttypes.h>
+
 typedef void pp_context_t;
 typedef void pp_mode_t;
 
-extern char *pp_help; ///< a simple help text
+#if LIBPOSTPROC_VERSION_INT < (52<<16)
+extern const char *const pp_help; ///< a simple help text
+#else
+extern const char pp_help[]; ///< a simple help text
+#endif
 
-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,
-                 pp_mode_t *mode, pp_context_t *ppContext, int pict_type);
+void  pp_postprocess(const uint8_t * src[3], const int srcStride[3],
+                     uint8_t * dst[3], const int dstStride[3],
+                     int horizontalSize, int verticalSize,
+                     const QP_STORE_T *QP_store,  int QP_stride,
+                     pp_mode_t *mode, pp_context_t *ppContext, int pict_type);
 
 
 /**
- * returns a pp_mode_t or NULL if an error occured
+ * returns a pp_mode_t or NULL if an error occurred
  * name is the string after "-pp" on the command line
  * quality is a number from 0 to PP_QUALITY_MAX
  */
-pp_mode_t *pp_get_mode_by_name_and_quality(char *name, int quality);
+pp_mode_t *pp_get_mode_by_name_and_quality(const char *name, int quality);
 void pp_free_mode(pp_mode_t *mode);
 
 pp_context_t *pp_get_context(int width, int height, int flags);
@@ -76,9 +90,7 @@
 #define PP_FORMAT_444    (0x00000000|PP_FORMAT)
 
 #define PP_PICT_TYPE_QP2  0x00000010 ///< MPEG2 style QScale
-
-#ifdef __cplusplus
-}
-#endif
-
+#ifdef __cplusplus
+}
 #endif
+#endif /* FFMPEG_POSTPROCESS_H */