From 01d9022b47e5e20f39ca1115d334c43774378dfc Mon Sep 17 00:00:00 2001
From: zhangmeng <zhangmeng@aiiot.com>
Date: 星期三, 25 三月 2020 13:56:16 +0800
Subject: [PATCH] add log for local video
---
csrc/wrapper.cpp | 318 +++++++++++++++++++++-------------------------------
1 files changed, 131 insertions(+), 187 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index fe6d576..8ca7b16 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -24,8 +24,7 @@
#include "worker/stream.hpp"
#include "worker/decoder.hpp"
#include "worker/rec.hpp"
-
-#include "CUDALERP.h"
+#include "common.hpp"
using namespace logif;
using namespace ffwrapper;
@@ -47,12 +46,17 @@
,gb_(0)
,cpu_(0)
,run_dec_(false)
+ ,run_stream_(true)
+ ,run_rec_(false)
,thread_(nullptr)
,stop_stream_(false)
,stream_(nullptr)
,decoder_(nullptr)
,rec_(new rec)
,logit_(false)
+ ,fps_(25)
+ ,file_finished_(false)
+ ,min_duration_(0)
{
makeTheWorld();
}
@@ -63,12 +67,17 @@
,gb_(0)
,cpu_(0)
,run_dec_(false)
+ ,run_stream_(true)
+ ,run_rec_(false)
,thread_(nullptr)
,stop_stream_(false)
,stream_(nullptr)
,decoder_(nullptr)
,rec_(new rec)
,logit_(true)
+ ,fps_(25)
+ ,file_finished_(false)
+ ,min_duration_(0)
{
makeTheWorld();
logif::CreateLogger(logfile, true);
@@ -101,16 +110,19 @@
prop.gpu_acc_ = !cpu_;
std::unique_ptr<FormatIn> in(new FormatIn(prop.gpuAccl()));
- AVDictionary *avdic = prop.optsFormat();
int flag = -1;
if (gb_){
flag = in->openGb28181(input, NULL);
}else{
- flag = in->open(input, &avdic);
+ AVDictionary *avdic = prop.optsFormat();
+ if(avdic){
+ flag = in->open(input, &avdic);
+ av_dict_free(&avdic);
+ }else{
+ flag = in->open(input, NULL);
+ }
}
- if(avdic){
- av_dict_free(&avdic);
- }
+
if(flag == 0){
if(!in->findStreamInfo(NULL)){
logIt("can't find video stream\n");
@@ -150,7 +162,7 @@
stream_ = new stream(in, 3 * in->getFPS());
// stream_->AudioSwitch(audio_);
-
+
decoder_ = new decoder(in);
rec_->Load(in);
@@ -160,15 +172,15 @@
}
}
- int Wrapper::run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){
+ int Wrapper::run_worker(ffwrapper::FormatIn *in, const CPacket &pkt){
if (gb_){
- AVPacket &pkt = data->getAVPacket();
- pkt.pts = pkt.dts = AV_NOPTS_VALUE;
+ AVPacket &p = pkt.data->getAVPacket();
+ p.pts = p.dts = AV_NOPTS_VALUE;
}
int flag = 0;
- if (stream_) stream_->SetPacket(data, id);
- if (decoder_ && run_dec_) flag = decoder_->SetFrame(data, id);
- if (rec_->Loaded()) rec_->SetPacket(data, id);
+ if (run_stream_ && stream_) stream_->SetPacket(pkt);
+ if (run_dec_ && decoder_) flag = decoder_->SetFrame(pkt);
+ if (run_rec_ && rec_->Loaded()) rec_->SetPacket(pkt);
return flag;
}
@@ -181,6 +193,9 @@
void Wrapper::run_stream_thread(){
+ int64_t file_rebootime = 0;
+ int64_t file_frame = 0;
+
while(!stop_stream_.load()){
auto in = init_reader(input_url_.c_str());
@@ -190,15 +205,28 @@
continue;
}
- int wTime = 1000000.0 / in->getFPS() ;
+ fps_ = in->getFPS();
+
+ if (fps_ < 1 || fps_ > 200){
+ fps_ = 25;
+ }
+
+ int wTime = 1000000.0 / fps_ ;
wTime >>= 1;
- logIt("WAIT TIME PER FRAME: %d", wTime);
init_worker(in.get());
int64_t id = gb_ ? 0 : -1;
-
- bool exist = access(input_url_.c_str(), 0) == 0 ? true : false;
+ int64_t v_id = id;
+ int64_t a_id = id;
+
+ bool exist = access(input_url_.c_str(), 0) == 0;
+ if (exist){
+ wTime <<= 1;
+ file_rebootime++;
+ }
+
+ logIt("WAIT TIME PER FRAME: %d", wTime);
while(!stop_stream_.load()){
auto data(std::make_shared<CodedData>());
@@ -206,74 +234,119 @@
logIt("read packet error, id: %lld", id);
break;
}
+ if (exist){
+ // 璁板綍瑙ｇ爜鐨勬枃浠舵湁澶氬皯甯�
+ file_frame++;
+ }
+ // 闈為煶瑙嗛
if (in->notVideoAudio(&data->getAVPacket())){
continue;
}
+ // 闈炲浗鏍囪烦杩囩涓�甯�,娴嬭瘯绗竴甯ф湁闂
if (!gb_ && id < 0){
- id++;
+ id++; v_id++; a_id++;
continue;
}
-
+ CPacket pkt{data, v_id, a_id, id};
// decode error
- if (run_worker(in.get(), data, id) == -1){
+ if (run_worker(in.get(), pkt) == -1){
break;
}
+ if (in->isVideoPkt(&data->getAVPacket())){
+ v_id++;
+ }else{
+ a_id++;
+ }
+
+ id++;
+
+ //鏈湴鏂囦欢澶揩sleep涓�涓�
if (exist){
usleep(wTime);
}
- id++;
}
deinit_worker();
+ if (exist) {
+ // 涓夋涓�甯ч兘娌¤В鍑烘潵锛岄��鍑�
+ if (file_frame == 0 && file_rebootime < 3){
+ logIt("libcffmpeg.so-> run %lld time, current frames %lld", file_rebootime, file_frame);
+ continue;
+ }
+ // 鏈�灏忛渶瑕佽В鍑哄灏戝抚
+ if (file_frame < min_duration_ * fps_){
+ logIt("libcffmpeg.so-> run %lld time, current frames %lld, mind %d, fps: %d",
+ file_rebootime, file_frame, min_duration_, fps_);
+ continue;
+ }
+ logIt("libcffmpeg.so-> local file %s run %lld time, all frames %lld, mind %d, fps: %d",
+ input_url_.c_str(), file_rebootime, file_frame, min_duration_, fps_);
+ file_finished_ = true;
+ break;
+ }
}
}
- void Wrapper::SetRecMinCacheTime(const int mind){
- rec_->SetRecMinCacheTime(mind);
+ void Wrapper::SetRecMinCacheTime(const int mind, const int maxd){
+ min_duration_ = mind;
}
- void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur, const bool audio){
+ void Wrapper::OpenRecorder(){
+ run_rec_ = true;
+ }
+
+ void Wrapper::BuildRecorder(const char* id, const char *output, const int64_t &fid, const int mindur, const int maxdur, const bool audio){
bool a = audio;
if (gb_) a = false;
-
+
if (rec_->Loaded()){
- rec_->NewRec(id, output, mindur, maxdur, a);
+ rec_->NewRec(id, output, fid, mindur, maxdur, a);
}else{
std::string rid(id), dir(output);
fn_rec_lazy_ =
- [=]{rec_->NewRec(rid.c_str(), dir.c_str(), mindur, maxdur, a);};
+ [=]{rec_->NewRec(rid.c_str(), dir.c_str(), fid, mindur, maxdur, a);};
}
}
-
int Wrapper::FireRecorder(const char* sid,const int64_t &id){
if (rec_->Loaded()){
rec_->FireRecSignal(sid, id);
}
+ return 0;
}
- void Wrapper::GetInfoRecorder(std::string &recID, int &index, std::string &path){
+ int Wrapper::GetInfoRecorder(std::string &recID, int &index, std::string &path){
if (rec_){
rec_->GetRecInfo(recID, index, path);
}
+ return 0;
}
////////decoder
- void Wrapper::BuildDecoder(){
+ void Wrapper::OpenDecoder(){
run_dec_ = true;
}
- void Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id){
+ int Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id){
+ if (file_finished_){
+ return -1;
+ }
if (decoder_){
decoder_->GetFrame(data, w, h, format, length, id);
}
+ return 0;
}
- void Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
+ void Wrapper::CloseStream(){
+ run_stream_ = false;
+ }
+
+ int Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
if (stream_){
stream_->GetPacket(pktData, size, key);
}
+ return 0;
}
} // end class wrapper
@@ -285,69 +358,6 @@
// return val: -1 open error; -2, find stream error; -3, converter create
namespace cffmpeg_wrap{ // start test functions
- 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 = -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);
- if(flag){
- auto dec_ctx = in->getCodecContext();
-
- AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
- bridge_.reset(new cvbridge(
- dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt,
- dec_ctx->width, dec_ctx->height, pix_fmt, SWS_BICUBIC));
-
- }else{
- logIt("FormatIn openCodec Failed!");
- *w = *h = -3;
- return NULL;
- }
- }else{
- logIt("open %s error", file);
- *w = *h = -1;
- return NULL;
- }
-
- 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 = bridge_->convert2Data(frm);
- break;
- }
- }
- }
-
- return pic;
- }
/////// for encoder
typedef struct _PicEncoder{
FormatOut *enc;
@@ -356,11 +366,13 @@
int fps;
int br;
int gi;
+ int pix_fmt;
int flag;
cvbridge *bridge;
} PicEncoder;
- void *CreateEncoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi){
+ void *CreateEncoder(const int w, const int h, const int fps, const int br,
+ const int pix_fmt, const int scale_flag, const int gi){
PicEncoder *e = (PicEncoder*)malloc(sizeof(PicEncoder));
e->enc = NULL;
@@ -369,6 +381,7 @@
e->fps = fps;
e->br = br;
e->gi = gi;
+ e->pix_fmt = pix_fmt;
e->flag = scale_flag;
e->bridge = NULL;
@@ -402,14 +415,16 @@
PicEncoder *e = (PicEncoder*)hdl;
auto ctx = e->enc->getCodecContext();
- AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
if (e->bridge == NULL){
e->bridge = new cvbridge(
- w, h, AV_PIX_FMT_BGR24,
+ w, h, e->pix_fmt,
e->w, e->h, ctx->pix_fmt, e->flag);
}
- AVFrame *frame = cvbridge::fillFrame(in, w, h, pix_fmt);
+ AVFrame *bgr_frame = cvbridge::fillFrame(in, w, h, e->pix_fmt);
+ AVFrame *frame = e->bridge->convert2Frame(bgr_frame);
+ av_frame_free(&bgr_frame);
+
AVPacket *pkt = av_packet_alloc();
auto flag = e->enc->encode(pkt, frame);
@@ -437,96 +452,25 @@
return flag;
}
-///////////////////////////////////////////////////////////
- typedef struct _conv
- {
- int srcW;
- int srcH;
- int srcF;
- int dstW;
- int dstH;
- cvbridge *b;
- }Conv;
-
- void *CreateConvertor(const int srcW, const int srcH, const int srcFormat,
- const int dstW, const int dstH, const int dstFormat, const int flag){
-
- auto bridge = new cvbridge(
- srcW, srcH, srcFormat,
- dstW, dstH, dstFormat, flag);
- if (!bridge) return NULL;
+ int GetGb28181Pic(const char *rtspUrl, char *retData, int *retDataLen){
+ int ret = 0;
+ std::string fn = rtspUrl;
- Conv *c = (Conv*)malloc(sizeof(Conv));
- c->b = bridge;
- c->dstW = dstW;
- c->dstH = dstH;
- c->srcW = srcW;
- c->srcH = srcH;
- c->srcF = srcFormat;
+ auto handle_gb28181 = new GB28181API;
+ if(handle_gb28181->addCamera(fn) == -1){
+ delete(handle_gb28181);
+ logIt("do addCamera Error\n");
+ return -1;
+ }
- return c;
- }
+ int retLen = handle_gb28181->capturePic(handle_gb28181, retData, retDataLen);
+ if(retLen == 0){
+ logIt("do capturePic failed:%d");
+ ret = -1;
+ }
- uint8_t *Convert(void *h, uint8_t *src){
- Conv *c = (Conv*)h;
-
- auto b = c->b;
-
- AVFrame *tmp_frm = cvbridge::fillFrame(src, c->srcW, c->srcH, c->srcF);
- if (!tmp_frm) return NULL;
-
- unsigned char *picData = b->convert2Data(tmp_frm);
-
- av_frame_free(&tmp_frm);
-
- return picData;
- }
-
- void DestoryConvertor(void *h){
- Conv *c = (Conv*)h;
- delete c->b;
- free(c);
- }
-
-
- uint8_t* ConvertYUV2BGR(uint8_t *src, const int w, const int h, const int dst_w, const int dst_h, int *length){
- return NULL;
-
- // int oldw = w, oldh = h, neww = dst_w, newh = dst_h;
- // // setting cache and shared modes
- // cudaDeviceSetCacheConfig(cudaFuncCachePreferL1);
- // cudaDeviceSetSharedMemConfig(cudaSharedMemBankSizeFourByte);
-
- // // allocating and transferring image and binding to texture object
- // cudaChannelFormatDesc chandesc_img = cudaCreateChannelDesc(8, 0, 0, 0, cudaChannelFormatKindUnsigned);
- // cudaArray* d_img_arr;
- // cudaMallocArray(&d_img_arr, &chandesc_img, oldw, oldh, cudaArrayTextureGather);
- // cudaMemcpyToArray(d_img_arr, 0, 0, image, oldh * oldw, cudaMemcpyHostToDevice);
- // struct cudaResourceDesc resdesc_img;
- // memset(&resdesc_img, 0, sizeof(resdesc_img));
- // resdesc_img.resType = cudaResourceTypeArray;
- // resdesc_img.res.array.array = d_img_arr;
- // struct cudaTextureDesc texdesc_img;
- // memset(&texdesc_img, 0, sizeof(texdesc_img));
- // texdesc_img.addressMode[0] = cudaAddressModeClamp;
- // texdesc_img.addressMode[1] = cudaAddressModeClamp;
- // texdesc_img.readMode = cudaReadModeNormalizedFloat;
- // texdesc_img.filterMode = cudaFilterModePoint;
- // texdesc_img.normalizedCoords = 0;
- // cudaTextureObject_t d_img_tex = 0;
- // cudaCreateTextureObject(&d_img_tex, &resdesc_img, &texdesc_img, nullptr);
-
- // uint8_t* d_out = nullptr;
- // cudaMalloc(&d_out, total);
-
- // for (int i = 0; i < warmups; ++i) CUDALERP(d_img_tex, oldw, oldh, d_out, neww, newh);
- // auto start = high_resolution_clock::now();
- // for (int i = 0; i < runs; ++i) CUDALERP(d_img_tex, oldw, oldh, d_out, neww, newh);
- // auto end = high_resolution_clock::now();
- // auto sum = (end - start) / runs;
-
- // auto h_out = new uint8_t[neww * newh];
- // cudaMemcpy(h_out, d_out, total, cudaMemcpyDeviceToHost);
+ handle_gb28181->deleteCamera();
+ return ret;
}
}
--
Gitblit v1.8.0