less sdk headers

yuanboying · Mar 25, 2016 · ebf9a1c · ebf9a1c
1 parent b60398c
commit ebf9a1c
Show file tree

Hide file tree

Showing 44 changed files with 211 additions and 407 deletions.
diff --git a/qml/QmlAV/QmlAVPlayer.h b/qml/QmlAV/QmlAVPlayer.h
@@ -1,5 +1,5 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
+    QtAV:  Multimedia framework based on Qt and FFmpeg
     Copyright (C) 2013-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV
@@ -27,7 +27,6 @@
 #include <QtQml/QQmlParserStatus>
 #include <QmlAV/MediaMetaData.h>
 #include <QtAV/AVError.h>
-#include <QtAV/CommonTypes.h>
 #include <QtAV/VideoCapture.h>
 
 namespace QtAV {

diff --git a/src/AVDemuxThread.cpp b/src/AVDemuxThread.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
+    QtAV:  Multimedia framework based on Qt and FFmpeg
     Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV

diff --git a/src/AVDemuxThread.h b/src/AVDemuxThread.h
@@ -1,5 +1,5 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
+    QtAV:  Multimedia framework based on Qt and FFmpeg
     Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV
@@ -25,7 +25,6 @@
 #include <QtCore/QMutex>
 #include <QtCore/QThread>
 #include <QtCore/QRunnable>
-#include "QtAV/CommonTypes.h"
 #include "PacketBuffer.h"
 
 namespace QtAV {

diff --git a/src/AVDemuxer.cpp b/src/AVDemuxer.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
+    QtAV:  Multimedia framework based on Qt and FFmpeg
     Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV

diff --git a/src/AVPlayer.cpp b/src/AVPlayer.cpp
@@ -36,7 +36,6 @@
 #include "QtAV/VideoRenderer.h"
 #include "QtAV/AVClock.h"
 #include "QtAV/VideoCapture.h"
-#include "QtAV/VideoDecoderTypes.h"
 #include "QtAV/VideoCapture.h"
 #include "filter/FilterManager.h"
 #include "output/OutputSet.h"

diff --git a/src/AVPlayerPrivate.h b/src/AVPlayerPrivate.h
@@ -25,7 +25,6 @@
 #include <limits>
 #include "QtAV/AVDemuxer.h"
 #include "QtAV/AVPlayer.h"
-#include "QtAV/CommonTypes.h"
 #include "AudioThread.h"
 #include "VideoThread.h"
 #include "AVDemuxThread.h"

diff --git a/src/AudioFrame.cpp b/src/AudioFrame.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
+    QtAV:  Multimedia framework based on Qt and FFmpeg
     Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV
@@ -22,7 +22,6 @@
 #include "QtAV/AudioFrame.h"
 #include "QtAV/private/Frame_p.h"
 #include "QtAV/AudioResampler.h"
-#include "QtAV/AudioResamplerTypes.h"
 #include "QtAV/private/AVCompat.h"
 #include "utils/Logger.h"
 

diff --git a/src/AudioResampler.cpp b/src/AudioResampler.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
-    Copyright (C) 2012-2015 Wang Bin <[email protected]>
+    QtAV:  Multimedia framework based on Qt and FFmpeg
+    Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV
 
@@ -23,11 +23,15 @@
 #include "QtAV/AudioFormat.h"
 #include "QtAV/private/AudioResampler_p.h"
 #include "QtAV/private/factory.h"
+#include "QtAV/private/mkid.h"
 #include "utils/Logger.h"
 
 namespace QtAV {
 FACTORY_DEFINE(AudioResampler)
 
+AudioResamplerId AudioResamplerId_FF = mkid::id32base36_6<'F', 'F', 'm', 'p', 'e', 'g'>::value;
+AudioResamplerId AudioResamplerId_Libav = mkid::id32base36_5<'L', 'i', 'b', 'a', 'v'>::value;
+
 extern bool RegisterAudioResamplerFF_Man();
 extern bool RegisterAudioResamplerLibav_Man();
 void AudioResampler::registerAll()
@@ -44,10 +48,6 @@ void AudioResampler::registerAll()
 #endif
 }
 
-AudioResampler::AudioResampler()
-{
-}
-
 AudioResampler::AudioResampler(AudioResamplerPrivate& d):DPTR_INIT(&d)
 {
 }

diff --git a/src/AudioResamplerFF.cpp b/src/AudioResamplerFF.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
+    QtAV:  Multimedia framework based on Qt and FFmpeg
     Copyright (C) 2012-2015 Wang Bin <[email protected]>
 
 *   This file is part of QtAV

diff --git a/src/AudioResamplerLibav.cpp b/src/AudioResamplerLibav.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
-    Copyright (C) 2012-2015 Wang Bin <[email protected]>
+    QtAV:  Multimedia framework based on Qt and FFmpeg
+    Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV
 

diff --git a/src/AudioResamplerTemplate.cpp b/src/AudioResamplerTemplate.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
-    Copyright (C) 2012-2015 Wang Bin <[email protected]>
+    QtAV:  Multimedia framework based on Qt and FFmpeg
+    Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV
 

diff --git a/src/AudioResamplerTypes.cpp b/src/AudioResamplerTypes.cpp
diff --git a/src/ColorTransform.cpp b/src/ColorTransform.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
+    QtAV:  Multimedia framework based on Qt and FFmpeg
     Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV (from 2014)
@@ -19,7 +19,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ******************************************************************************/
 
-#include "QtAV/ColorTransform.h"
+#include "ColorTransform.h"
 #include <QtCore/qmath.h>
 
 namespace QtAV {
@@ -77,7 +77,7 @@ static QMatrix4x4 ColorRangeYUV(ColorRange from, ColorRange to)
         return QMatrix4x4();
     static const qreal Y2 = 235, Y1 = 16, C2 = 240, C1 = 16;
     static const qreal s = 255; //TODO: can be others
-    if (from == ColorRange_Limited) {
+    if (from == ColorRange_Limited) { //TODO: Unknown. But what if realy want unknown?
         qDebug("input yuv limited range");
         // [Y1, Y2] => [0, s]
         QMatrix4x4 m;
@@ -110,7 +110,7 @@ static QMatrix4x4 ColorRangeRGB(ColorRange from, ColorRange to)
         m.scale((R2 - R1)/s, (R2 - R1)/s, (R2 - R1)/s);
         return m;
     }
-    if (to == ColorRange_Full) {
+    if (to == ColorRange_Full) { // TODO: Unknown
         QMatrix4x4 m;
         m.scale(s/(R2 - R1), s/(R2 - R1), s/(R2 - R1));
         m.translate(-s/R1, -s/R1, -s/R1);
@@ -170,13 +170,13 @@ class ColorTransform::Private : public QSharedData
         //http://www.graficaobscura.com/matrix/index.html
         //http://beesbuzz.biz/code/hsv_color_transforms.php
         // ??
-        float b = brightness;
+        const float b = brightness;
         // brightness R,G,B
         QMatrix4x4 B(1, 0, 0, b,
                      0, 1, 0, b,
                      0, 0, 1, b,
                      0, 0, 0, 1);
-        float c = contrast+1.0;
+        const float c = contrast+1.0;
         // Contrast (offset) R,G,B
         QMatrix4x4 C(c, 0, 0, 0,
                      0, c, 0, 0,

diff --git a/src/QtAV/ColorTransform.h → src/ColorTransform.h b/src/QtAV/ColorTransform.h → src/ColorTransform.h
@@ -1,5 +1,5 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
+    QtAV:  Multimedia framework based on Qt and FFmpeg
     Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV (from 2014)
@@ -24,19 +24,16 @@
 
 #include <QtCore/QSharedDataPointer>
 #include <QtGui/QMatrix4x4>
-#include <QtAV/CommonTypes.h>
-
+#include <QtAV/QtAV_Global.h>
 // TODO: kernel QGenericMatrix<M,N>
 //http://www.graficaobscura.com/matrix/index.html
 
 namespace QtAV {
-
 /*!
  * \brief The ColorTransform class
  *  A convenience class to get color transformation matrix.
  *  Implicitly shared.
  */
-
 class ColorTransform
 {
 public:
@@ -105,7 +102,5 @@ class ColorTransform
     class Private;
     QSharedDataPointer<ColorTransform::Private> d;
 };
-
 } //namespace QtAV
-
 #endif // QTAV_COLORTRANSFORM_H
diff --git a/src/CommonTypes.cpp b/src/CommonTypes.cpp
diff --git a/src/PacketBuffer.cpp b/src/PacketBuffer.cpp
@@ -1,8 +1,8 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
-    Copyright (C) 2015 Wang Bin <[email protected]>
+    QtAV:  Multimedia framework based on Qt and FFmpeg
+    Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
-*   This file is part of QtAV
+*   This file is part of QtAV (from 2015)
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public

diff --git a/src/PacketBuffer.h b/src/PacketBuffer.h
@@ -1,8 +1,8 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
-    Copyright (C) 2015 Wang Bin <[email protected]>
+    QtAV:  Multimedia framework based on Qt and FFmpeg
+    Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
-*   This file is part of QtAV
+*   This file is part of QtAV (from 2015)
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,6 @@
 
 #include <QtCore/QQueue>
 #include <QtAV/Packet.h>
-#include "QtAV/CommonTypes.h"
 #include "utils/BlockingQueue.h"
 #include "utils/ring.h"
 

diff --git a/src/QtAV/AVDemuxer.h b/src/QtAV/AVDemuxer.h
@@ -22,7 +22,6 @@
 #ifndef QAV_DEMUXER_H
 #define QAV_DEMUXER_H
 
-#include <QtAV/CommonTypes.h>
 #include <QtAV/AVError.h>
 #include <QtAV/Packet.h>
 #include <QtCore/QVariant>

diff --git a/src/QtAV/AVError.h b/src/QtAV/AVError.h
@@ -1,8 +1,8 @@
 /******************************************************************************
     QtAV:  Media play library based on Qt and FFmpeg
-    Copyright (C) 2013 Wang Bin <[email protected]>
+    Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
-*   This file is part of QtAV
+*   This file is part of QtAV (from 2013)
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -24,11 +24,8 @@
 
 #include <QtAV/QtAV_Global.h>
 #include <QtCore/QString>
-#include <QtCore/QMetaType>
 
 namespace QtAV {
-
-
 class Q_AV_EXPORT AVError
 {
 public:

diff --git a/src/QtAV/AVPlayer.h b/src/QtAV/AVPlayer.h
@@ -27,7 +27,7 @@
 #include <QtAV/AudioOutput.h>
 #include <QtAV/AVClock.h>
 #include <QtAV/Statistics.h>
-#include <QtAV/VideoDecoderTypes.h>
+#include <QtAV/VideoDecoder.h>
 #include <QtAV/AVError.h>
 
 QT_BEGIN_NAMESPACE