dir change

ninecents · Sep 10, 2014 · 5e3dccd · 5e3dccd
1 parent 3b17114
commit 5e3dccd
Show file tree

Hide file tree

Showing 50 changed files with 53 additions and 53 deletions.
diff --git a/src/AVDemuxer.cpp b/src/AVDemuxer.cpp
@@ -24,7 +24,7 @@
 #include <QtCore/QCoreApplication>
 #include "QtAV/AVError.h"
 #include "QtAV/Packet.h"
-#include "QtAV/private/QAVIOContext.h"
+#include "QAVIOContext.h"
 #include "QtAV/private/AVCompat.h"
 
 namespace QtAV {

diff --git a/src/AVPlayer.cpp b/src/AVPlayer.cpp
@@ -45,8 +45,8 @@
 #include "QtAV/VideoCapture.h"
 #include "QtAV/AudioOutputTypes.h"
 #include "filter/FilterManager.h"
-#include "QtAV/private/OutputSet.h"
-#include "QtAV/private/VideoOutputEventFilter.h"
+#include "output/OutputSet.h"
+#include "output/video/VideoOutputEventFilter.h"
 #include "QtAV/private/AVCompat.h"
 
 namespace QtAV {

diff --git a/src/AVThread.cpp b/src/AVThread.cpp
@@ -23,7 +23,7 @@
 #include "QtAV/private/AVThread_p.h"
 #include "QtAV/AVOutput.h"
 #include "QtAV/Filter.h"
-#include "QtAV/private/OutputSet.h"
+#include "output/OutputSet.h"
 
 namespace QtAV {
 

diff --git a/src/AudioThread.cpp b/src/AudioThread.cpp
@@ -27,7 +27,7 @@
 #include "QtAV/AudioOutput.h"
 #include "QtAV/AudioResampler.h"
 #include "QtAV/AVClock.h"
-#include "QtAV/private/OutputSet.h"
+#include "output/OutputSet.h"
 #include "QtAV/private/AVCompat.h"
 #include <QtCore/QCoreApplication>
 

diff --git a/src/OpenGLVideo.cpp b/src/OpenGLVideo.cpp
@@ -33,7 +33,7 @@
 #endif
 #include "QtAV/SurfaceInterop.h"
 #include "QtAV/VideoShader.h"
-#include "QtAV/private/ShaderManager.h"
+#include "ShaderManager.h"
 
 namespace QtAV {
 

diff --git a/src/QAVIOContext.cpp b/src/QAVIOContext.cpp
@@ -20,7 +20,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ******************************************************************************/
 
-#include "QtAV/private/QAVIOContext.h"
+#include "QAVIOContext.h"
 #include "QtAV/private/AVCompat.h"
 #include <QtCore/QIODevice>
 

diff --git a/src/QtAV/private/QAVIOContext.h → src/QAVIOContext.h b/src/QtAV/private/QAVIOContext.h → src/QAVIOContext.h
diff --git a/src/ShaderManager.cpp b/src/ShaderManager.cpp
@@ -1,4 +1,4 @@
-#include "QtAV/private/ShaderManager.h"
+#include "ShaderManager.h"
 #include "QtAV/VideoShader.h"
 
 namespace QtAV {

diff --git a/src/QtAV/private/ShaderManager.h → src/ShaderManager.h b/src/QtAV/private/ShaderManager.h → src/ShaderManager.h
diff --git a/src/VideoThread.cpp b/src/VideoThread.cpp
@@ -31,7 +31,7 @@
 #include "QtAV/Filter.h"
 #include "QtAV/FilterContext.h"
 #include "QtAV/ImageConverterTypes.h"
-#include "QtAV/private/OutputSet.h"
+#include "output/OutputSet.h"
 #include "QtAV/private/AVCompat.h"
 #include <QtCore/QFileInfo>
 

diff --git a/src/AVDecoder.cpp → src/codec/AVDecoder.cpp b/src/AVDecoder.cpp → src/codec/AVDecoder.cpp
diff --git a/src/AudioDecoder.cpp → src/codec/audio/AudioDecoder.cpp b/src/AudioDecoder.cpp → src/codec/audio/AudioDecoder.cpp
diff --git a/src/VideoDecoder.cpp → src/codec/video/VideoDecoder.cpp b/src/VideoDecoder.cpp → src/codec/video/VideoDecoder.cpp
diff --git a/src/VideoDecoderCUDA.cpp → src/codec/video/VideoDecoderCUDA.cpp b/src/VideoDecoderCUDA.cpp → src/codec/video/VideoDecoderCUDA.cpp
diff --git a/src/VideoDecoderCedarv.cpp → src/codec/video/VideoDecoderCedarv.cpp b/src/VideoDecoderCedarv.cpp → src/codec/video/VideoDecoderCedarv.cpp
diff --git a/src/VideoDecoderDXVA.cpp → src/codec/video/VideoDecoderDXVA.cpp b/src/VideoDecoderDXVA.cpp → src/codec/video/VideoDecoderDXVA.cpp
diff --git a/src/VideoDecoderFFmpeg.cpp → src/codec/video/VideoDecoderFFmpeg.cpp b/src/VideoDecoderFFmpeg.cpp → src/codec/video/VideoDecoderFFmpeg.cpp
diff --git a/src/VideoDecoderFFmpegHW.cpp → src/codec/video/VideoDecoderFFmpegHW.cpp b/src/VideoDecoderFFmpegHW.cpp → src/codec/video/VideoDecoderFFmpegHW.cpp
diff --git a/src/VideoDecoderTypes.cpp → src/codec/video/VideoDecoderTypes.cpp b/src/VideoDecoderTypes.cpp → src/codec/video/VideoDecoderTypes.cpp
diff --git a/src/VideoDecoderVAAPI.cpp → src/codec/video/VideoDecoderVAAPI.cpp b/src/VideoDecoderVAAPI.cpp → src/codec/video/VideoDecoderVAAPI.cpp
diff --git a/src/VideoDecoderVDA.cpp → src/codec/video/VideoDecoderVDA.cpp b/src/VideoDecoderVDA.cpp → src/codec/video/VideoDecoderVDA.cpp
diff --git a/src/Filter.cpp → src/filter/Filter.cpp b/src/Filter.cpp → src/filter/Filter.cpp
diff --git a/src/FilterContext.cpp → src/filter/FilterContext.cpp b/src/FilterContext.cpp → src/filter/FilterContext.cpp
diff --git a/src/libQtAV.pro b/src/libQtAV.pro
@@ -133,17 +133,17 @@ config_ipp {
     #omp for static link. _t is multi-thread static link
 }
 config_dsound {
-    SOURCES += AudioOutputDSound.cpp
+    SOURCES += output/audio/AudioOutputDSound.cpp
     DEFINES *= QTAV_HAVE_DSOUND=1
 }
 config_portaudio {
-    SOURCES += AudioOutputPortAudio.cpp
+    SOURCES += output/audio/AudioOutputPortAudio.cpp
     DEFINES *= QTAV_HAVE_PORTAUDIO=1
     LIBS *= -lportaudio
     #win32: LIBS *= -lwinmm #-lksguid #-luuid
 }
 config_openal {
-    SOURCES += AudioOutputOpenAL.cpp
+    SOURCES += output/audio/AudioOutputOpenAL.cpp
     DEFINES *= QTAV_HAVE_OPENAL=1
     win32: LIBS += -lOpenAL32
     unix:!mac:!blackberry: LIBS += -lopenal
@@ -152,33 +152,33 @@ config_openal {
     mac: DEFINES += HEADER_OPENAL_PREFIX
 }
 config_opensl {
-    SOURCES += AudioOutputOpenSL.cpp
+    SOURCES += output/audio/AudioOutputOpenSL.cpp
     DEFINES *= QTAV_HAVE_OPENSL=1
     LIBS += -lOpenSLES
 }
 !gui_only: {
   SDK_HEADERS *= \
     QtAV/GraphicsItemRenderer.h \
     QtAV/WidgetRenderer.h
-  HEADERS *= QtAV/private/VideoOutputEventFilter.h
+  HEADERS *= output/video/VideoOutputEventFilter.h
   SOURCES *= \
-    VideoOutputEventFilter.cpp \
-    GraphicsItemRenderer.cpp \
-    WidgetRenderer.cpp
+    output/video/VideoOutputEventFilter.cpp \
+    output/video/GraphicsItemRenderer.cpp \
+    output/video/WidgetRenderer.cpp
   config_gdiplus {
     DEFINES *= QTAV_HAVE_GDIPLUS=1
-    SOURCES += GDIRenderer.cpp
+    SOURCES += output/video/GDIRenderer.cpp
     LIBS += -lgdiplus -lgdi32
   }
   config_direct2d {
     DEFINES *= QTAV_HAVE_DIRECT2D=1
     !*msvc*: INCLUDEPATH += $$PROJECTROOT/contrib/d2d1headers
-    SOURCES += Direct2DRenderer.cpp
+    SOURCES += output/video/Direct2DRenderer.cpp
     #LIBS += -lD2d1
   }
   config_xv {
     DEFINES *= QTAV_HAVE_XV=1
-    SOURCES += XVRenderer.cpp
+    SOURCES += output/video/XVRenderer.cpp
     LIBS += -lXv
   }
 }
@@ -188,7 +188,7 @@ CONFIG += config_cuda #config_dllapi config_dllapi_cuda
 config_cuda {
     DEFINES += QTAV_HAVE_CUDA=1
     HEADERS += cuda/dllapi/nv_inc.h cuda/helper_cuda.h
-    SOURCES += VideoDecoderCUDA.cpp
+    SOURCES += codec/video/VideoDecoderCUDA.cpp
     INCLUDEPATH += $$PWD/cuda cuda/dllapi
     config_dllapi:config_dllapi_cuda {
         DEFINES += QTAV_HAVE_DLLAPI_CUDA=1
@@ -208,36 +208,36 @@ include(../depends/dllapi/src/libdllapi.pri)
 }
 config_dxva {
     DEFINES *= QTAV_HAVE_DXVA=1
-    SOURCES += VideoDecoderDXVA.cpp
+    SOURCES += codec/video/VideoDecoderDXVA.cpp
     LIBS += -lole32
 }
 config_vaapi* {
     DEFINES *= QTAV_HAVE_VAAPI=1
-    SOURCES += VideoDecoderVAAPI.cpp  vaapi/vaapi_helper.cpp vaapi/SurfaceInteropVAAPI.cpp
+    SOURCES += codec/video/VideoDecoderVAAPI.cpp  vaapi/vaapi_helper.cpp vaapi/SurfaceInteropVAAPI.cpp
     HEADERS += vaapi/vaapi_helper.h  vaapi/SurfaceInteropVAAPI.h
     LIBS += -lva #dynamic load va-glx va-x11 using dllapi
 }
 config_libcedarv {
     DEFINES *= QTAV_HAVE_CEDARV=1
     QMAKE_CXXFLAGS *= -march=armv7-a -mfpu=neon 
-    SOURCES += VideoDecoderCedarv.cpp
+    SOURCES += codec/video/VideoDecoderCedarv.cpp
     LIBS += -lvecore -lcedarv
 }
 macx:!ios: CONFIG += config_vda
 config_vda {
     DEFINES *= QTAV_HAVE_VDA=1
-    SOURCES += VideoDecoderVDA.cpp
+    SOURCES += codec/video/VideoDecoderVDA.cpp
     LIBS += -framework VideoDecodeAcceleration -framework CoreVideo
 }
 
 config_gl {
     QT *= opengl
     DEFINES *= QTAV_HAVE_GL=1
-    SOURCES += GLWidgetRenderer2.cpp
+    SOURCES += output/video/GLWidgetRenderer2.cpp
     SDK_HEADERS += QtAV/GLWidgetRenderer2.h
     !contains(QT_CONFIG, dynamicgl) { #dynamicgl does not support old gl1 functions which used in GLWidgetRenderer
         DEFINES *= QTAV_HAVE_GL1
-        SOURCES += GLWidgetRenderer.cpp
+        SOURCES += output/video/GLWidgetRenderer.cpp
         SDK_HEADERS += QtAV/GLWidgetRenderer.h
     }
 }
@@ -251,71 +251,71 @@ config_gl|config_opengl {
     QtAV/private/OpenGLRendererBase_p.h
   HEADERS *= \
     utils/OpenGLHelper.h \
-    QtAV/private/ShaderManager.h
+    ShaderManager.h
   SOURCES *= \
-    OpenGLRendererBase.cpp \
+    output/video/OpenGLRendererBase.cpp \
     OpenGLVideo.cpp \
     VideoShader.cpp \
     ShaderManager.cpp \
     utils/OpenGLHelper.cpp
 }
 config_openglwindow {
   SDK_HEADERS *= QtAV/OpenGLWindowRenderer.h
-  SOURCES *= OpenGLWindowRenderer.cpp
+  SOURCES *= output/video/OpenGLWindowRenderer.cpp
   !gui_only {
     SDK_HEADERS *= QtAV/OpenGLWidgetRenderer.h
-    SOURCES *= OpenGLWidgetRenderer.cpp
+    SOURCES *= output/video/OpenGLWidgetRenderer.cpp
   }
 }
 SOURCES += \
     AVCompat.cpp \
     QtAV_Global.cpp \
     subtitle/CharsetDetector.cpp \
     subtitle/PlainText.cpp \
+    subtitle/Subtitle.cpp \
     subtitle/SubtitleProcessor.cpp \
     subtitle/SubtitleProcessorFFmpeg.cpp \
     utils/GPUMemCopy.cpp \
     QAVIOContext.cpp \
     AudioThread.cpp \
     AVThread.cpp \
-    AudioDecoder.cpp \
     AudioFormat.cpp \
     AudioFrame.cpp \
-    AudioOutput.cpp \
-    AudioOutputTypes.cpp \
     AudioResampler.cpp \
     AudioResamplerTypes.cpp \
-    AVDecoder.cpp \
+    codec/AVDecoder.cpp \
+    codec/audio/AudioDecoder.cpp \
     AVDemuxer.cpp \
     AVDemuxThread.cpp \
     ColorTransform.cpp \
     Frame.cpp \
-    Filter.cpp \
-    FilterContext.cpp \
+    filter/Filter.cpp \
+    filter/FilterContext.cpp \
     filter/FilterManager.cpp \
     filter/LibAVFilter.cpp \
     filter/SubtitleFilter.cpp \
     ImageConverter.cpp \
     ImageConverterFF.cpp \
-    QPainterRenderer.cpp \
     Packet.cpp \
     AVError.cpp \
     AVPlayer.cpp \
     AVClock.cpp \
     VideoCapture.cpp \
     VideoFormat.cpp \
     VideoFrame.cpp \
-    VideoRenderer.cpp \
-    VideoRendererTypes.cpp \
-    VideoOutput.cpp \
-    AVOutput.cpp \
-    OutputSet.cpp \
+    output/audio/AudioOutput.cpp \
+    output/audio/AudioOutputTypes.cpp \
+    output/video/VideoRenderer.cpp \
+    output/video/VideoRendererTypes.cpp \
+    output/video/VideoOutput.cpp \
+    output/video/QPainterRenderer.cpp \
+    output/AVOutput.cpp \
+    output/OutputSet.cpp \
     Statistics.cpp \
-    Subtitle.cpp \
-    VideoDecoder.cpp \
-    VideoDecoderTypes.cpp \
-    VideoDecoderFFmpeg.cpp \
-    VideoDecoderFFmpegHW.cpp \
+    codec/video/VideoDecoder.cpp \
+    codec/video/VideoDecoderTypes.cpp \
+    codec/video/VideoDecoderFFmpeg.cpp \
+    codec/video/VideoDecoderFFmpegHW.cpp \
     VideoThread.cpp \
     CommonTypes.cpp
 
@@ -375,8 +375,6 @@ SDK_PRIVATE_HEADERS *= \
     QtAV/private/Filter_p.h \
     QtAV/private/Frame_p.h \
     QtAV/private/ImageConverter_p.h \
-    QtAV/private/OutputSet.h \
-    QtAV/private/QAVIOContext.h \
     QtAV/private/VideoShader_p.h \
     QtAV/private/VideoDecoder_p.h \
     QtAV/private/VideoDecoderFFmpegHW_p.h \
@@ -388,12 +386,14 @@ SDK_PRIVATE_HEADERS *= \
 HEADERS *= \
     $$SDK_HEADERS \
     $$SDK_PRIVATE_HEADERS \
+    QAVIOContext.h \
     filter/FilterManager.h \
     subtitle/CharsetDetector.h \
     subtitle/PlainText.h \
     utils/BlockingQueue.h \
     utils/GPUMemCopy.h \
     utils/SharedPtr.h \
+    output/OutputSet.h \
     QtAV/AVDemuxThread.h \
     QtAV/AVThread.h \
     QtAV/AudioThread.h \

diff --git a/src/AVOutput.cpp → src/output/AVOutput.cpp b/src/AVOutput.cpp → src/output/AVOutput.cpp
@@ -24,7 +24,7 @@
 #include "QtAV/Filter.h"
 #include "QtAV/FilterContext.h"
 #include "filter/FilterManager.h"
-#include "QtAV/private/OutputSet.h"
+#include "output/OutputSet.h"
 
 namespace QtAV {
 

diff --git a/src/OutputSet.cpp → src/output/OutputSet.cpp b/src/OutputSet.cpp → src/output/OutputSet.cpp
@@ -19,7 +19,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ******************************************************************************/
 
-#include "QtAV/private/OutputSet.h"
+#include "output/OutputSet.h"
 #include "QtAV/AVPlayer.h"
 #include "QtAV/VideoRenderer.h"
 

diff --git a/src/QtAV/private/OutputSet.h → src/output/OutputSet.h b/src/QtAV/private/OutputSet.h → src/output/OutputSet.h
diff --git a/src/AudioOutput.cpp → src/output/audio/AudioOutput.cpp b/src/AudioOutput.cpp → src/output/audio/AudioOutput.cpp
diff --git a/src/AudioOutputDSound.cpp → src/output/audio/AudioOutputDSound.cpp b/src/AudioOutputDSound.cpp → src/output/audio/AudioOutputDSound.cpp
diff --git a/src/AudioOutputOpenAL.cpp → src/output/audio/AudioOutputOpenAL.cpp b/src/AudioOutputOpenAL.cpp → src/output/audio/AudioOutputOpenAL.cpp
diff --git a/src/AudioOutputOpenSL.cpp → src/output/audio/AudioOutputOpenSL.cpp b/src/AudioOutputOpenSL.cpp → src/output/audio/AudioOutputOpenSL.cpp
diff --git a/src/AudioOutputPortAudio.cpp → src/output/audio/AudioOutputPortAudio.cpp b/src/AudioOutputPortAudio.cpp → src/output/audio/AudioOutputPortAudio.cpp
diff --git a/src/AudioOutputTypes.cpp → src/output/audio/AudioOutputTypes.cpp b/src/AudioOutputTypes.cpp → src/output/audio/AudioOutputTypes.cpp
diff --git a/src/Direct2DRenderer.cpp → src/output/video/Direct2DRenderer.cpp b/src/Direct2DRenderer.cpp → src/output/video/Direct2DRenderer.cpp
diff --git a/src/GDIRenderer.cpp → src/output/video/GDIRenderer.cpp b/src/GDIRenderer.cpp → src/output/video/GDIRenderer.cpp
diff --git a/src/GLWidgetRenderer.cpp → src/output/video/GLWidgetRenderer.cpp b/src/GLWidgetRenderer.cpp → src/output/video/GLWidgetRenderer.cpp
diff --git a/src/GLWidgetRenderer2.cpp → src/output/video/GLWidgetRenderer2.cpp b/src/GLWidgetRenderer2.cpp → src/output/video/GLWidgetRenderer2.cpp
diff --git a/src/GraphicsItemRenderer.cpp → src/output/video/GraphicsItemRenderer.cpp b/src/GraphicsItemRenderer.cpp → src/output/video/GraphicsItemRenderer.cpp
diff --git a/src/OpenGLRendererBase.cpp → src/output/video/OpenGLRendererBase.cpp b/src/OpenGLRendererBase.cpp → src/output/video/OpenGLRendererBase.cpp
diff --git a/src/OpenGLWidgetRenderer.cpp → src/output/video/OpenGLWidgetRenderer.cpp b/src/OpenGLWidgetRenderer.cpp → src/output/video/OpenGLWidgetRenderer.cpp
diff --git a/src/OpenGLWindowRenderer.cpp → src/output/video/OpenGLWindowRenderer.cpp b/src/OpenGLWindowRenderer.cpp → src/output/video/OpenGLWindowRenderer.cpp
diff --git a/src/QPainterRenderer.cpp → src/output/video/QPainterRenderer.cpp b/src/QPainterRenderer.cpp → src/output/video/QPainterRenderer.cpp
diff --git a/src/VideoOutput.cpp → src/output/video/VideoOutput.cpp b/src/VideoOutput.cpp → src/output/video/VideoOutput.cpp
diff --git a/src/VideoOutputEventFilter.cpp → src/output/video/VideoOutputEventFilter.cpp b/src/VideoOutputEventFilter.cpp → src/output/video/VideoOutputEventFilter.cpp
@@ -19,7 +19,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ******************************************************************************/
 
-#include "QtAV/private/VideoOutputEventFilter.h"
+#include "output/video/VideoOutputEventFilter.h"
 #include "QtAV/VideoRenderer.h"
 #include <QtCore/QEvent>
 #include <QKeyEvent>

diff --git a/src/QtAV/private/VideoOutputEventFilter.h → src/output/video/VideoOutputEventFilter.h b/src/QtAV/private/VideoOutputEventFilter.h → src/output/video/VideoOutputEventFilter.h
diff --git a/src/VideoRenderer.cpp → src/output/video/VideoRenderer.cpp b/src/VideoRenderer.cpp → src/output/video/VideoRenderer.cpp
diff --git a/src/VideoRendererTypes.cpp → src/output/video/VideoRendererTypes.cpp b/src/VideoRendererTypes.cpp → src/output/video/VideoRendererTypes.cpp
diff --git a/src/WidgetRenderer.cpp → src/output/video/WidgetRenderer.cpp b/src/WidgetRenderer.cpp → src/output/video/WidgetRenderer.cpp
diff --git a/src/XVRenderer.cpp → src/output/video/XVRenderer.cpp b/src/XVRenderer.cpp → src/output/video/XVRenderer.cpp
diff --git a/src/Subtitle.cpp → src/subtitle/Subtitle.cpp b/src/Subtitle.cpp → src/subtitle/Subtitle.cpp