From c60d61c48c7a1e7b693d4c3f6427e3b616d1f471 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 21 十月 2019 12:29:33 +0800
Subject: [PATCH] update ffmpeg
---
csrc/wrapper.cpp | 48 +++---------------------------------------------
1 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index fe6d576..9d0c679 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -25,8 +25,6 @@
#include "worker/decoder.hpp"
#include "worker/rec.hpp"
-#include "CUDALERP.h"
-
using namespace logif;
using namespace ffwrapper;
@@ -235,16 +233,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 +486,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