move non-public headers

SmartCloud2025 · Nov 4, 2014 · 6d13c53 · 6d13c53
1 parent 6c7a4f6
commit 6d13c53
Show file tree

Hide file tree

Showing 35 changed files with 50 additions and 48 deletions.
diff --git a/qml/QQuickItemRenderer.cpp b/qml/QQuickItemRenderer.cpp
@@ -28,7 +28,7 @@
 #include <QtAV/FactoryDefine.h>
 #include <QtAV/AVPlayer.h>
 #include <QtAV/VideoRendererTypes.h> //it declares a factory we need
-#include <QtAV/prepost.h>
+#include "QtAV/private/prepost.h"
 #include "QmlAV/QmlAVPlayer.h"
 #include "QmlAV/SGVideoNode.h"
 

diff --git a/src/AVCompat.cpp b/src/AVCompat.cpp
@@ -20,8 +20,8 @@
 ******************************************************************************/
 
 #include "QtAV/private/AVCompat.h"
+#include "QtAV/private/prepost.h"
 #include "QtAV/version.h"
-#include "QtAV/prepost.h"
 
 void ffmpeg_version_print()
 {

diff --git a/src/AVDemuxThread.cpp b/src/AVDemuxThread.cpp
@@ -19,11 +19,11 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ******************************************************************************/
 
-#include <QtAV/AVDemuxThread.h>
-#include <QtAV/AVDemuxer.h>
-#include <QtAV/AVDecoder.h>
-#include <QtAV/Packet.h>
-#include <QtAV/AVThread.h>
+#include "AVDemuxThread.h"
+#include "QtAV/AVDemuxer.h"
+#include "QtAV/AVDecoder.h"
+#include "QtAV/Packet.h"
+#include "AVThread.h"
 #include <QtCore/QTimer>
 #include <QtCore/QEventLoop>
 #include "utils/Logger.h"

diff --git a/src/QtAV/AVDemuxThread.h → src/AVDemuxThread.h b/src/QtAV/AVDemuxThread.h → src/AVDemuxThread.h
diff --git a/src/AVPlayer.cpp b/src/AVPlayer.cpp
@@ -33,20 +33,20 @@
 #include "QtAV/AVDemuxer.h"
 #include "QtAV/AudioFormat.h"
 #include "QtAV/AudioResampler.h"
-#include "QtAV/AudioThread.h"
 #include "QtAV/Packet.h"
 #include "QtAV/AudioDecoder.h"
 #include "QtAV/VideoRenderer.h"
 #include "QtAV/AVClock.h"
 #include "QtAV/VideoCapture.h"
 #include "QtAV/VideoDecoderTypes.h"
-#include "QtAV/VideoThread.h"
-#include "QtAV/AVDemuxThread.h"
 #include "QtAV/VideoCapture.h"
 #include "QtAV/AudioOutputTypes.h"
 #include "filter/FilterManager.h"
 #include "output/OutputSet.h"
 #include "output/video/VideoOutputEventFilter.h"
+#include "AudioThread.h"
+#include "VideoThread.h"
+#include "AVDemuxThread.h"
 #include "QtAV/private/AVCompat.h"
 #include "utils/Logger.h"
 

diff --git a/src/AVThread.cpp b/src/AVThread.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ******************************************************************************/
 
-#include "QtAV/AVThread.h"
-#include "QtAV/private/AVThread_p.h"
+#include "AVThread.h"
+#include "AVThread_p.h"
 #include "QtAV/AVOutput.h"
 #include "QtAV/Filter.h"
 #include "output/OutputSet.h"

diff --git a/src/QtAV/AVThread.h → src/AVThread.h b/src/QtAV/AVThread.h → src/AVThread.h
diff --git a/src/QtAV/private/AVThread_p.h → src/AVThread_p.h b/src/QtAV/private/AVThread_p.h → src/AVThread_p.h
@@ -25,7 +25,9 @@
 #include <QtCore/QMutex>
 #include <QtCore/QMutexLocker>
 #include <QtCore/QWaitCondition>
-#include "QtAV/AVThread.h" //PacketQueue
+#include "QtAV/Packet.h"
+#include "utils/BlockingQueue.h"
+//#include "AVThread.h" //PacketQueue
 
 class QRunnable;
 namespace QtAV {
@@ -62,7 +64,7 @@ class AVThreadPrivate : public DPtrPrivate<AVThread>
     bool demux_end;
     volatile bool stop; //true when packets is empty and demux is end.
     AVClock *clock;
-    PacketQueue packets;
+    BlockingQueue<Packet, QQueue> packets;
     AVDecoder *dec;
     OutputSet *outputSet;
     QMutex mutex;

diff --git a/src/AudioResamplerFF.cpp b/src/AudioResamplerFF.cpp
@@ -23,7 +23,7 @@
 #include "QtAV/AudioResampler.h"
 #include "QtAV/private/AudioResampler_p.h"
 #include "QtAV/private/AVCompat.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include "utils/Logger.h"
 
 namespace QtAV {

diff --git a/src/AudioResamplerLibav.cpp b/src/AudioResamplerLibav.cpp
@@ -24,7 +24,7 @@
 #include "QtAV/AudioResampler.h"
 #include "QtAV/private/AudioResampler_p.h"
 #include "QtAV/private/AVCompat.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include "utils/Logger.h"
 
 namespace QtAV {

diff --git a/src/AudioThread.cpp b/src/AudioThread.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ******************************************************************************/
 
-#include "QtAV/AudioThread.h"
-#include "QtAV/private/AVThread_p.h"
+#include "AudioThread.h"
+#include "AVThread_p.h"
 #include "QtAV/AudioDecoder.h"
 #include "QtAV/Packet.h"
 #include "QtAV/AudioFormat.h"

diff --git a/src/QtAV/AudioThread.h → src/AudioThread.h b/src/QtAV/AudioThread.h → src/AudioThread.h
@@ -22,7 +22,7 @@
 #ifndef QAV_AUDIOTHREAD_H
 #define QAV_AUDIOTHREAD_H
 
-#include <QtAV/AVThread.h>
+#include "AVThread.h"
 
 namespace QtAV {
 

diff --git a/src/ImageConverterFF.cpp b/src/ImageConverterFF.cpp
@@ -23,7 +23,7 @@
 #include "QtAV/private/ImageConverter_p.h"
 #include "QtAV/private/AVCompat.h"
 #include "QtAV/private/mkid.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include "utils/Logger.h"
 
 namespace QtAV {

diff --git a/src/ImageConverterIPP.cpp b/src/ImageConverterIPP.cpp
@@ -23,7 +23,7 @@
 #include "QtAV/private/ImageConverter_p.h"
 #include "QtAV/private/AVCompat.h"
 #include "QtAV/private/mkid.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/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 "QtAV/prepost.h" //for PRE_FUNC_ADD()
+ *      #include "QtAV/private/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 "QtAV/prepost.h" //for PRE_FUNC_ADD()
+ *      #include "QtAV/private/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/prepost.h → src/QtAV/private/prepost.h b/src/QtAV/prepost.h → src/QtAV/private/prepost.h
diff --git a/src/VideoThread.cpp b/src/VideoThread.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ******************************************************************************/
 
-#include "QtAV/VideoThread.h"
-#include "QtAV/private/AVThread_p.h"
+#include "VideoThread.h"
+#include "AVThread_p.h"
 #include "QtAV/Packet.h"
 #include "QtAV/AVClock.h"
 #include "QtAV/VideoCapture.h"

diff --git a/src/QtAV/VideoThread.h → src/VideoThread.h b/src/QtAV/VideoThread.h → src/VideoThread.h
@@ -23,7 +23,7 @@
 #ifndef QTAV_VIDEOTHREAD_H
 #define QTAV_VIDEOTHREAD_H
 
-#include <QtAV/AVThread.h>
+#include "AVThread.h"
 #include <QtCore/QSize>
 
 namespace QtAV {

diff --git a/src/codec/video/VideoDecoderCUDA.cpp b/src/codec/video/VideoDecoderCUDA.cpp
@@ -21,7 +21,7 @@
 
 #include "QtAV/VideoDecoder.h"
 #include "QtAV/private/VideoDecoder_p.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include <QtCore/QQueue>
 #if QTAV_HAVE(DLLAPI_CUDA)
 #include "dllapi.h"

diff --git a/src/codec/video/VideoDecoderCedarv.cpp b/src/codec/video/VideoDecoderCedarv.cpp
@@ -23,7 +23,7 @@
 #include "QtAV/private/VideoDecoder_p.h"
 #include "QtAV/Packet.h"
 #include "QtAV/private/AVCompat.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include <libavcodec/avcodec.h>
 extern "C"
 {

diff --git a/src/codec/video/VideoDecoderDXVA.cpp b/src/codec/video/VideoDecoderDXVA.cpp
@@ -24,7 +24,7 @@
 #include "QtAV/private/VideoDecoderFFmpegHW_p.h"
 #include "QtAV/Packet.h"
 #include "QtAV/private/AVCompat.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include "utils/GPUMemCopy.h"
 #include "utils/Logger.h"
 

diff --git a/src/codec/video/VideoDecoderFFmpeg.cpp b/src/codec/video/VideoDecoderFFmpeg.cpp
@@ -23,7 +23,7 @@
 #include "QtAV/private/VideoDecoder_p.h"
 #include "QtAV/Packet.h"
 #include "QtAV/private/AVCompat.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include "utils/Logger.h"
 
 /*!

diff --git a/src/codec/video/VideoDecoderVAAPI.cpp b/src/codec/video/VideoDecoderVAAPI.cpp
@@ -36,7 +36,7 @@ extern "C" {
 #include "QtAV/SurfaceInterop.h"
 #include "QtAV/private/AVCompat.h"
 #include "utils/GPUMemCopy.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include "vaapi/vaapi_helper.h"
 #include "vaapi/SurfaceInteropVAAPI.h"
 #include "utils/Logger.h"

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

diff --git a/src/libQtAV.pro b/src/libQtAV.pro
@@ -322,7 +322,6 @@ SOURCES += \
 SDK_HEADERS *= \
     QtAV/QtAV.h \
     QtAV/dptr.h \
-    QtAV/prepost.h \
     QtAV/QtAV_Global.h \
     QtAV/AudioResampler.h \
     QtAV/AudioResamplerTypes.h \
@@ -366,13 +365,13 @@ SDK_HEADERS *= \
 SDK_PRIVATE_HEADERS *= \
     QtAV/private/factory.h \
     QtAV/private/mkid.h \
+    QtAV/private/prepost.h \
     QtAV/private/singleton.h \
     QtAV/private/PlayerSubtitle.h \
     QtAV/private/SubtitleProcessor.h \
     QtAV/private/AVCompat.h \
     QtAV/private/AudioOutput_p.h \
     QtAV/private/AudioResampler_p.h \
-    QtAV/private/AVThread_p.h \
     QtAV/private/AVDecoder_p.h \
     QtAV/private/AVOutput_p.h \
     QtAV/private/Filter_p.h \
@@ -390,6 +389,11 @@ HEADERS *= \
     $$SDK_HEADERS \
     $$SDK_PRIVATE_HEADERS \
     QAVIOContext.h \
+    AVDemuxThread.h \
+    AVThread.h \
+    AVThread_p.h \
+    AudioThread.h \
+    VideoThread.h \
     filter/FilterManager.h \
     subtitle/CharsetDetector.h \
     subtitle/PlainText.h \
@@ -398,10 +402,6 @@ HEADERS *= \
     utils/Logger.h \
     utils/SharedPtr.h \
     output/OutputSet.h \
-    QtAV/AVDemuxThread.h \
-    QtAV/AVThread.h \
-    QtAV/AudioThread.h \
-    QtAV/VideoThread.h \
     QtAV/ColorTransform.h
 
 

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

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

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

diff --git a/src/output/audio/AudioOutputPortAudio.cpp b/src/output/audio/AudioOutputPortAudio.cpp
@@ -22,7 +22,7 @@
 
 #include "QtAV/AudioOutput.h"
 #include "QtAV/private/AudioOutput_p.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include <portaudio.h>
 #include <QtCore/QString>
 #include "utils/Logger.h"

diff --git a/src/output/video/Direct2DRenderer.cpp b/src/output/video/Direct2DRenderer.cpp
@@ -24,7 +24,7 @@
 #include <QResizeEvent>
 #include <QtCore/QLibrary>
 #include "QtAV/private/VideoRenderer_p.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 
 //#define CINTERFACE //http://rxlib.ru/faqs/faqc_en/15596.html
 //#include <windows.h>

diff --git a/src/output/video/GDIRenderer.cpp b/src/output/video/GDIRenderer.cpp
@@ -25,7 +25,7 @@
 #include <windows.h> //GetDC()
 #include <gdiplus.h>
 #include <QResizeEvent>
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include "utils/Logger.h"
 
 #define USE_GRAPHICS 0

diff --git a/src/output/video/VideoRendererTypes.cpp b/src/output/video/VideoRendererTypes.cpp
@@ -22,7 +22,7 @@
 #include "QtAV/VideoRendererTypes.h"
 #include <cstdio>
 #include <cstdlib>
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 
 // TODO: move to an internal header
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) || defined(QT_WIDGETS_LIB)

diff --git a/src/output/video/XVRenderer.cpp b/src/output/video/XVRenderer.cpp
@@ -32,7 +32,7 @@
 #include <sys/shm.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/Xvlib.h>
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 
 #include "utils/Logger.h"
 

diff --git a/src/subtitle/SubtitleProcessorFFmpeg.cpp b/src/subtitle/SubtitleProcessorFFmpeg.cpp
@@ -21,7 +21,7 @@
 
 #include <string>
 #include "QtAV/private/SubtitleProcessor.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include "QtAV/AVDemuxer.h"
 #include "QtAV/Packet.h"
 #include "QtAV/private/AVCompat.h"

diff --git a/src/subtitle/SubtitleProcessorLibASS.cpp b/src/subtitle/SubtitleProcessorLibASS.cpp
@@ -25,7 +25,7 @@ extern "C" {
 #include <ass/ass.h>
 }
 #include "QtAV/private/SubtitleProcessor.h"
-#include "QtAV/prepost.h"
+#include "QtAV/private/prepost.h"
 #include "QtAV/Packet.h"
 #include "PlainText.h"
 #include "utils/Logger.h"