Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

1 files changed, 117 insertions, 0 deletions

diff --git a/lib/DllPostProc.h b/lib/DllPostProc.h
new file mode 100644
index 0000000000..5ff06b8cb5
--- /dev/null
+++ b/lib/DllPostProc.h
@@ -0,0 +1,117 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2010 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#if (defined HAVE_CONFIG_H) && (!defined WIN32)
+  #include "config.h"
+#endif
+#include "DynamicDll.h"
+#include "utils/log.h"
+
+extern "C" {
+#define HAVE_MMX
+#ifndef __STDC_CONSTANT_MACROS
+#define __STDC_CONSTANT_MACROS
+#endif
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
+#endif
+#ifndef __GNUC__
+#pragma warning(disable:4244)
+#endif
+  
+#if (defined USE_EXTERNAL_FFMPEG)
+  #if (defined HAVE_LIBAVUTIL_AVUTIL_H)
+    #include <libavutil/avutil.h>
+  #elif (defined HAVE_FFMPEG_AVUTIL_H)
+    #include <ffmpeg/avutil.h>
+  #endif
+  #if (defined HAVE_LIBPOSTPROC_POSTPROCESS_H)
+    #include <libpostproc/postprocess.h>
+  #elif (defined HAVE_POSTPROC_POSTPROCESS_H)
+    #include <postproc/postprocess.h>
+  #endif
+#else
+  #include "libavutil/avutil.h"
+  #include "libpostproc/postprocess.h"
+#endif
+}
+
+class DllPostProcInterface
+{
+public:
+   virtual ~DllPostProcInterface() {}
+  virtual 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)=0;	           
+  virtual pp_mode_t *pp_get_mode_by_name_and_quality(char *name, int quality)=0;
+  virtual void pp_free_mode(pp_mode_t *mode)=0;
+  virtual pp_context_t *pp_get_context(int width, int height, int flags)=0;
+  virtual void pp_free_context(pp_context_t *ppContext)=0;
+};
+
+#if (defined USE_EXTERNAL_FFMPEG)
+
+// We call directly.
+class DllPostProc : public DllDynamic, DllPostProcInterface
+{
+public:
+  
+  virtual ~DllPostProc() {}
+  virtual 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) { ::pp_postprocess((const uint8_t** )src, srcStride, dst, dstStride, horizontalSize, verticalSize, QP_store, QP_stride, mode, ppContext, pict_type); }             
+  virtual pp_mode_t *pp_get_mode_by_name_and_quality(char *name, int quality) { return ::pp_get_mode_by_name_and_quality(name, quality); }
+  virtual void pp_free_mode(pp_mode_t *mode) { ::pp_free_mode(mode); }
+  virtual pp_context_t *pp_get_context(int width, int height, int flags) { return ::pp_get_context(width, height, flags); }
+  virtual void pp_free_context(pp_context_t *ppContext) { ::pp_free_context(ppContext); }
+  
+  // DLL faking.
+  virtual bool ResolveExports() { return true; }
+  virtual bool Load() {
+    CLog::Log(LOGDEBUG, "DllPostProc: Using libpostproc system library");
+    return true;
+  }
+  virtual void Unload() {}
+};
+
+#else
+class DllPostProc : public DllDynamic, DllPostProcInterface
+{
+  DECLARE_DLL_WRAPPER(DllPostProc, DLL_PATH_LIBPOSTPROC)
+  DEFINE_METHOD11(void, pp_postprocess, (uint8_t* p1[3], int p2[3], uint8_t * p3[3], int p4[3],
+                      int p5, int p6, QP_STORE_T *p7,  int p8,
+                      pp_mode_t *p9, pp_context_t *p10, int p11))
+  DEFINE_METHOD2(pp_mode_t*, pp_get_mode_by_name_and_quality, (char *p1, int p2))
+  DEFINE_METHOD1(void, pp_free_mode, (pp_mode_t *p1))
+  DEFINE_METHOD3(pp_context_t*, pp_get_context, (int p1, int p2, int p3))
+  DEFINE_METHOD1(void, pp_free_context, (pp_context_t *p1))
+
+  BEGIN_METHOD_RESOLVE()
+    RESOLVE_METHOD(pp_postprocess)
+    RESOLVE_METHOD(pp_get_mode_by_name_and_quality)
+    RESOLVE_METHOD(pp_free_mode)
+    RESOLVE_METHOD(pp_get_context)
+    RESOLVE_METHOD(pp_free_context)
+  END_METHOD_RESOLVE()
+};
+
+#endif