From b8c69e1f08f748dd19da3637f23bf680ad14b0ec Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 29 十一月 2019 13:30:38 +0800
Subject: [PATCH] update
---
csrc/wrapper.cpp | 217 ++----------------------------------------------------
1 files changed, 8 insertions(+), 209 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 803ebac..d1cbfbf 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -202,7 +202,7 @@
int64_t v_id = id;
int64_t a_id = id;
- bool exist = access(input_url_.c_str(), 0) == 0 ? true : false;
+ bool exist = access(input_url_.c_str(), 0) == 0;
while(!stop_stream_.load()){
auto data(std::make_shared<CodedData>());
@@ -241,6 +241,7 @@
}
deinit_worker();
+ if (exist) break;
}
}
@@ -298,69 +299,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;
@@ -369,15 +307,13 @@
int fps;
int br;
int gi;
+ int pix_fmt;
int flag;
- int fmt;
cvbridge *bridge;
} PicEncoder;
void *CreateEncoder(const int w, const int h, const int fps, const int br,
- const int scale_flag, const int gi, const int fmt, const char *file){
-
- if (fmt < 0) return NULL;
+ const int pix_fmt, const int scale_flag, const int gi){
PicEncoder *e = (PicEncoder*)malloc(sizeof(PicEncoder));
e->enc = NULL;
@@ -386,8 +322,8 @@
e->fps = fps;
e->br = br;
e->gi = gi;
+ e->pix_fmt = pix_fmt;
e->flag = scale_flag;
- e->fmt = fmt;
e->bridge = NULL;
VideoProp prop_;
@@ -397,10 +333,7 @@
prop_.bit_rate_ = br;
gi < 0 ? prop_.gpu_acc_ = false : prop_.gpu_acc_ = true;
- std::string filename("./88.mp4");
- if (file) filename = file;
-
- FormatOut *enc = new FormatOut(prop_, filename.c_str());
+ FormatOut *enc = new FormatOut(prop_, "./88.mp4");
e->enc = enc;
return e;
@@ -425,11 +358,11 @@
if (e->bridge == NULL){
e->bridge = new cvbridge(
- w, h, e->fmt,
+ w, h, e->pix_fmt,
e->w, e->h, ctx->pix_fmt, e->flag);
}
- AVFrame *bgr_frame = cvbridge::fillFrame(in, w, h, e->fmt);
+ AVFrame *bgr_frame = cvbridge::fillFrame(in, w, h, e->pix_fmt);
AVFrame *frame = e->bridge->convert2Frame(bgr_frame);
av_frame_free(&bgr_frame);
@@ -458,140 +391,6 @@
av_frame_free(&frame);
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;
-
- Conv *c = (Conv*)malloc(sizeof(Conv));
- c->b = bridge;
- c->dstW = dstW;
- c->dstH = dstH;
- c->srcW = srcW;
- c->srcH = srcH;
- c->srcF = srcFormat;
-
- return c;
- }
-
- 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);
- }
-
-// mjpeg av pix fmt yuv420p
-
- static int save2PIC(uint8_t *data, const int w, const int h, const char *filename){
- AVPixelFormat src_fmt = AV_PIX_FMT_BGR24;
- AVPixelFormat dst_fmt = AV_PIX_FMT_YUV420P;
-
- cvbridge *bridge = new cvbridge(w, h, src_fmt, w, h, dst_fmt, 16);
-
- AVFrame *bgr_frame = cvbridge::fillFrame(data, w, h, src_fmt);
- AVFrame *frame_jpeg = bridge->convert2Frame(bgr_frame);
- av_frame_free(&bgr_frame);
-
- AVFormatContext *ctx = avformat_alloc_context();
- ctx->oformat = av_guess_format("mjpeg", NULL, NULL);
- if( avio_open(&ctx->pb, filename, AVIO_FLAG_READ_WRITE) < 0) {
- printf("Couldn't open output file.");
- avformat_free_context(ctx);
-
- delete bridge;
- return -1;
- }
- AVStream* pAVStream = avformat_new_stream(ctx, 0);
- if( pAVStream == NULL ){
- delete bridge;
- return -1;
- }
- AVCodecContext* pCodecCtx = pAVStream->codec;
- pCodecCtx->codec_id = ctx->oformat->video_codec;
- pCodecCtx->codec_type = AVMEDIA_TYPE_VIDEO;
- pCodecCtx->pix_fmt = dst_fmt;
- pCodecCtx->width = w;
- pCodecCtx->height = h;
- pCodecCtx->time_base.num = 1;
- pCodecCtx->time_base.den = 25;
- AVCodec* pCodec = avcodec_find_encoder(pCodecCtx->codec_id);
- if( !pCodec ) {
- printf("Codec not found.");
- avformat_free_context(ctx);
-
- delete bridge;
- return -1;
- }
- if( avcodec_open2(pCodecCtx, pCodec, NULL) < 0 ){
- printf("Could not open codec.");
- avformat_free_context(ctx);
- avio_close(ctx->pb);
- delete bridge;
- return -1;
- }
- avformat_write_header(ctx, NULL);
- int y_size = pCodecCtx->width * pCodecCtx->height;
- AVPacket pkt;
- av_new_packet(&pkt, y_size * 3);
- int got_picture = 0;
- int ret = avcodec_encode_video2(pCodecCtx, &pkt, frame_jpeg, &got_picture);
- av_frame_free(&frame_jpeg);
- delete bridge;
- if( ret < 0 ) {
- printf("Encode Error.\n");
- avformat_free_context(ctx);
- if( pAVStream ) {
- avcodec_close(pAVStream->codec);
- }
- avio_close(ctx->pb);
-
- return -1;
- }
- if( got_picture == 1 ) {
- pkt.stream_index = pAVStream->index;
- ret = av_write_frame(ctx, &pkt);
- avio_flush(ctx->pb);
- }
- av_free_packet(&pkt);
- //Write Trailer
- av_write_trailer(ctx);
- if( pAVStream ) {
- avcodec_close(pAVStream->codec);
- }
- avio_close(ctx->pb);
- avformat_free_context(ctx);
- return 0;
}
}
--
Gitblit v1.8.0