misc. build error etc

TommyZhang936 · Aug 4, 2014 · 517b880 · 517b880
1 parent 5cf98a9
commit 517b880
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 13 deletions.
diff --git a/qml/QQuickItemRenderer.cpp b/qml/QQuickItemRenderer.cpp
@@ -29,7 +29,7 @@
 #include <QmlAV/QmlAVPlayer.h>
 #include "QmlAV/SGVideoNode.h"
 #include <QtAV/VideoRendererTypes.h> //it declares a factory we need
-#include "prepost.h"
+#include "QtAV/prepost.h"
 
 namespace QtAV
 {

diff --git a/src/AudioOutputDSound.cpp b/src/AudioOutputDSound.cpp
@@ -19,7 +19,7 @@
 
 #include "QtAV/AudioOutput.h"
 #include "QtAV/private/AudioOutput_p.h"
-#include "prepost.h"
+#include "QtAV/prepost.h"
 #include <QtCore/QLibrary>
 #include <QtCore/QVector>
 

diff --git a/src/AudioOutputOpenAL.cpp b/src/AudioOutputOpenAL.cpp
@@ -19,7 +19,7 @@
 
 #include "QtAV/AudioOutput.h"
 #include "QtAV/private/AudioOutput_p.h"
-#include "prepost.h"
+#include "QtAV/prepost.h"
 #include <QtCore/QVector>
 
 #if defined(HEADER_OPENAL_PREFIX)

diff --git a/src/AudioOutputOpenSL.cpp b/src/AudioOutputOpenSL.cpp
@@ -20,7 +20,7 @@
 #include "QtAV/private/AudioOutput_p.h"
 #include <QtCore/QThread>
 #include <SLES/OpenSLES.h>
-#include "prepost.h"
+#include "QtAV/prepost.h"
 
 namespace QtAV {
 

diff --git a/src/Direct2DRenderer.cpp b/src/Direct2DRenderer.cpp
@@ -86,6 +86,7 @@ class Direct2DRenderer : public QWidget, public VideoRenderer
     //stay on top will change parent, hide then show(windows). we need GetDC() again
     virtual void showEvent(QShowEvent *);
 };
+typedef Direct2DRenderer VideoRendererDirect2D;
 extern VideoRendererId VideoRendererId_Direct2D;
 FACTORY_REGISTER_ID_AUTO(VideoRenderer, Direct2D, "Direct2D")
 
@@ -423,3 +424,5 @@ void Direct2DRenderer::showEvent(QShowEvent *)
 }
 
 } //namespace QtAV
+
+#include "Direct2DRenderer.moc"
diff --git a/src/GDIRenderer.cpp b/src/GDIRenderer.cpp
@@ -69,7 +69,7 @@ class GDIRenderer : public QWidget, public VideoRenderer
     //stay on top will change parent, hide then show(windows). we need GetDC() again
     virtual void showEvent(QShowEvent *);
 };
-
+typedef GDIRenderer VideoRendererGDI;
 extern VideoRendererId VideoRendererId_GDI;
 FACTORY_REGISTER_ID_AUTO(VideoRenderer, GDI, "GDI")
 
@@ -308,3 +308,5 @@ void GDIRenderer::showEvent(QShowEvent *)
 }
 
 } //namespace QtAV
+
+#include "GDIRenderer.moc"
diff --git a/src/ImageConverterIPP.cpp b/src/ImageConverterIPP.cpp
@@ -22,7 +22,7 @@
 #include "QtAV/ImageConverter.h"
 #include "QtAV/private/ImageConverter_p.h"
 #include "QtAV/private/AVCompat.h"
-#include "prepost.h"
+#include "QtAV/prepost.h"
 
 #if QTAV_HAVE(IPP)
 #include <ipp.h>

diff --git a/src/QtAV/FactoryDefine.h b/src/QtAV/FactoryDefine.h
@@ -44,7 +44,7 @@
  *  We define the id in MyClassTypes.cpp because MyClassSubA may not be compiled(e.g. platform dependent features), but the id must be defined.
  * 1. create a source file MyClassSubA.cpp and implement the required members
  * 2. In MyClassSubA.cpp, add the following lines
- *      #include "prepost.h" //for PRE_FUNC_ADD()
+ *      #include "QtAV/prepost.h" //for PRE_FUNC_ADD()
  *      //we don't want to depend on MyClassTypes.h, so extern
  *      extern MyClassId MyClassId_SubA;
  *      FACTORY_REGISTER_ID_AUTO(MyClass, SubA, "SubA's name")
@@ -66,7 +66,7 @@
  *  just create MyClassSubA.cpp with the content:
  *
  *      #include "MyClass.h"
- *      #include "prepost.h" //for PRE_FUNC_ADD()
+ *      #include "QtAV/prepost.h" //for PRE_FUNC_ADD()
  *      MyClassId MyClassId_SubA = some_value; //it can be used somewhere else as "extern"
  *      FACTORY_REGISTER_ID_AUTO(MyClass, SubA, "SubA's name")
  *      void RegisterMyClassSubA_Man() //call it when you need as "extern"

diff --git a/src/QtAV/private/singleton.h b/src/QtAV/private/singleton.h
@@ -29,9 +29,14 @@
 #include <stdexcept>
 #endif
 
+#define DEBUG 0
+#if DEBUG
 #define DBG(fmt, ...) \
     printf(fmt, ##__VA_ARGS__); \
     fflush(0);
+#else
+#define DBG(...)
+#endif //DEBUG
 
 #define DISABLE_COPY(Class) \
     Class(const Class &); \

diff --git a/src/VideoDecoder.cpp b/src/VideoDecoder.cpp
@@ -30,13 +30,29 @@ FACTORY_DEFINE(VideoDecoder)
 
 extern void RegisterVideoDecoderFFmpeg_Man();
 extern void RegisterVideoDecoderDXVA_Man();
+extern void RegisterVideoDecoderCUDA_Man();
+extern void RegisterVideoDecoderVAAPI_Man();
+extern void RegisterVideoDecoderVDA_Man();
+extern void RegisterVideoDecoderCedarv_Man();
 
 void VideoDecoder_RegisterAll()
 {
     RegisterVideoDecoderFFmpeg_Man();
 #if QTAV_HAVE(DXVA)
     RegisterVideoDecoderDXVA_Man();
 #endif //QTAV_HAVE(DXVA)
+#if QTAV_HAVE(CUDA)
+    RegisterVideoDecoderCUDA_Man();
+#endif //QTAV_HAVE(CUDA)
+#if QTAV_HAVE(VAAPI)
+    RegisterVideoDecoderVAAPI_Man();
+#endif //QTAV_HAVE(VAAPI)
+#if QTAV_HAVE(VDA)
+    RegisterVideoDecoderVDA_Man();
+#endif //QTAV_HAVE(VDA)
+#if QTAV_HAVE(CEDARV)
+    RegisterVideoDecoderCedarv_Man();
+#endif //QTAV_HAVE(CEDARV)
 }
 
 

diff --git a/src/VideoDecoderCedarv.cpp b/src/VideoDecoderCedarv.cpp
@@ -23,7 +23,7 @@
 #include "QtAV/private/VideoDecoder_p.h"
 #include "QtAV/Packet.h"
 #include "QtAV/private/AVCompat.h"
-#include "prepost.h"
+#include "QtAV/prepost.h"
 
 #include <QDebug>
 

diff --git a/src/VideoDecoderDXVA.cpp b/src/VideoDecoderDXVA.cpp
@@ -24,7 +24,7 @@
 #include "QtAV/private/VideoDecoderFFmpegHW_p.h"
 #include "QtAV/Packet.h"
 #include "QtAV/private/AVCompat.h"
-#include "prepost.h"
+#include "QtAV/prepost.h"
 #include "utils/GPUMemCopy.h"
 
 // TODO: add to QtAV_Compat.h?

diff --git a/src/VideoDecoderVAAPI.cpp b/src/VideoDecoderVAAPI.cpp
@@ -31,7 +31,7 @@
 #include "QtAV/SurfaceInterop.h"
 #include "QtAV/private/AVCompat.h"
 #include "utils/GPUMemCopy.h"
-#include "prepost.h"
+#include "QtAV/prepost.h"
 #include <va/va.h>
 #include <libavcodec/vaapi.h>
 

diff --git a/src/VideoDecoderVDA.cpp b/src/VideoDecoderVDA.cpp
@@ -23,7 +23,7 @@
 #include "QtAV/private/VideoDecoderFFmpegHW_p.h"
 #include "utils/GPUMemCopy.h"
 #include "QtAV/private/AVCompat.h"
-#include "prepost.h"
+#include "QtAV/prepost.h"
 #include <assert.h>
 
 #ifdef __cplusplus

diff --git a/src/XVRenderer.cpp b/src/XVRenderer.cpp
@@ -83,6 +83,7 @@ class XVRenderer : public QWidget, public VideoRenderer
     virtual bool onSetHue(qreal h);
     virtual bool onSetSaturation(qreal s);
 };
+typedef XVRenderer VideoRendererXV;
 extern VideoRendererId VideoRendererId_XV;
 FACTORY_REGISTER_ID_AUTO(VideoRenderer, XV, "XVideo")
 
@@ -544,3 +545,5 @@ bool XVRenderer::onSetSaturation(qreal s)
 }
 
 } //namespace QtAV
+
+#include "XVRenderer.moc"
diff --git a/tests/ao/main.cpp b/tests/ao/main.cpp
@@ -23,6 +23,7 @@
 #include <limits>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QElapsedTimer>
+#include <QtCore/QStringList>
 #include <QtAV/AudioOutput.h>
 #include <QtAV/AudioOutputTypes.h>
 #include <QtDebug>
@@ -38,7 +39,7 @@ void help() {
     for (int i = 0; i < (int)names.size(); ++i) {
         backends.append(names[i].c_str());
     }
-    qDebug() << "parameters: [-ao " << backends.join('|') << "]";
+    qDebug() << "parameters: [-ao " << backends.join("|") << "]";
 }
 
 int main(int argc, char** argv)