Merge remote-tracking branch 'origin/yangwu1.3' into yangwu1.3

pans

2019-03-30 99221e4721a1246883465c2b52fbff14eb9aaa7a

 QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp

@@ -33,6 +33,7 @@
    sws_freeContext(convert_ctx);

    DBG("m.size is " << m.size());
//    LOG_IF();

    return m;
}
@@ -237,8 +238,8 @@
        av_init_packet(&p_this->pkt);

        p_this->frame = av_frame_alloc();
        unsigned int usleepTime = (1000 / p_this->m_fps) - 12;
        usleepTime *= 1000;
//        unsigned int usleepTime = (1000 / p_this->m_fps) - 12;
//        usleepTime *= 1000;
        DBG("===open ok, camid: " << p_this->m_camIdx);
        while (p_this->m_running) {
#ifdef TestCode
@@ -309,8 +310,9 @@
//        DBG("emitSigal(\"DecoderImageOK\") after");
//#endif

            DBG("emitSigal(\"DecoderImageOK\") after");
            DBG("p_this->m_camIdx is " << p_this->m_camIdx << " queue size is " << p_this->m_rtpQueue.count_queue());
//            DBG("emitSigal(\"DecoderImageOK\") after");

//            DBG("p_this->m_camIdx is " << p_this->m_camIdx << " queue size is " << p_this->m_rtpQueue.count_queue());

#ifdef TestCode
            {