From 7c633d177d37dbe54648c194ea2632a59eb92911 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 24 九月 2019 13:50:18 +0800
Subject: [PATCH] update ffmpeg decode and audio rec
---
csrc/wrapper.cpp | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 757f0bb..d27aa75 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -226,21 +226,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 +264,36 @@
}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;
+
+ 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{
--
Gitblit v1.8.0