From 18a05d269516a5e33d8460291c2f93e73d95adce Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 26 十二月 2023 10:45:31 +0800
Subject: [PATCH] GetYUV format is NV12
---
csrc/wrapper.cpp | 75 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index e4540b3..a84fd19 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -50,6 +50,7 @@
,run_dec_(false)
,run_stream_(true)
,run_rec_(false)
+ ,work_start(false)
,thread_(nullptr)
,stop_stream_(false)
,stream_(nullptr)
@@ -72,6 +73,7 @@
,run_dec_(false)
,run_stream_(true)
,run_rec_(false)
+ ,work_start(false)
,thread_(nullptr)
,stop_stream_(false)
,stream_(nullptr)
@@ -103,6 +105,8 @@
}
if (logit_)
logif::DestroyLogger();
+
+ printf("wrapper release\n");
}
std::unique_ptr<ffwrapper::FormatIn> Wrapper::init_reader(const char* input){
@@ -113,32 +117,23 @@
prop.gpu_acc_ = false;
prop.gpu_index_ = devid_;
- std::unique_ptr<FormatIn> in(new FormatIn(prop, prop.gpuAccl()));
+ std::unique_ptr<FormatIn> in(nullptr);
int flag = -1;
-#ifdef GB28181
+ AVDictionary* avdic = NULL;
if (gb_){
- flag = in->openGb28181(input, NULL);
+ in.reset(new FormatInGB(prop));
}else{
-#endif
- AVDictionary *avdic = prop.optsFormat();
- if(avdic){
- flag = in->open(input, &avdic);
- av_dict_free(&avdic);
- }else{
- flag = in->open(input, NULL);
- }
-#ifdef GB28181
+ in.reset(new FormatIn(prop, prop.gpuAccl()));
+ avdic = prop.optsFormat();
}
-#endif
-
- if(flag == 0){
- if(!in->findStreamInfo(NULL)){
- logIt("can't find video stream\n");
- return nullptr;
- }
-
- return in;
+
+ if(avdic){
+ flag = in->open(input, &avdic);
+ av_dict_free(&avdic);
+ }else{
+ flag = in->open(input, NULL);
}
+ if(flag == 0) return in;
return nullptr;
}
@@ -183,7 +178,7 @@
int Wrapper::run_worker(ffwrapper::FormatIn *in, const CPacket &pkt){
if (gb_){
AVPacket &p = pkt.data->getAVPacket();
- p.pts = p.dts = AV_NOPTS_VALUE;
+ // p.pts = p.dts = AV_NOPTS_VALUE;
}
int flag = 0;
if (run_stream_ && stream_) stream_->SetPacket(pkt);
@@ -205,22 +200,32 @@
int64_t file_frame = 0;
using namespace std;
- const string gb_suffix[] = {"/StreamType=2", "/StreamType=3", ""};
+ // const string gb_suffix[] = {"/StreamType=2", "/StreamType=3", ""};
+ // const string gb_suffix[] = {"/StreamType=2", ""};
+ const string gb_suffix[] = {""};
const size_t gb_size = sizeof(gb_suffix) / sizeof(string);
int gs_idx = 0;
- string url = input_url_;
+ string url;
+ url.reserve(input_url_.size()*2);
+ url = input_url_;
+ work_start = false;
while(!stop_stream_.load()){
if (gb_){
if (input_url_.find("/StreamType=") == string::npos)
url = input_url_ + gb_suffix[gs_idx];
-
logIt("======>>input real url %s\n", url.c_str());
+ gs_idx = (gs_idx + 1) % gb_size;
}
auto in = init_reader(url.c_str());
if (!in) {
+ work_start = false;
logIt("ERROR: init_reader! url: %s\n", url.c_str());
- sleep(2);
+ usleep(126000);
+ // for(int i = 0; i < 10; i++){
+ // if (stop_stream_.load()) break;
+ if(gb_) usleep(2617000);
+ // }
continue;
}
@@ -234,6 +239,7 @@
wTime >>= 1;
init_worker(in.get());
+ work_start = true;
int64_t id = gb_ ? 0 : -1;
int64_t v_id = id;
@@ -249,7 +255,13 @@
while(!stop_stream_.load()){
auto data(std::make_shared<CodedData>());
- if (in->readPacket(&data->getAVPacket()) != 0){
+ auto ret = in->readPacket(&data->getAVPacket());
+ if (ret > 0){
+ sleep(2);
+ continue;
+ }
+
+ if (ret < 0){
logIt("read packet error, id: %lld", id);
break;
}
@@ -283,7 +295,6 @@
file_frame++;
usleep(wTime);
}
-
}
deinit_worker();
@@ -335,7 +346,7 @@
}
int Wrapper::GetInfoRecorder(std::string &recID, int &index, std::string &path){
- if (rec_){
+ if (work_start && rec_){
rec_->GetRecInfo(recID, index, path);
}
return 0;
@@ -351,6 +362,10 @@
}
if (decoder_){
decoder_->GetFrame(data, w, h, format, length, id);
+ }else {
+ if (work_start){
+ for(int i = 0; i < 6; i++)this_thread::sleep_for(chrono::seconds{1});
+ }
}
return 0;
}
@@ -360,7 +375,7 @@
}
int Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
- if (stream_){
+ if (work_start && stream_){
stream_->GetPacket(pktData, size, key);
}
return 0;
--
Gitblit v1.8.0