bug fix

zhangmeng

2019-09-25 1d2e7ce97e33c74a949d443a226df531fbf5c7dd

 csrc/wrapper.cpp

@@ -46,6 +46,7 @@
    ,audio_(false)
    ,gb_(0)
    ,cpu_(0)
    ,run_dec_(false)
    ,thread_(nullptr)
    ,stop_stream_(false)
    ,stream_(nullptr)
@@ -133,14 +134,17 @@
        decoder_ = new decoder(in, scale_w_, scale_h_, scale_f_);

        rec_->Load(in);
        if(fn_rec_lazy_) fn_rec_lazy_(in);
        if(fn_rec_lazy_) {
            fn_rec_lazy_();
            fn_rec_lazy_ = nullptr;
        }
    }
    
    void Wrapper::run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){

        if (stream_) stream_->SetPacket(data, id);
        if (decoder_ && run_dec_) decoder_->SetFrame(data, id);
        if (rec_->Loaded()) rec_->SetPacket(data, id);
        if (decoder_) decoder_->SetFrame(data, id);
    }

    void Wrapper::deinit_worker(){
@@ -166,14 +170,18 @@

            init_worker(in.get());

            int64_t id = 0;
            int64_t id = -1;
            while(!stop_stream_.load()){
                auto data(std::make_shared<CodedData>());
                if (in->readPacket(&data->getAVPacket()) != 0){
                    logIt("read packet error, id: %lld", id);
                    break;
                }
    	        
               if (id < 0){
                    id++;
                    continue;
                }
                
                run_worker(in.get(), data, id);
                usleep(wTime);

@@ -191,7 +199,7 @@
        }else{
            std::string rid(id), dir(output);
            fn_rec_lazy_ = 
            [=](ffwrapper::FormatIn *in){rec_->NewRec(rid.c_str(), dir.c_str(), mindur, maxdur, audio);};
            [=]{rec_->NewRec(rid.c_str(), dir.c_str(), mindur, maxdur, audio);};
        }
    }

@@ -208,7 +216,7 @@
    }
    ////////decoder
    void Wrapper::BuildDecoder(){
        // use_decoder_ = true;
        run_dec_ = true;
    }

    void Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int64_t *id){
@@ -216,7 +224,7 @@
            decoder_->GetFrame(data, w, h, id);
        }
    }

    
    void Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
        if (stream_){
            stream_->GetPacket(pktData, size, key);
@@ -226,21 +234,31 @@
} // end class wrapper
///////////////////////////////////////////////////////////
///single decode or encoder
    ////// decoder
////// decoder

#include "ffmpeg/data/FrameData.hpp"

// return val: -1 open error; -2, find stream error; -3, converter create
namespace cffmpeg_wrap{ // start test functions
    uint8_t* DecodeJPEG(const char *file, int *w, int *h){
    uint8_t* Decode(const char *file, const int gb, int *w, int *h){
        VideoProp prop;
        prop.url_ = file;
        prop.gpu_acc_ = false;

        std::unique_ptr<FormatIn> in(new FormatIn(prop.gpuAccl()));
        int flag = in->open(file, NULL);
        
        int flag = -1;
        if (gb){
            flag = in->openGb28181(file, NULL);
        }else{
            flag = in->open(file, NULL);
        }

        std::unique_ptr<cvbridge> bridge_(nullptr);

        if(flag == 0){
            if(!in->findStreamInfo(NULL)){
                logIt("yolo can't find video stream\n");
                *w = *h = -2;
                return NULL;
            }
            auto flag = in->openCodec(NULL);
@@ -254,27 +272,37 @@
    
            }else{
                logIt("FormatIn openCodec Failed!");
                *w = *h = -3;
                return NULL;
            }
        }else{
            logIt("open %s error", file);
            *w = *h = -1;
            return NULL;
        }
        
        uint8_t *data = NULL;
        AVPacket *pkt = av_packet_alloc();
        if(in->readPacket(pkt) == 0){
            AVFrame *frm = av_frame_alloc();
            if(in->decode(frm, pkt) == 0){
                *w = frm->width;
                *h = frm->height;
                data = (unsigned char*)malloc(frm->width * frm->height * 3);
                bridge_->copyPicture(data, frm);
        uint8_t *pic = NULL;
        *w = *h = 0;

        int tryTime = 0;
        while (tryTime++ < 100){
            
            auto data(std::make_shared<CodedData>());
            if (in->readPacket(&data->getAVPacket()) == 0){

                auto frame(std::make_shared<FrameData>());
                AVFrame *frm = frame->getAVFrame(); 
                if(in->decode(frm, &data->getAVPacket()) == 0){
                    *w = frm->width;
                    *h = frm->height;
                    pic = (unsigned char*)malloc(frm->width * frm->height * 3);
                    bridge_->copyPicture(pic, frm);
                    break;
                }
            }
            av_frame_free(&frm);
            av_packet_free(&pkt);
        }
        return data;

        return pic;
    }
/////// for encoder
    typedef struct _PicEncoder{