From 4587f8d5507300782e329f9527f35f905f3bb697 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 29 十月 2019 14:13:25 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
csrc/wrapper.cpp | 89 +++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 58 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index fe6d576..86662a1 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;
@@ -53,6 +52,7 @@
,decoder_(nullptr)
,rec_(new rec)
,logit_(false)
+ ,fps_(25)
{
makeTheWorld();
}
@@ -160,15 +160,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 (stream_) stream_->SetPacket(pkt);
+ if (decoder_ && run_dec_) flag = decoder_->SetFrame(pkt);
+ if (rec_->Loaded()) rec_->SetPacket(pkt);
return flag;
}
@@ -190,6 +190,8 @@
continue;
}
+ fps_ = in->getFPS();
+
int wTime = 1000000.0 / in->getFPS() ;
wTime >>= 1;
logIt("WAIT TIME PER FRAME: %d", wTime);
@@ -197,7 +199,9 @@
init_worker(in.get());
int64_t id = gb_ ? 0 : -1;
-
+ int64_t v_id = id;
+ int64_t a_id = id;
+
bool exist = access(input_url_.c_str(), 0) == 0 ? true : false;
while(!stop_stream_.load()){
@@ -206,25 +210,34 @@
logIt("read packet error, id: %lld", id);
break;
}
+ // 闈為煶瑙嗛
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();
@@ -235,16 +248,16 @@
rec_->SetRecMinCacheTime(mind);
}
- void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur, const bool audio){
+ 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);};
}
}
@@ -488,45 +501,5 @@
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);
- }
}
--
Gitblit v1.8.0