Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-15 0ad1516d29d13796ae2355d83b04cbc9a23cbc7d

 QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp

@@ -143,148 +143,186 @@
 */
void BASICGB28181::FFmpegDecoderJPG::BareFlowDecoderThd(FFmpegDecoderJPG *p_this) {
    DBG(p_this->m_camIdx << "  BareFlowDecoderThd ok ... gpuIdx is " << p_this->m_gpuIdx);
    p_this->m_running = true;
    while(!p_this->m_running) {

        p_this->m_running = true;
//    av_register_all();
//    avformat_network_init();
    p_this->ic = avformat_alloc_context();
        p_this->ic = avformat_alloc_context();

    p_this->iobuffer = (unsigned char *) av_malloc(p_this->m_buf_size);
    p_this->avio = avio_alloc_context(p_this->iobuffer, p_this->m_buf_size, 0, p_this, p_this->read_data, NULL, NULL);
    p_this->ic->pb = p_this->avio;

    int err = av_probe_input_buffer(p_this->ic->pb, &p_this->ic->iformat, nullptr, nullptr, 0, p_this->m_buf_size);
    if(err){
        ERR("av_probe_input_buffer" << err);
    }
    err = avformat_open_input(&p_this->ic, "", NULL, NULL);
    if(err){
        ERR("avformat_open_input" << err);
    }
//    int err2 = avformat_find_stream_info(ic, nullptr);
    err = avformat_find_stream_info(p_this->ic, NULL);
    if(err){
        ERR("avformat_find_stream_info" << err);
    }
    int vi = -1;
    for (int i = 0; i < p_this->ic->nb_streams; ++i) {
        if (p_this->ic->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
            vi = i;
            break;
        p_this->iobuffer = (unsigned char *) av_malloc(p_this->m_buf_size);
        if (!p_this->iobuffer) {
            ERR("av_malloc: err======" << p_this->m_camIdx);
            p_this->m_running = false;
            continue;
        }
    }
    p_this->stream = p_this->ic->streams[vi];
    p_this->video_st = p_this->stream;
    p_this->ctx = avcodec_alloc_context3(nullptr);
    int err3 = avcodec_parameters_to_context(p_this->ctx, p_this->stream->codecpar);
        p_this->avio = avio_alloc_context(p_this->iobuffer, p_this->m_buf_size, 0, p_this, p_this->read_data, NULL,
                                          NULL);
        if (!p_this->avio) {
            ERR("avio_alloc_context: err======" << p_this->m_camIdx);
            p_this->m_running = false;
            continue;
        }
        p_this->ic->pb = p_this->avio;

    p_this->codec = avcodec_find_decoder(p_this->ctx->codec_id);
    //是否启用GPU
    if (p_this->m_gpuIdx >= 0) {
        if (p_this->codec != NULL) {
            char cuvidName[40] = {0};
            sprintf(cuvidName, "%s_cuvid", p_this->codec->name);
            if (!strcmp(p_this->codec->name, "h264") || !strcmp(p_this->codec->name, "h265") ||
                !strcmp(p_this->codec->name, "hevc")) {
                p_this->codec_cuvid = avcodec_find_decoder_by_name(cuvidName);
                if (p_this->codec_cuvid != NULL) {
                    p_this->codec = p_this->codec_cuvid;
                } else {
        int err = av_probe_input_buffer(p_this->ic->pb, &p_this->ic->iformat, nullptr, nullptr, 0, p_this->m_buf_size);
        if (err) {
            ERR("av_probe_input_buffer: err======" << err  << p_this->m_camIdx);
            p_this->m_running = false;
            continue;
        }
        err = avformat_open_input(&p_this->ic, "", NULL, NULL);
        if (err) {
            ERR("avformat_open_input: err======" << err  << p_this->m_camIdx);
            p_this->m_running = false;
            continue;
        }
//    int err2 = avformat_find_stream_info(ic, nullptr);
        err = avformat_find_stream_info(p_this->ic, NULL);
        if (err) {
            ERR("avformat_find_stream_info: err======" << err  << p_this->m_camIdx);
//        avformat_close_input(&p_this->ic);
//        DBG("avformat_close_input(&p_this->ic);");
            p_this->m_running = false;
            continue;
        }
        int vi = -1;
        for (int i = 0; i < p_this->ic->nb_streams; ++i) {
            if (p_this->ic->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
                vi = i;
                break;
            }
        }
        p_this->stream = p_this->ic->streams[vi];
        p_this->video_st = p_this->stream;
        p_this->ctx = avcodec_alloc_context3(nullptr);
        err = avcodec_parameters_to_context(p_this->ctx, p_this->stream->codecpar);
        if (err) {
            ERR("avcodec_parameters_to_context: err======" << err  << p_this->m_camIdx);
//        avformat_close_input(&p_this->ic);
//        DBG("avformat_close_input(&p_this->ic);");
            p_this->m_running = false;
            continue;
        }

        p_this->codec = avcodec_find_decoder(p_this->ctx->codec_id);
        //是否启用GPU
        if (p_this->m_gpuIdx >= 0) {
            if (p_this->codec != NULL) {
                char cuvidName[40] = {0};
                sprintf(cuvidName, "%s_cuvid", p_this->codec->name);
                if (!strcmp(p_this->codec->name, "h264") || !strcmp(p_this->codec->name, "h265") ||
                    !strcmp(p_this->codec->name, "hevc")) {
                    p_this->codec_cuvid = avcodec_find_decoder_by_name(cuvidName);
                    if (p_this->codec_cuvid != NULL) {
                        p_this->codec = p_this->codec_cuvid;
                    } else {
//                    return false;
                    ERR("codec_cuvid is NULL");
                        ERR("codec_cuvid is NULL"  << p_this->m_camIdx);
                    }
                }
            }
        }
    }
    int err4 = avcodec_open2(p_this->ctx, p_this->codec, nullptr);

    av_init_packet(&p_this->pkt);

    p_this->frame = av_frame_alloc();
    unsigned int usleepTime = (1000 / p_this->m_fps) - 12;
    usleepTime *= 1000;
    DBG(" before while <<usleepTime is " << usleepTime);
    while (p_this->m_running) {
#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);
        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);
            usleep(40000);
        err = avcodec_open2(p_this->ctx, p_this->codec, nullptr);
        if (err) {
            ERR("avcodec_open2: err======" << err  << p_this->m_camIdx);
//        avformat_close_input(&p_this->ic);
//        DBG("avformat_close_input(&p_this->ic);");
//        avcodec_free_context(&p_this->ctx);
//        DBG("avcodec_free_context(&p_this->ctx);");
            p_this->m_running = false;
            continue;
        }
        //DBG("GotPicture "<<m_camId<<":"<<frame_number);
        //放在此处是因为之前放在前面,收到的帧不完成
        p_this->SaveToPacketVector(p_this->pkt);
        p_this->CheckSave();

        av_init_packet(&p_this->pkt);

        p_this->frame = av_frame_alloc();
        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
            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);
            int err7 = avcodec_receive_frame(p_this->ctx, p_this->frame);
            if ((err7 == AVERROR(EAGAIN)) || (err5 < 0) || (err6 < 0)) {
                ERR("  err======: err7" << err7 << "  err5: " << err5 << " err6: " << err6  << p_this->m_camIdx);
                usleep(40000);
                continue;
            }
            //DBG("GotPicture "<<m_camId<<":"<<frame_number);
            //放在此处是因为之前放在前面,收到的帧不完成
            p_this->SaveToPacketVector(p_this->pkt);
            p_this->CheckSave();

//        BASICGB28181::avframe_to_cvmat(frame).copyTo(p_this->m_image);
        p_this->m_image = std::move(BASICGB28181::avframe_to_cvmat(p_this->frame));
            p_this->m_image = std::move(BASICGB28181::avframe_to_cvmat(p_this->frame));

#ifdef TestCode
        {
//            TestCode 测试代码保存图片到本地
            ClockTimer cl("TestCode");
            std::string strNewTime2 = AppUtil::getTimeUSecString();
            cv::putText(p_this->m_image, strNewTime2, cv::Point(408, 540), cv::HersheyFonts::FONT_HERSHEY_PLAIN,
                        5, cv::Scalar(255, 255, 0), 2);
            std::thread test([&](cv::Mat img, std::string strThing) {
                try {
                    std::string strNewTime = "tmpDec/";
                    strNewTime.append(p_this->m_camIdx + "_").append(strThing).append(".jpg");
//                    cv::imwrite(strNewTime, p_this->m_image);
                } catch (std::exception ex) {
                    ERR(ex.what());
                }
            }, p_this->m_image, strNewTime2);
            test.detach();
        }
            {
    //            TestCode 测试代码保存图片到本地
                ClockTimer cl("TestCode");
                std::string strNewTime2 = AppUtil::getTimeUSecString();
                cv::putText(p_this->m_image, strNewTime2, cv::Point(408, 540), cv::HersheyFonts::FONT_HERSHEY_PLAIN,
                            5, cv::Scalar(255, 255, 0), 2);
                std::thread test([&](cv::Mat img, std::string strThing) {
                    try {
                        std::string strNewTime = "tmpDec/";
                        strNewTime.append(p_this->m_camIdx + "_").append(strThing).append(".jpg");
    //                    cv::imwrite(strNewTime, p_this->m_image);
                    } catch (std::exception ex) {
                        ERR(ex.what());
                    }
                }, p_this->m_image, strNewTime2);
                test.detach();
            }
#endif

        //#todo send to other thd
            //#todo send to other thd
#ifdef TestCode
        DBG("emitSigal(\"DecoderImageOK\") begin");
            DBG("emitSigal(\"DecoderImageOK\") begin");
#endif
        //触发信号
        gSignalLock.emitSigal(p_this->m_camIdx + "DecoderImageOK");
            //触发信号
            gSignalLock.emitSigal(p_this->m_camIdx + "DecoderImageOK");
//#ifdef TestCode
//        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
        {
            ClockTimer cl("waitTime");
            int loop = 0;
            //#TODO
//            while ((loop++ < 3000) && !(p_this->m_readData)) {
//                usleep(10);
//            }
            {
                ClockTimer cl("waitTime");
                int loop = 0;
                //#TODO
    //            while ((loop++ < 3000) && !(p_this->m_readData)) {
    //                usleep(10);
    //            }

            usleep(30000);
            DBG("p_this->m_readData is " << p_this->m_readData << "  loop is " << loop << " queue size is "
                                         << p_this->m_rtpQueue.count_queue());
            p_this->m_readData = false;
//        usleep(12000);
        }
                usleep(30000);
                DBG("p_this->m_readData is " << p_this->m_readData << "  loop is " << loop << " queue size is "
                                             << p_this->m_rtpQueue.count_queue());
                p_this->m_readData = false;
    //        usleep(12000);
            }
#else
        usleep(usleepTime);
//            usleep(usleepTime);
#endif

        }
        DBG(" after while ");
        av_frame_free(&p_this->frame);
    }
    DBG(" after while ");
    av_frame_free(&p_this->frame);
}

bool BASICGB28181::FFmpegDecoderJPG::startThd(const std::string &camIdx, const int &fps, const int &gpuIdx) {
@@ -296,6 +334,7 @@
            setenv("CUDA_VISIBLE_DEVICES", std::to_string(gpuIdx).c_str(), 0);
        }
        m_camIdx = camIdx;
        DBG("BareFlowDecoderThd camIdx : " << camIdx);
        std::thread t_BareFlowDecoder(BareFlowDecoderThd, this);
        t_BareFlowDecoder.detach();
    );
@@ -550,40 +589,19 @@
    if ((packet != nullptr) && (inVideoStream != nullptr)) {
        AVStream *inStream = (AVStream *) inVideoStream;
        AVPacket *pkg = static_cast<AVPacket *>(packet);
//        static unsigned  long int frame_index = 0
//            pkg->dts = ++frame_index;
//            pkg->pts = frame_index;

            //todo
//        if(pkg->pts==AV_NOPTS_VALUE){
            DBG("frame_index==%d\n" << frame_index);
            //Write PTS
            AVRational time_base1=inStream->time_base;
            //Duration between 2 frames (us)
            int64_t calc_duration=(double)AV_TIME_BASE/av_q2d(inStream->r_frame_rate);
            //Parameters
            pkg->pts=(double)(frame_index*calc_duration)/(double)(av_q2d(time_base1)*AV_TIME_BASE);
            pkg->dts=pkg->pts;
            pkg->duration=(double)calc_duration/(double)(av_q2d(time_base1)*AV_TIME_BASE);
//            frame_index++;
//        }
//        else{
//            DBG("pts" << pkg->pts << "firstKeyPts" << firstKeyPts);
//            DBG("dts" << pkg->dts << "firstKeyDts" << firstKeyDts);
//            pkg->pts -= firstKeyPts;
//            pkg->dts -= firstKeyDts;
//            pkg->pts = av_rescale_q_rnd(pkg->pts, inStream->time_base,
//                                        m_pOutVideo_stream->time_base,
//                                        (AVRounding) (AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX));
//            pkg->dts = av_rescale_q_rnd(pkg->dts, inStream->time_base,
//                                        m_pOutVideo_stream->time_base,
//                                        (AVRounding) (AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX));
//            pkg->duration = av_rescale_q(pkg->duration, inStream->time_base,
//                                         m_pOutVideo_stream->time_base);
//            pkg->pos = -1;
//        }

        DBG("pts:" << pkg->pts);
        DBG("dts:" << pkg->dts);
        DBG("frame_index==%d\n" << frame_index);
        //Write PTS
        AVRational time_base1=inStream->time_base;
        //Duration between 2 frames (us)
        int64_t calc_duration=(double)AV_TIME_BASE/av_q2d(inStream->r_frame_rate);
        //Parameters
        pkg->pts=(double)(frame_index*calc_duration)/(double)(av_q2d(time_base1)*AV_TIME_BASE);
        pkg->dts=pkg->pts;
        pkg->duration=(double)calc_duration/(double)(av_q2d(time_base1)*AV_TIME_BASE);

//        DBG("pts:" << pkg->pts);
//        DBG("dts:" << pkg->dts);
    }
}