Fix AMD ALPR_OCR and custom model

This commit is contained in:
2026-05-01 07:53:18 +10:00
parent e1f37ec767
commit 91efbb9a8f
25 changed files with 2841 additions and 429 deletions
+29 -11
View File
@@ -1,6 +1,7 @@
#include "ANSFilePlayer.h"
#include "ANSMatRegistry.h"
#include "ANSGpuFrameOps.h"
#include "av_frame_ptr.h" // ansmedia::AvFramePtr — RAII for AVFrame*
#include <memory>
#include <cstdint>
#include <libswscale/swscale.h>
@@ -382,15 +383,24 @@ extern "C" __declspec(dllexport) int GetFilePlayerCVImage(ANSCENTER::ANSFILEPLAY
// Attach NV12/CUDA frames to registry for inference zero-copy (same as ANSRTSP/ANSVideoPlayer).
// CFilePlayer inherits getNV12Frame()/getCudaHWFrame() from CVideoPlayer.
// AvFramePtr wraps each clone so it auto-frees on any return path before
// the .release() handoff to gpu_frame_attach[_cuda] — leak-by-omission
// becomes impossible if an exception or early return slips in later.
int gpuIdx = (*Handle)->_playerClient->getHWDecodingGpuIndex();
AVFrame* cudaHW = (*Handle)->_playerClient->getCudaHWFrame();
ansmedia::AvFramePtr cudaHW{ (*Handle)->_playerClient->getCudaHWFrame() };
if (cudaHW) {
AVFrame* cpuNV12 = (*Handle)->_playerClient->getNV12Frame();
gpu_frame_attach_cuda(*image, cudaHW, gpuIdx, timeStamp, cpuNV12);
ansmedia::AvFramePtr cpuNV12{ (*Handle)->_playerClient->getNV12Frame() };
ANS_DBG("MEDIA_AvPtr",
"ANSFilePlayer V1 attach_cuda cudaHW=%p cpuNV12=%p gpuIdx=%d",
(void*)cudaHW.get(), (void*)cpuNV12.get(), gpuIdx);
gpu_frame_attach_cuda(*image, cudaHW.release(), gpuIdx, timeStamp, cpuNV12.release());
} else {
AVFrame* nv12 = (*Handle)->_playerClient->getNV12Frame();
ansmedia::AvFramePtr nv12{ (*Handle)->_playerClient->getNV12Frame() };
if (nv12) {
gpu_frame_attach(*image, nv12, gpuIdx, timeStamp);
ANS_DBG("MEDIA_AvPtr",
"ANSFilePlayer V1 attach nv12=%p gpuIdx=%d",
(void*)nv12.get(), gpuIdx);
gpu_frame_attach(*image, nv12.release(), gpuIdx, timeStamp);
} else {
// CPU-only fallback: attach full-res BGR clone for ANSRTYOLO
cv::Mat infImg = (*Handle)->GetInferenceImage();
@@ -639,16 +649,24 @@ extern "C" __declspec(dllexport) int GetFilePlayerCVImage_V2(uint64_t handleVal,
}
anscv_mat_replace(image, std::move(img));
// NV12/CUDA registry attach (same as V1)
// NV12/CUDA registry attach (same as V1).
// AvFramePtr ensures any clone we obtain is freed automatically if we
// don't reach the .release() handoff (e.g. exception, future early return).
int gpuIdx = h->_playerClient->getHWDecodingGpuIndex();
AVFrame* cudaHW = h->_playerClient->getCudaHWFrame();
ansmedia::AvFramePtr cudaHW{ h->_playerClient->getCudaHWFrame() };
if (cudaHW) {
AVFrame* cpuNV12 = h->_playerClient->getNV12Frame();
gpu_frame_attach_cuda(*image, cudaHW, gpuIdx, timeStamp, cpuNV12);
ansmedia::AvFramePtr cpuNV12{ h->_playerClient->getNV12Frame() };
ANS_DBG("MEDIA_AvPtr",
"ANSFilePlayer V2 attach_cuda cudaHW=%p cpuNV12=%p gpuIdx=%d",
(void*)cudaHW.get(), (void*)cpuNV12.get(), gpuIdx);
gpu_frame_attach_cuda(*image, cudaHW.release(), gpuIdx, timeStamp, cpuNV12.release());
} else {
AVFrame* nv12 = h->_playerClient->getNV12Frame();
ansmedia::AvFramePtr nv12{ h->_playerClient->getNV12Frame() };
if (nv12) {
gpu_frame_attach(*image, nv12, gpuIdx, timeStamp);
ANS_DBG("MEDIA_AvPtr",
"ANSFilePlayer V2 attach nv12=%p gpuIdx=%d",
(void*)nv12.get(), gpuIdx);
gpu_frame_attach(*image, nv12.release(), gpuIdx, timeStamp);
} else {
cv::Mat infImg = h->GetInferenceImage();
if (!infImg.empty() && infImg.data != (*image)->data) {