fix all warnings, modify timestamp to float

trunk/3rdparty/libRtAudio/RtAudio.cpp

@@ -5002,7 +5002,7 @@ static std::string convertTChar( LPCTSTR name )
 
 static BOOL CALLBACK deviceQueryCallback( LPGUID lpguid,
                                           LPCTSTR description,
-                                          LPCTSTR module,
+                                          LPCTSTR /*module*/,
                                           LPVOID lpContext )
 {
   struct DsProbeData& probeInfo = *(struct DsProbeData*) lpContext;

trunk/3rdparty/librtmp/rtmp.h

@@ -34,9 +34,6 @@
 //typedef size_t off_t;
 #endif
 
-#pragma warning(disable:4996) //depricated warnings
-#pragma warning(disable:4244) //64bit defensive mechanism, fixed the ones that mattered
-
 #ifdef __cplusplus
 extern "C"
 {

trunk/src/BleAudioEncoderAbstract.cpp

@@ -26,3 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 BleAudioEncoderAbstract::BleAudioEncoderAbstract()
 {
 }
+
+BleAudioEncoderAbstract::~BleAudioEncoderAbstract()
+{
+
+}

trunk/src/BleAudioEncoderAbstract.hpp

@@ -37,12 +37,13 @@ class BleAudioEncoderAbstract
 
 public:
     BleAudioEncoderAbstract();
+    virtual ~BleAudioEncoderAbstract();
 
     virtual bool init(int samplerate, int channel, int bitrate) = 0;
     virtual void fini() = 0;
     virtual bool encode(const QByteArray &data, QByteArray &output) = 0;
     virtual int getFrameSize() = 0;
-    virtual int getFrameDuration() = 0;
+    virtual float getFrameDuration() = 0;
     inline AudioEncoderType encoderType() { return m_encoderType; }
 
 protected:

trunk/src/BleAudioEncoder_AAC.cpp

@@ -124,6 +124,9 @@ bool BleAudioEncoder_AAC::encode(const QByteArray &data, QByteArray &outputArray
     if (encodedBytes < 0) {
         log_error("faacEncEncode failed, aac ori data %d , encode data %d", data.size(), encodedBytes);
         return false;
+    } else if (encodedBytes == 0) {
+        log_trace("audio frame delayed in encoder.");
+        return true;
     }
 
     static unsigned char af[2] = {0xaf, 0x01};
@@ -139,9 +142,9 @@ int BleAudioEncoder_AAC::getFrameSize()
     return m_samplesInputSize * 16 / 8;
 }
 
-int BleAudioEncoder_AAC::getFrameDuration()
+float BleAudioEncoder_AAC::getFrameDuration()
 {
-    return getFrameSize() * 1000 / (m_samplerate * 16 / 8 * 2);
+    return (float)getFrameSize() * 1000.00 / ((float)m_samplerate * 16.0 / 8.0 * 2.0);
 }
 
 QByteArray BleAudioEncoder_AAC::getHeader()

trunk/src/BleAudioEncoder_AAC.hpp

@@ -38,7 +38,7 @@ class BleAudioEncoder_AAC : public BleAudioEncoderAbstract
     virtual void fini();
     virtual bool encode(const QByteArray &data, QByteArray &output);\
     virtual int getFrameSize();
-    virtual int getFrameDuration();
+    virtual float getFrameDuration();
 
     QByteArray getHeader();
 

trunk/src/BleImageProcess.cpp

@@ -47,7 +47,7 @@ BleImageProcess::BleImageProcess(QWidget *parent)
     ui->setupUi(this);
 
     connect(&m_refreshTimer, SIGNAL(timeout()), this, SLOT(onRefreshTimeout()));
-    m_refreshTimer.start(100);
+    m_refreshTimer.start(60);
 
     setMouseTracking(true);
     setFocusPolicy(Qt::ClickFocus);
@@ -84,6 +84,8 @@ void BleImageProcess::addCaptureSource(BleSourceAbstract *source, int x, int y,
 
 void BleImageProcess::paintEvent(QPaintEvent *event)
 {
+    Q_UNUSED(event);
+
     QPainter p(this);
 
     p.setRenderHint(QPainter::SmoothPixmapTransform);
@@ -116,7 +118,8 @@ void BleImageProcess::paintEvent(QPaintEvent *event)
         }
         qimage = QImage((uchar*)image.data, image.width, image.height, QImage::Format_RGB888);
 
-        p.drawImage(pair.rect, qimage);
+        p.drawPixmap(pair.rect, QPixmap::fromImage(qimage));
+        // p.drawImage(pair.rect, qimage);
     }
 
     if (m_activePair && m_activePair->rect.isValid()) {
@@ -274,6 +277,8 @@ void BleImageProcess::keyPressEvent(QKeyEvent *e)
 
 void BleImageProcess::focusOutEvent(QFocusEvent *e)
 {
+    Q_UNUSED(e);
+
     m_activePair = NULL;
 }
 
@@ -313,7 +318,6 @@ void BleImageProcess::onUpBtnClicked()
 
     QRect &r = m_activePair->rect;
     if (r.isValid()) {
-        int x =  r.x();
         int y = r.y();
         r.moveTop(y - 1);
     }

trunk/src/BleRtmpMuxer.cpp

@@ -366,7 +366,8 @@ RtmpAU::RtmpAU(const string &url)
     RTMP_Init(m_pRtmp);
     m_pRtmp->m_bUseNagle = TRUE;
 
-    m_pRtmp->Link.flashVer.av_val = "FMLE/3.0 (compatible; FMSc/1.0)";
+    const char *av_val = "FMLE/3.0 (compatible; FMSc/1.0)";
+    m_pRtmp->Link.flashVer.av_val = const_cast<char *> (av_val);
     m_pRtmp->Link.flashVer.av_len = (int)strlen(m_pRtmp->Link.flashVer.av_val);
 
     m_pRtmp->m_outChunkSize = 4096;//RTMP_DEFAULT_CHUNKSIZE;//

trunk/src/BleTimestampBulider.cpp

@@ -25,10 +25,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "BleUtil.hpp"
 
-static qint64 growTimestamp(qint64 & timestamp, int internal, qint64 & otherTimestamp)
+static double growTimestamp(double & timestamp, float internal, double & otherTimestamp)
 {
-    if (timestamp <= otherTimestamp) {
-        while (timestamp <= otherTimestamp) {
+    if (timestamp < otherTimestamp) {
+        while (timestamp < otherTimestamp) {
             timestamp += internal;
         }
     } else {
@@ -39,10 +39,10 @@ static qint64 growTimestamp(qint64 & timestamp, int internal, qint64 & otherTime
 }
 
 BleTimestampBulider::BleTimestampBulider()
-    : m_videoInternal(50)
-    , m_audiInternal(23)
-    , m_videoTimestamp(0)
-    , m_audioTimestamp(0)
+    : m_videoInternal(66.66666666666667)        // default 15fps
+    , m_audiInternal(23.2199546485261)          // default aac 44100Hz
+    , m_videoTimestamp(0.00)
+    , m_audioTimestamp(0.00)
 {
 }
 
@@ -56,14 +56,14 @@ void BleTimestampBulider::setAudioCaptureInternal(int internal)
     m_audiInternal = internal;
 }
 
-qint64 BleTimestampBulider::addVideoFrame()
+double BleTimestampBulider::addVideoFrame()
 {
     BleAutoLocker(m_mutex);
 
     return growTimestamp(m_videoTimestamp, m_videoInternal, m_audioTimestamp);;
 }
 
-qint64 BleTimestampBulider::addAudioFrame()
+double BleTimestampBulider::addAudioFrame()
 {
     BleAutoLocker(m_mutex);
 

trunk/src/BleTimestampBulider.hpp

@@ -34,17 +34,17 @@ class BleTimestampBulider
     void setVideoCaptureInternal(int internal);
     void setAudioCaptureInternal(int internal);
 
-    qint64 addVideoFrame();
-    qint64 addAudioFrame();
+    double addVideoFrame();
+    double addAudioFrame();
 
 private:
     QMutex m_mutex;
 
-    int m_videoInternal;
-    int m_audiInternal;
+    float m_videoInternal;
+    float m_audiInternal;
 
-    qint64 m_videoTimestamp;
-    qint64 m_audioTimestamp;
+    double m_videoTimestamp;
+    double m_audioTimestamp;
 };
 
 #endif // BLETIMESTAMPBULIDER_HPP

trunk/src/BleX264Encoder.cpp

@@ -55,13 +55,13 @@ int BleX264Encoder::init()
     QString tuneName    = option->option("tune", "x264").toString();
     QString profileName = option->option("profile", "x264").toString();
     int fps = option->option("fps", "encoder").toInt();
-    int bps = option->option("bitrate", "encoder").toInt();
+    int kbps = option->option("bitrate", "encoder").toInt();
 
     QSize wh = option->option("res", "encoder").toSize();
     int width = wh.width();
     int height = wh.height();
 
-    int maxBitRate = bps;
+    int maxBitRate = kbps;
     int bufferSize = maxBitRate;
     bool bUseCBR = (option->option("BitrateMode", "x264").toString() == "CBR");
     int quality = option->option("quality", "x264").toInt();

trunk/src/core/mstream.cpp

@@ -100,7 +100,7 @@ void MStream::writeString(const char *data, int size)
 int MStream::read1Bytes(mint8 &var)
 {
     int ret = E_SUCCESS;
-    if (left() < sizeof(var)) {
+    if (left() < (int)sizeof(var)) {
         return E_SPACE_NOT_ENOUGH;
     }
 
@@ -159,7 +159,7 @@ int MStream::read4Bytes(mint32 &var)
 int MStream::read8Bytes(double &var)
 {
     int ret = E_SUCCESS;
-    if (left() < sizeof(var)) {
+    if (left() < (int)sizeof(var)) {
         return E_SPACE_NOT_ENOUGH;
     }
 
@@ -179,7 +179,7 @@ int MStream::read8Bytes(double &var)
 int MStream::readString(mint16 len, MString &var)
 {
     int ret = E_SUCCESS;
-    if (left() < (muint32)len) {
+    if (left() < (int)len) {
         return E_SPACE_NOT_ENOUGH;
     }
 
@@ -198,7 +198,7 @@ int MStream::skip(int len)
 {
     int temp = m_pos;
     temp += len;
-    if (temp >= size() || temp < 0) {
+    if (temp >= (int)size() || temp < 0) {
         return E_STREAM_SKIP_ERROR;
     }
     m_pos = temp;
@@ -213,7 +213,7 @@ void MStream::reset()
 
 bool MStream::end()
 {
-    return m_pos == size();
+    return m_pos == (int)size();
 }
 
 int MStream::pos()

trunk/src/gui/RecSkinWidget.cpp

@@ -239,7 +239,7 @@ void RecSkinWidget::onCloseNum(int num,const QString &fileName)
     {
         return;
     }
-    RecSkinPushButton *tmpButton;
+    RecSkinPushButton *tmpButton = NULL;
     if(nowPixNum == num)
         emit currentPixmap(oneFileName,onePix,oneColor);
     else