From e6725cb3cf4ced3a6985d4d3db4d5cf1336a30d8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 19 七月 2019 16:53:35 +0800
Subject: [PATCH] merge so
---
csrc/wrapper.cpp | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 159 insertions(+), 7 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 9b4a88a..35137c7 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -12,6 +12,7 @@
#include "ffmpeg/configure/conf.hpp"
#include "ffmpeg/format/FormatIn.hpp"
+#include "ffmpeg/format/FormatOut.hpp"
#include "ffmpeg/property/VideoProp.hpp"
#include "ffmpeg/data/CodedData.hpp"
#include "ffmpeg/data/FrameData.hpp"
@@ -36,6 +37,9 @@
,scale_w_(0)
,scale_h_(0)
,scale_f_(SWS_POINT)
+ ,gb_(0)
+ ,cpu_(0)
+ ,encoder_(nullptr)
{
makeTheWorld();
}
@@ -53,6 +57,9 @@
if(recorder_){
delete recorder_; recorder_ = NULL;
}
+ if (encoder_){
+ delete encoder_; encoder_ = NULL;
+ }
}
void Wrapper::ScalePicture(const int w, const int h, const int flags){
@@ -61,11 +68,20 @@
scale_h_ = h;
}
+ void Wrapper::UseGB28181(){
+ gb_ = 1;
+ }
+
+ void Wrapper::UseCPU(){
+ cpu_ = 1;
+ }
+
std::unique_ptr<ffwrapper::FormatIn> Wrapper::init_reader(const char* input){
VideoProp prop;
prop.url_ = input;
prop.rtsp_tcp_ = true;
+ prop.gpu_acc_ = !cpu_;
std::unique_ptr<FormatIn> in(new FormatIn(prop.gpuAccl()));
AVDictionary *avdic = prop.optsFormat();
@@ -108,8 +124,8 @@
VideoProp prop;
prop.url_ = input;
prop.rtsp_tcp_ = true;
+ prop.gpu_acc_ = !cpu_;
-// std::unique_ptr<FormatIn> in(new FormatIn(prop.gpuAccl()));
ffwrapper::FormatIn* in(new FormatIn(prop.gpuAccl()));
AVDictionary *avdic = prop.optsFormat();
int flag = in->openGb28181(input, &avdic);
@@ -180,15 +196,24 @@
}
void Wrapper::run_stream_thread(){
+
+ std::unique_ptr<FormatIn> fi(nullptr);
+
while(!stop_stream_.load()){
- //auto in = init_reader(input_url_.c_str());
- ffwrapper::FormatIn * in = init_reader_gb28181(input_url_.c_str());
+ FormatIn *in = NULL;
+ if (!gb_){
+ fi = init_reader(input_url_.c_str());
+ in = fi.get();
+ }else{
+ in = init_reader_gb28181(input_url_.c_str());
+ }
if (!in) {
- logIt("ERROR: init_reader_gb28181!\n");
+
+ logIt("ERROR: init_reader!\n");
usleep(200000);
continue;
}
- init_worker(in.get());
+ init_worker(in);
int64_t id = 0;
avpacket pkt;
@@ -202,7 +227,7 @@
}
pkt.data = data;
- run_worker(in.get(), pkt);
+ run_worker(in, pkt);
if(!data){
break;
}
@@ -210,6 +235,11 @@
if(recorder_)
if(id % 250 == 0)
recorder_->FireRecorder(id);
+ }
+ if (gb_){
+ delete in;
+ }else{
+ fi.reset(nullptr);
}
}
}
@@ -398,4 +428,126 @@
}
return NULL;
}
-}
\ No newline at end of file
+
+
+ void Wrapper::BuildEncoder(const char *file, const int w, const int h, const int fps, const int br, const int gi){
+ std::string dir(file);
+
+ map_workers_[WORKER_ENCODER] = [=](FormatIn *in){
+ return init_encoder(in, dir.c_str(), w, h, fps, br, gi);
+ };
+ }
+
+ int Wrapper::init_encoder(FormatIn *in, const char *file, const int w, const int h, const int fps, const int br, const int gi){
+ if(!in){
+ logIt("Init wrapper first");
+ return -1;
+ }
+ if(encoder_){
+ logIt("recorder exist");
+ delete encoder_;
+ }
+
+ VideoProp prop_;
+ AVCodecContext *ctx = in->getCodecContext();
+ if(w == 0 && h == 0){
+ prop_.width_ = ctx->width;
+ prop_.height_ = ctx->height;
+ }
+ prop_.sample_aspect_ratio_ = ctx->sample_aspect_ratio;
+ encoder_ = new FormatOut(prop_, file);
+
+ return 0;
+ }
+
+/////// for encoder
+ typedef struct _PicEncoder{
+ FormatOut *enc;
+ int w;
+ int h;
+ int fps;
+ int br;
+ int gi;
+ 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){
+
+ PicEncoder *e = (PicEncoder*)malloc(sizeof(PicEncoder));
+ e->enc = NULL;
+ e->w = w;
+ e->h = h;
+ e->fps = fps;
+ e->br = br;
+ e->gi = gi;
+ e->flag = scale_flag;
+ e->bridge = NULL;
+
+ VideoProp prop_;
+ prop_.width_ = w;
+ prop_.height_ = h;
+ prop_.fps_ = fps;
+ prop_.bit_rate_ = br;
+ gi < 0 ? prop_.gpu_acc_ = false : prop_.gpu_acc_ = true;
+
+ FormatOut *enc = new FormatOut(prop_, "./88.mp4");
+ e->enc = enc;
+
+ return e;
+ }
+
+ void DestroyEncoder(void *h){
+ PicEncoder *e = (PicEncoder*)h;
+ if (e == NULL){
+ return;
+ }
+
+ delete e->bridge;
+ delete e->enc;
+
+ free(e);
+ }
+
+ int Encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key){
+
+ PicEncoder *e = (PicEncoder*)hdl;
+ auto ctx = e->enc->getCodecContext();
+
+ if (e->bridge == NULL){
+ AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
+ e->bridge = new cvbridge(
+ w, h, AV_PIX_FMT_BGR24,
+ e->w, e->h, ctx->pix_fmt, e->flag);
+ }
+
+ AVFrame *frame = e->bridge->getAVFrame(in, w, h);
+ auto data(std::make_shared<CodedData>());
+
+ const int flag = e->enc->encode(data, frame);
+ if(flag > 0){
+ auto pkt = data->getAVPacket();
+ int extradata_size = ctx->extradata_size;
+ uint8_t *extra = ctx->extradata;
+
+ *key = pkt.flags & AV_PKT_FLAG_KEY;
+ if(!(*key)){
+ extradata_size = 0;
+ }
+ *size = pkt.size + extradata_size;
+ *out = (unsigned char *)malloc(*size);
+
+ memcpy(*out, extra, extradata_size);
+ memcpy(*out + extradata_size, pkt.data, pkt.size);
+
+ }else{
+ logIt("encode error or need more packet\n");
+ }
+
+ av_frame_free(&frame);
+
+ return flag;
+ }
+
+}
+
--
Gitblit v1.8.0