派生自 development/c++

chenshijun
2019-03-09 a97b6c212920c2d14f506169ef0cdea27112c8c1
解决按国标或本地类型获取camera设备
4个文件已修改
11 ■■■■■ 已修改文件
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/VideoToImage/CMakeLists.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
@@ -198,12 +198,15 @@
#ifdef TestCode
        ClockTimer Test("while time");
#endif
        av_packet_unref(&p_this->pkt);
        p_this->pkt.data = NULL;
        p_this->pkt.size = 0;
        int err5 = av_read_frame(p_this->ic, &p_this->pkt);
        //# todo save package
        p_this->frame_number++;
        int err6 = avcodec_send_packet(p_this->ctx, &p_this->pkt);
//        av_packet_unref(&pkt);
        int err7 = avcodec_receive_frame(p_this->ctx, p_this->frame);
        if ((err7 == AVERROR(EAGAIN)) || (err5 < 0) || (err6 < 0)) {
            ERR(" error << err7:" << err7 << "  err5: " << err5 << " err6: " << err6);
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -117,7 +117,7 @@
    } else {
        auto lst = m_lDBTool->searchCamDevTableAll();
        auto lst = m_lDBTool->searchCamDevTableByType(0);
        appPref.setIntData("n_cut_max_duration", lst_dev.n_cut_max_duration);
        appPref.setIntData("n_cut_min_duration", lst_dev.n_cut_min_duration);
QiaoJiaSystem/VideoToImage/CMakeLists.txt
@@ -68,7 +68,7 @@
    /usr/include/x86_64-linux-gnu/qt5/QtCore/
    /usr/include/x86_64-linux-gnu/qt5/QtSql/
    ../../BasicPlatForm/libs/hiredis-master/include
    ../../../BasicPlatForm/libs/hiredis-master/include
    ../../../BasicPlatForm/basic/timer_counter/
)
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -65,7 +65,7 @@
        }
    } else {
        auto lst = m_lDBTool->searchCamDevTableAll();
        auto lst = m_lDBTool->searchCamDevTableByType(0);
        Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
        //设置视频的最长和最短时间间隔