添加resize到1920,1080设置

Hu Chunming
1 parent afd07f06
Showing 15 changed files with 302 additions and 71 deletions
src/ai_platform/MultiSourceProcess.cpp
src/decoder/dvpp/DvppDataMemory.hpp
src/decoder/dvpp/DvppDecoder.cpp
src/decoder/dvpp/DvppDecoder.h
src/decoder/dvpp/DvppDecoderApi.cpp
src/decoder/dvpp/DvppDecoderApi.h
src/decoder/dvpp/VpcPicConverter.cpp → src/decoder/dvpp/VpcUtils.cpp
src/decoder/dvpp/VpcPicConverter.h → src/decoder/dvpp/VpcUtils.h
src/decoder/dvpp/dvpp_headers.h
src/decoder/interface/AbstractDecoder.h
src/decoder/interface/DecoderManager.cpp
src/decoder/interface/DecoderManager.h
src/decoder/interface/DeviceMemory.hpp
src/decoder/interface/interface_headers.h
src/demo/demo.cpp
@@ -84,17 +84,17 @@ CMultiSourceProcess::~CMultiSourceProcess(){
 }
  
 int CMultiSourceProcess::InitAlgorthim(tsl_aiplatform_param vptParam){
-#ifdef USE_VILLAGE
-  if (!CheckTime()) { //时间限制
-    std::cout << "sy_licence_check failed." << std::endl;
-    return AUTHOR_ERROR;
-  }
-#else
-  if (!CheckLabel(vptParam.gpuid)) { //机器授权
-    std::cout << "sy_licence_check failed." << std::endl;
-    return AUTHOR_ERROR;
-  }
-#endif
+// #ifdef USE_VILLAGE
+//   if (!CheckTime()) { //时间限制
+//     std::cout << "sy_licence_check failed." << std::endl;
+//     return AUTHOR_ERROR;
+//   }
+// #else
+//   if (!CheckLabel(vptParam.gpuid)) { //机器授权
+//     std::cout << "sy_licence_check failed." << std::endl;
+//     return AUTHOR_ERROR;
+//   }
+// #endif
   set_default_logger(LogLevel(vptParam.log_level), "multi_source_process", vptParam.log_path, vptParam.log_mem, vptParam.log_mem);
   LOG_INFO("编译时间：{} {}", __DATE__, __TIME__);
  
@@ -324,7 +324,8 @@ bool CMultiSourceProcess::AddTask(task_param _cur_task_param){
     config.cfg.force_tcp = true;  // rtsp用tcp
     config.cfg.gpuid = to_string(m_devId);
     config.cfg.skip_frame = skip_frame_;
-
+    config.cfg.resize = true;
+    
     if (1 == _cur_task_param.dec_type){
       config.cfg.port = _cur_task_param.port;
       config.dec_type = DECODER_TYPE_GB28181;
@@ -360,7 +361,7 @@ bool CMultiSourceProcess::AddTask(task_param _cur_task_param){
  
     int input_image_width = 0;
     int input_image_height = 0;
-    pDecManager->getResolution(config.name, input_image_width, input_image_height);
+    pDecManager->getOutResolution(config.name, input_image_width, input_image_height);
     LOG_INFO("task_id: {} width: {} height:{}", task_id, input_image_width, input_image_height);
  
      // 所有参数都准备好之后再启动解码
@@ -761,21 +762,21 @@ int CMultiSourceProcess::algorthim_process_thread(){
     ACL_CALL(aclrtCreateContext(&ctx, m_devId), ACL_SUCCESS, 1);
  
     while (true){
-#ifdef USE_VILLAGE
-        if (!CheckTime()) { //时间限制
-          LOG_FATAL("authority failed!");
-          break;
-        }
-#else
-        if (check_label == -1) { //机器授权
-          LOG_FATAL("authority failed!");
-          break;
-        }
-        if (!UpdateLabel()) {
-          LOG_FATAL("authority failed!");
-          break;
-        }
-#endif
+// #ifdef USE_VILLAGE
+//         if (!CheckTime()) { //时间限制
+//           LOG_FATAL("authority failed!");
+//           break;
+//         }
+// #else
+//         if (check_label == -1) { //机器授权
+//           LOG_FATAL("authority failed!");
+//           break;
+//         }
+//         if (!UpdateLabel()) {
+//           LOG_FATAL("authority failed!");
+//           break;
+//         }
+// #endif
         if(m_bfinish){
             break;
         }
+#ifndef __DVPP_DATA_MEMORY_HPP__
+#define __DVPP_DATA_MEMORY_HPP__
+
 #include<string>
  
 #include "depend_headers.h"
@@ -66,11 +69,11 @@ public:
             }
             pHwRgb = nullptr;
         }
-
-        
-        
     }
  
 public:
     int data_type;  // 0: rgb , 1: NV12
-};
 \ No newline at end of file
+};
+
+
+#endif      // __DVPP_DATA_MEMORY_HPP__
 \ No newline at end of file
@@ -184,6 +184,9 @@ AVCodecContext* DvppDecoder::init_FFmpeg(FFDecConfig config){
 		frame_height = codecpar->height;
 		pix_fmt = (AVPixelFormat)codecpar->format;
  
+        m_bResize = config.resize;
+        calcOutResolution(frame_width, frame_height);
+
         if (stream->avg_frame_rate.den) {
             m_fps = av_q2d(stream ->avg_frame_rate);
         } else {
@@ -197,7 +200,7 @@ AVCodecContext* DvppDecoder::init_FFmpeg(FFDecConfig config){
         }  
 #endif
  
-        LOG_INFO("[{}]- init ffmpeg success! input:{} frame_width:{} frame_height:{} fps:{} ", m_dec_name, input_file, frame_width, frame_height, m_fps);
+        LOG_INFO("[{}]- init ffmpeg success! input:{} src:({}, {}) out:({}, {}) fps:{} ", m_dec_name, input_file, frame_width, frame_height, out_frame_width, out_frame_height, m_fps);
  
 		return avctx;
 	}while(0);
@@ -209,6 +212,33 @@ AVCodecContext* DvppDecoder::init_FFmpeg(FFDecConfig config){
     return nullptr;
 }
  
+void DvppDecoder::calcOutResolution(int width, int height) {
+    if(m_bResize) {
+        float srcRatio = width / (float)height;
+        float stdRatio = 1920.0 / 1080.0f ;
+        int outWidth = 1920;
+        int outHeight = 1080;
+        if (srcRatio > stdRatio) {
+            outHeight = static_cast<int>(outWidth * (float)height / width) ;
+            if (outHeight % 2 == 1) {
+                outHeight += 1;
+            }
+        } else if (srcRatio < stdRatio) {
+            outWidth = static_cast<int>(outHeight * (float)width / height) ;
+            if (outWidth % 2 == 1) {
+                outWidth += 1;
+            }
+        }
+
+        out_frame_width = outWidth;
+        out_frame_height = outHeight;
+    } else {
+        out_frame_width = width;
+        out_frame_height = height;
+    }
+    
+}
+
 int DvppDecoder::getVdecType(int videoType, int profile)
 {
     int streamFormat = H264_MAIN_LEVEL;
@@ -277,6 +307,9 @@ int DvppDecoder::getVdecType(int videoType, int profile)
             LOG_ERROR("[{}]-该设备channel已经用完了!", m_dec_name);
             return false;
         }
+
+        m_vpcUtils.init(m_dvpp_deviceId);
+
         m_vdec_out_size = frame_width * frame_height * 3 / 2;
  
         LOG_INFO("[{}]- init vdpp success! device:{} channel:{}", m_dec_name, m_dvpp_deviceId, m_dvpp_channel);
@@ -353,6 +386,12 @@ bool DvppDecoder::getResolution(int &amp;width, int &amp;height){
 	return true;
 }
  
+bool DvppDecoder::getOutResolution( int &width, int &height ) {  
+    width = out_frame_width;
+    height = out_frame_height;
+    return true;
+}
+
 float DvppDecoder::fps(){
     return m_fps;
 }
@@ -532,11 +571,6 @@ void DvppDecoder::read_thread() {
     #endif
                     nSended = sendPkt(vdecChannelDesc, pkt, frame_nb);
  
-                    if(!m_bReal && frame_nb > 20 && m_avg_decode_time > 0) 
-                    {
-                        // 针对文件，根据解码时间做延时，避免占用过多显存
-                        std::this_thread::sleep_for(std::chrono::milliseconds(10));
-                    }
                 }
  
                 if(nSended < 0) {
@@ -767,12 +801,43 @@ void DvppDecoder::doVdppVdecCallBack(acldvppStreamDesc *input, acldvppPicDesc *o
             // last_ts = get_cur_time_ms();
  
             // 换成解码后数据， 这里这样做的是为了保证解码一直持续进行，避免后续操作阻碍文件读取和解码从而导致花屏
-            DvppDataMemory* mem = new DvppDataMemory(width, width_stride, height, height_stride, outputSize, m_dec_name, to_string(m_dvpp_deviceId), false, frame_nb, (unsigned char *)outputDataDev);
+            DvppDataMemory* mem = nullptr;
+            if (m_bResize && (width > 1920 || height > 1080)) {
+                float srcRatio = width / (float)height;
+                float stdRatio = 1920.0 / 1080.0f ;
+                int outWidth = 1920;
+                int outHeight = 1080;
+                if (srcRatio > stdRatio) {
+                    outHeight = static_cast<int>(outWidth * (float)height / width) ;
+                    if (outHeight % 2 == 1)
+                    {
+                        outHeight += 1;
+                    }
+                } else if (srcRatio < stdRatio) {
+                    outWidth = static_cast<int>(outHeight * (float)width / height) ;
+                    if (outWidth % 2 == 1)
+                    {
+                        outWidth += 1;
+                    }
+                }
+                
+                mem = m_vpcUtils.resize(output, outWidth, outHeight);
+                if (mem)  {
+                    acldvppFree(outputDataDev);
+                    outputDataDev = nullptr;
+
+                    mem->setDeviceId(to_string(m_dvpp_deviceId));
+                    mem->setId(m_dec_name);
+                    mem->setFrameNb(frame_nb);
+                }
+            } else {
+                mem = new DvppDataMemory(width, width_stride, height, height_stride, outputSize, m_dec_name, to_string(m_dvpp_deviceId), false, frame_nb, (unsigned char *)outputDataDev);
+            }
+            
             if(mem){
                 m_decoded_data_queue.push(mem);
                 bCached = true;
             }
-
         } 
  
         if(!bCached) {
@@ -12,6 +12,8 @@
  
 #include "FFRecoderTaskManager.h"
  
+#include "VpcUtils.h"
+
 using namespace std;
  
 typedef void(*RECEIVER_FINISHED_CALLBACK)(const void* userPtr);
@@ -35,6 +37,7 @@ public:
     bool isFinished();
     bool isPausing();
     bool getResolution( int &width, int &height );
+    bool getOutResolution( int &width, int &height );
  
     bool isSurport(FFDecConfig& cfg);
  
@@ -77,6 +80,8 @@ private:
  
     int getVdecType(int videoType, int profile);
  
+    void calcOutResolution(int w, int h);
+
 private:
     FFDecConfig m_cfg;
     string m_dec_name;
@@ -100,12 +105,15 @@ private:
  
     int frame_width{0};
 	int frame_height{0};
+    int out_frame_width{0};
+	int out_frame_height{0};
     bool m_bReal {false}; // 是否实时流
     float m_fps{0.0};
  
     std::thread* m_read_thread{nullptr};
  
     bool m_dec_keyframe {false};
+    bool m_bResize {false};
  
     // 解码
     int m_dvpp_deviceId {-1};
@@ -129,4 +137,6 @@ private:
     uint64_t m_out_count {0};
  
     std::atomic<int> m_DvppCacheCounter{0};
+
+    VpcUtils m_vpcUtils;
 };
 \ No newline at end of file
@@ -79,6 +79,13 @@ bool DvppDecoderApi::getResolution(int &amp;width, int &amp;height){
     return false;
 }
  
+bool DvppDecoderApi::getOutResolution(int &width, int &height){
+    if(m_pDecoder != nullptr){
+        return m_pDecoder->getOutResolution(width, height);
+    }
+    return false;
+}
+
 bool DvppDecoderApi::isSurport(FFDecConfig& cfg){
     if(m_pDecoder != nullptr){
         return m_pDecoder->isSurport(cfg);
@@ -24,6 +24,7 @@ public:
     bool isFinished();
     bool isPausing();
     bool getResolution( int &width, int &height );
+    bool getOutResolution( int &width, int &height );
  
     bool isSurport(FFDecConfig& cfg);
  
-#include "VpcPicConverter.h"
+#include "VpcUtils.h"
 #include "depend_headers.h"
  
 #define ALIGN_UP(val, align) (((val) % (align) == 0) ? (val) : (((val) / (align) + 1) * (align)))
@@ -12,17 +12,29 @@
 #define CHECK_AND_BREAK(ret, message)    \
             if(ret != 0) {LOG_ERROR("{}", message); break;}
  
-VpcPicConverter::VpcPicConverter(){
+VpcUtils::VpcUtils(){
  
 }
  
-VpcPicConverter::~VpcPicConverter(){
-    if(nullptr == stream_){
+VpcUtils::~VpcUtils(){
+    if(nullptr != stream_){
         aclrtDestroyStream(stream_);
     }
+
+    if(context_){
+        aclrtDestroyContext(context_);
+    }
+
+    if (dvppChannelDesc_) {
+        (void)acldvppDestroyChannel(dvppChannelDesc_);
+        (void)acldvppDestroyChannelDesc(dvppChannelDesc_);
+        dvppChannelDesc_ = nullptr;
+    }
 }
  
-int VpcPicConverter::init(){
+int VpcUtils::init(int devId){
+
+    m_devId = devId;
  
     aclrtSetDevice(m_devId);
     aclrtCreateContext(&context_, m_devId);
@@ -45,7 +57,7 @@ int VpcPicConverter::init(){
     return ret;
 }
  
-DvppDataMemory* VpcPicConverter::convert2bgr(acldvppPicDesc *inputDesc_, int out_width, int out_height, bool key_frame){
+DvppDataMemory* VpcUtils::convert2bgr(acldvppPicDesc *inputDesc_, int out_width, int out_height, bool key_frame){
  
     aclrtSetDevice(m_devId);
     aclrtSetCurrentContext(context_);
@@ -91,7 +103,7 @@ DvppDataMemory* VpcPicConverter::convert2bgr(acldvppPicDesc *inputDesc_, int out
     return rgbMem;
 }
  
-DvppDataMemory* VpcPicConverter::convert2bgr(DvppDataMemory* inMem){
+DvppDataMemory* VpcUtils::convert2bgr(DvppDataMemory* inMem){
  
     aclrtSetDevice(m_devId);
     aclrtSetCurrentContext(context_);
@@ -149,4 +161,53 @@ DvppDataMemory* VpcPicConverter::convert2bgr(DvppDataMemory* inMem){
     }
  
     return rgbMem;
+}
+
+DvppDataMemory* VpcUtils::resize(acldvppPicDesc *inputDesc_, int out_width, int out_height){
+
+    aclrtSetDevice(m_devId);
+    aclrtSetCurrentContext(context_);
+
+    int out_buf_width = ALIGN_UP(out_width, 16);
+    int out_buf_height = ALIGN_UP(out_height, 2);
+    int out_buf_size = out_buf_width * out_buf_height * 3 / 2;
+
+    DvppDataMemory* rgbMem = new DvppDataMemory(1, out_width, out_buf_width, out_height, out_buf_height, out_buf_size, "", "", false, 0);
+    void *outBufferDev_ = (void*)rgbMem->getMem();
+
+    acldvppPicDesc *outputDesc_= acldvppCreatePicDesc();
+    acldvppSetPicDescData(outputDesc_, outBufferDev_);
+    acldvppSetPicDescFormat(outputDesc_, acldvppGetPicDescFormat(inputDesc_)); 
+    acldvppSetPicDescWidth(outputDesc_, out_width);
+    acldvppSetPicDescHeight(outputDesc_, out_height);
+    acldvppSetPicDescWidthStride(outputDesc_, out_buf_width);
+    acldvppSetPicDescHeightStride(outputDesc_, out_buf_height);
+    acldvppSetPicDescSize(outputDesc_, out_buf_size);
+
+    acldvppResizeConfig *resizeConfig_ = acldvppCreateResizeConfig();
+
+    aclError ret = ACL_ERROR_NONE;
+    do{
+        // 9. 执行异步色域转换，再调用aclrtSynchronizeStream接口阻塞程序运行，直到指定Stream中的所有任务都完成
+        ret = acldvppVpcResizeAsync(dvppChannelDesc_, inputDesc_, outputDesc_, resizeConfig_, stream_);
+        if(ret != ACL_ERROR_NONE){
+            LOG_ERROR("acldvppVpcResizeAsync failed - out_width:{} out_height:{} out_buf_width:{}  out_buf_height:{} out_buf_size:{}", out_width, out_height, out_buf_width,  out_buf_height, out_buf_size);
+            break;
+        }
+        ret = aclrtSynchronizeStream(stream_);
+        if(ret != ACL_ERROR_NONE){
+            LOG_ERROR("aclrtSynchronizeStream failed - out_width:{} out_height:{} out_buf_width:{}  out_buf_height:{} out_buf_size:{}", out_width, out_height, out_buf_width,  out_buf_height, out_buf_size);
+            break;
+        }
+    }while(0);
+
+    acldvppDestroyResizeConfig(resizeConfig_);
+    acldvppDestroyPicDesc(outputDesc_);
+
+    if(ret != ACL_ERROR_NONE){
+        delete rgbMem;
+        rgbMem = nullptr;
+    }
+
+    return rgbMem;
 }
 \ No newline at end of file
@@ -3,15 +3,17 @@
 #include "DvppDataMemory.hpp"
  
  
-class VpcPicConverter{
+class VpcUtils{
 public:
-    VpcPicConverter();
-    ~VpcPicConverter();
-    int init();
+    VpcUtils();
+    ~VpcUtils();
+    int init(int);
  
     DvppDataMemory* convert2bgr(acldvppPicDesc *input, int out_width, int out_height, bool key_frame);
     DvppDataMemory* convert2bgr(DvppDataMemory* inMem);
  
+    DvppDataMemory* resize(acldvppPicDesc *inputDesc_, int out_width, int out_height);
+
 private:
     aclrtContext context_;
     aclrtStream stream_;
@@ -25,7 +25,7 @@
 #include "acl/acl_rt.h"
 #include "acl/acl.h"
 #include "acl/ops/acl_dvpp.h"
-
+#include "acl/dvpp/hi_dvpp.h"
  
 #endif
  
@@ -18,12 +18,13 @@ public:
     virtual void pause() = 0;
     virtual void resume() = 0;
  
-    virtual void setDecKeyframe(bool bKeyframe) = 0;
+    virtual void setDecKeyframe(bool ) = 0;
  
     virtual bool isRunning() = 0;
     virtual bool isFinished() = 0;
     virtual bool isPausing() = 0;
     virtual bool getResolution( int &width, int &height ) = 0;
+    virtual bool getOutResolution( int &width, int &height ) = 0;
  
     virtual bool isSurport(FFDecConfig& cfg) = 0;
  
@@ -429,6 +429,27 @@ bool DecoderManager::getResolution(const string name, int &amp;width, int &amp;height)
     return false;
 }
  
+bool DecoderManager::getOutResolution(const string name, int &width, int &height)
+{
+    if (name.empty())
+    {
+        LOG_ERROR("name 为空!");
+        return false;
+    }
+
+    std::lock_guard<std::mutex> l(m_mutex);
+
+    auto dec = decoderMap.find(name);
+    if (dec != decoderMap.end())
+    {
+        dec->second->getOutResolution(width, height);
+        return true;
+    }
+    
+    LOG_ERROR("没有找到name为{}的解码器",name);
+    return false;
+}
+
 vector<string> DecoderManager::getAllDecodeName(){
  
     closeAllFinishedDecoder();
@@ -218,6 +218,8 @@ public:
 	**************************************************/
 	bool getResolution(const string name, int &width, int &height);
  
+	bool getOutResolution(const string name, int &width, int &height);
+
 	/**************************************************
 	* 接口：getAllDecodeName
 	* 功能：获取全部解码器名称
@@ -30,6 +30,10 @@ public:
     int getSize() {
         return data_size;
     }
+
+    void setSize(int size) {
+        data_size = size;
+    }
  
     bool isIsused() {
         return isused;
@@ -45,46 +49,90 @@ public:
         return id;
     }
  
+    void setId(string _id) {
+        id = _id;
+    }
+
     string getDeviceId() {
         return device_id;
     }
  
+    void setDeviceId(string _device_id) {
+        device_id = _device_id;
+    }
+
     unsigned char* getMem(){
         return pHwRgb;
     }
  
+    void setMem(unsigned char* _pHwRgb) {
+        pHwRgb = _pHwRgb;
+    }
+
     long long getTimesstamp(){
         return timestamp;
     }
  
+    void setTimesstamp(long long _timestamp) {
+        timestamp = _timestamp;
+    }
+
     int getWidth(){
         return width;
     }
  
+    void setWidth(int _width) {
+        width = _width;
+    }
+
     int getWidthStride(){
         return width_stride;
     }
  
+    void setWidthStride(int _width_stride) {
+        width_stride = _width_stride;
+    }
+
     int getHeight(){
         return height;
     }
  
+    void setHeight(int _height) {
+        height = _height;
+    }
+
     int getHeightStride(){
         return height_stride;
     }
  
+    void setHeightStride(int _height_stride) {
+        height_stride = _height_stride;
+    }
+
     int getChannel(){
         return channel;
     }
  
+    void setChannel(int _channel) {
+        channel = _channel;
+    }
+
     bool isKeyFrame(){
         return key_frame;
     }
  
+    void setKeyFrame(bool _key_frame) {
+        key_frame = _key_frame;
+    }
+
     unsigned long long getFrameNb() {
         return frame_nb;
     }
  
+    void setFrameNb(unsigned long long _frame_nb) {
+        frame_nb = _frame_nb;
+    }
+
 public:
     int data_size;
     bool isused;
@@ -35,6 +35,7 @@ struct FFDecConfig{
     bool force_tcp{true};                   // 是否指定使用tcp连接
     int skip_frame{1};                      // 跳帧数
     string dec_name;
+    bool resize{false};                        // 是否resize到1920,1080
  
     int port;                               // gb28181接收数据的端口号
     DECODE_REQUEST_STREAM_CALLBACK request_stream_cbk;  // gb28181请求流
@@ -998,6 +998,9 @@ string createTask(void *handle, std::vector&lt;algorithm_type_t&gt; algor_vec, int gi,
       // FFmpeg生成的解码错误数据流
       tparam.ipc_url = "rtsp://192.168.10.4:8554/street";
       break;
+    case 27:
+      tparam.ipc_url = "/data/share/data/Street_4k_265.mp4";
+      break;
     default:
       tparam.ipc_url = "/opt/share/data/Street.uvf";
       break;
@@ -1123,26 +1126,31 @@ void test_gpu(int gpuID){
                                             algorithm_type_t::VEHICLE_SOLIDLINETURNAROUND};
  
  
-  int repeat_num = 1000;
-  createTask(handle, algor_vec2, 0, false); 
-  createTask(handle, algor_vec2, 2, false);
-  while(repeat_num--)  {
-    printf("============================:%d\n",repeat_num); 
-    vector<string> task_ids;
-    for (int i = 4; i < 10; i ++) {
-      string task_id = createTask(handle, algor_vec2, i, false);
-      task_ids.push_back(task_id);
-    }
+  // int repeat_num = 1000;
+  // createTask(handle, algor_vec2, 0, false); 
+  // createTask(handle, algor_vec2, 2, false);
+  // while(repeat_num--)  {
+  //   printf("============================:%d\n",repeat_num); 
+  //   vector<string> task_ids;
+  //   for (int i = 4; i < 10; i ++) {
+  //     string task_id = createTask(handle, algor_vec2, i, false);
+  //     task_ids.push_back(task_id);
+  //   }
  
-    // test_snapshot(handle);
-    sleep(60); //60s
-    close_all_task(handle);
-    for (auto& task_id : task_ids) {
-      finish_task(handle, (char*)task_id.data(), 0);
-      sleep(5);
-    }  
+  //   // test_snapshot(handle);
+  //   sleep(60); //60s
+  //   close_all_task(handle);
+  //   for (auto& task_id : task_ids) {
+  //     finish_task(handle, (char*)task_id.data(), 0);
+  //     sleep(5);
+  //   }  
  
-  }
+  // }
+
+  createTask(handle, algor_vec2, 8, false);
+  createTask(handle, algor_vec2, 27, false);
+
+  while (getchar() != 'q');
  
   /*
   char ch = 'a';