Skip to content

F
FigureOut
Commit 345d99bc by wangguotao
Options

优化贴图流程 统一出yuv格式数据

parent 9eb8ec43
Showing with 142 additions and 54 deletions
MomentaMedia/FigureOut.log
This source diff could not be displayed because it is too large. You can view the blob instead.
MomentaMedia/MomentaMedia.vcxproj
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalLibraryDirectories>.\ThirdParty\rabbitmq\lib;.\ThirdParty\ffmpeg-master-latest-win64-gpl-shared\lib;.\ThirdParty\libyuv\lib;.\ThirdParty\OpenCV\x64\vc15\lib;.\ThirdParty\NewTek\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>.\ThirdParty\rabbitmq\lib;.\ThirdParty\ffmpeg-master-latest-win64-gpl-shared\lib;.\ThirdParty\libyuv\lib;.\ThirdParty\OpenCV\x64\vc15\lib;.\ThirdParty\NewTek\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
...@@ -112,7 +113,7 @@ ...@@ -112,7 +113,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>None</DebugInformationFormat> <DebugInformationFormat>None</DebugInformationFormat>
<Optimization>MaxSpeed</Optimization> <Optimization>Full</Optimization>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<UsePrecompiledHeader>Use</UsePrecompiledHeader> <UsePrecompiledHeader>Use</UsePrecompiledHeader>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
...@@ -142,6 +143,8 @@ ...@@ -142,6 +143,8 @@
<ClInclude Include="include\Utils\Algorithm.h" /> <ClInclude Include="include\Utils\Algorithm.h" />
<ClInclude Include="include\Utils\AudioConvert.h" /> <ClInclude Include="include\Utils\AudioConvert.h" />
<ClInclude Include="include\Utils\Base64.h" /> <ClInclude Include="include\Utils\Base64.h" />
<ClInclude Include="include\Utils\FastMemcpy.h" />
<ClInclude Include="include\Utils\FastMemcpy_Avx.h" />
<ClInclude Include="include\Utils\MaskBuffer.h" /> <ClInclude Include="include\Utils\MaskBuffer.h" />
<ClInclude Include="include\Utils\Memory4k.h" /> <ClInclude Include="include\Utils\Memory4k.h" />
<ClInclude Include="include\Utils\SafeMap.h" /> <ClInclude Include="include\Utils\SafeMap.h" />
......
MomentaMedia/MomentaMedia.vcxproj.filters
...@@ -298,6 +298,12 @@ ...@@ -298,6 +298,12 @@
<ClInclude Include="include\Utils\Settings.h"> <ClInclude Include="include\Utils\Settings.h">
<Filter>Header Files\Utils</Filter> <Filter>Header Files\Utils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Utils\FastMemcpy_Avx.h">
<Filter>Header Files\Utils</Filter>
</ClInclude>
<ClInclude Include="include\Utils\FastMemcpy.h">
<Filter>Header Files\Utils</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<QtRcc Include="Form\MomentaMedia.qrc"> <QtRcc Include="Form\MomentaMedia.qrc">
......
MomentaMedia/include/Threads/ProcessMaskThread.h
...@@ -38,7 +38,8 @@ private: ...@@ -38,7 +38,8 @@ private:
void process(); void process();
void workMask(const std::shared_ptr<videoFrameData>& frame_data, std::shared_ptr<MaskBuffer> buffer,const bool& mask_flag); void workMask(const std::shared_ptr<videoFrameData>& frame_data, std::shared_ptr<MaskBuffer> buffer,const bool& mask_flag);
void workMaskSec(const std::shared_ptr<videoFrameData>& frame_data, std::shared_ptr<MaskBuffer> buffer, const bool& mask_flag); void workMaskSec(const std::shared_ptr<videoFrameData>& frame_data, std::shared_ptr<MaskBuffer> buffer, const bool& mask_flag);
void workMaskModify(const std::shared_ptr<videoFrameData>& frame_data, std::shared_ptr<MaskBuffer> buffer, const bool& mask_flag); void workMaskModify(const std::shared_ptr<videoFrameData>& pImage, std::shared_ptr<MaskBuffer> mask_buffer, const bool& mask_flag);
void workMaskWithUYVY(const std::shared_ptr<videoFrameData>& pImage, std::shared_ptr<MaskBuffer> mask_buffer, const bool& mask_flag);
void blend(uint8_t* src_argb,int& src_stride_width, uint8_t* dst_argb,int& dst_stride_width,int &width,int &height); void blend(uint8_t* src_argb,int& src_stride_width, uint8_t* dst_argb,int& dst_stride_width,int &width,int &height);
void saveTga(const uint64_t& start_time, const uint64_t& end_time, const std::string& path); void saveTga(const uint64_t& start_time, const uint64_t& end_time, const std::string& path);
void outputAlpha(std::shared_ptr<MaskedBuffer> current, std::shared_ptr<MaskedBuffer> last); void outputAlpha(std::shared_ptr<MaskedBuffer> current, std::shared_ptr<MaskedBuffer> last);
...@@ -59,6 +60,7 @@ private: ...@@ -59,6 +60,7 @@ private:
uint8_t* tmp_bgra{NULL}; uint8_t* tmp_bgra{NULL};
uint8_t* tmp_alpha{NULL}; uint8_t* tmp_alpha{NULL};
uint8_t* tmp_uyvy{NULL};
uint8_t* bk_argb{NULL}; uint8_t* bk_argb{NULL};
uint8_t* bk_argb_attenuate{NULL}; uint8_t* bk_argb_attenuate{NULL};
uint8_t* alpha_{NULL}; uint8_t* alpha_{NULL};
......
MomentaMedia/include/Threads/ReplayThread.h
...@@ -38,4 +38,5 @@ private: ...@@ -38,4 +38,5 @@ private:
ReplayParams last_replay_params; ReplayParams last_replay_params;
uint32_t replay_position{ 0 }; uint32_t replay_position{ 0 };
qint64 current_seq{0}; qint64 current_seq{0};
bool send_err_flag {false};
}; };
\ No newline at end of file
MomentaMedia/include/Utils/Common.h
...@@ -145,7 +145,11 @@ typedef struct videoFrameData ...@@ -145,7 +145,11 @@ typedef struct videoFrameData
data = new uint8_t[capacity]; data = new uint8_t[capacity];
uyvy_data = new uint8_t[uyvy_size]; uyvy_data = new uint8_t[uyvy_size];
//memcpy(uyvy_data, src, uyvy_size); //memcpy(uyvy_data, src, uyvy_size);
//auto t1 = TimeMilliSecond();
Memory::MemoryCopy4k((uint8_t*)src,uyvy_data, uyvy_size >> 2); Memory::MemoryCopy4k((uint8_t*)src,uyvy_data, uyvy_size >> 2);
//memcpy_fast(uyvy_data, src, uyvy_size);
//memcpy(uyvy_data, src, uyvy_size);
//qDebug() << "MemoryCopy4k duration:" << TimeMilliSecond() - t1 << "\n";
} }
} }
...@@ -249,6 +253,24 @@ typedef struct VideoFrameWithMask ...@@ -249,6 +253,24 @@ typedef struct VideoFrameWithMask
else if (fmt_ == bmdFormat8BitYUV) size_ = width_ * height_ << 1; else if (fmt_ == bmdFormat8BitYUV) size_ = width_ * height_ << 1;
} }
VideoFrameWithMask(std::shared_ptr<videoFrameData> image, BlendStatus& status, const qint64& start_tm)
{
start_tm_ = start_tm;
flag_ = status;
pImage = image;
mask_flag = false;
fmt_ = pImage->fmt;
width_ = pImage->width;
height_ = pImage->height;
timestamp_ = (pImage->replaySeq ? pImage->replaySeq : pImage->timestamp);
sequenceNum_ = pImage->sequenceNum;
meta_ = image->meta_;
zoom_last = image->zoom_last;
if (fmt_ == bmdFormat8BitBGRA) size_ = width_ * height_ << 2;
else if (fmt_ == bmdFormat8BitYUV) size_ = width_ * height_ << 1;
}
/*VideoFrameWithMask(videoFrameData* image, BlendStatus& status) /*VideoFrameWithMask(videoFrameData* image, BlendStatus& status)
{ {
flag_ = status; flag_ = status;
......
MomentaMedia/include/Utils/FastMemcpy.h
//=====================================================================
//
// FastMemcpy.c - skywind3000@163.com, 2015
//
// feature:
// 50% speed up in avg. vs standard memcpy (tested in vc2012/gcc5.1)
//
//=====================================================================
#ifndef __FAST_MEMCPY_H__ #ifndef __FAST_MEMCPY_H__
#define __FAST_MEMCPY_H__ #define __FAST_MEMCPY_H__
......
MomentaMedia/include/Utils/FastMemcpy_Avx.h
//=====================================================================
//
// FastMemcpy.c - skywind3000@163.com, 2015
//
// feature:
// 50% speed up in avg. vs standard memcpy (tested in vc2012/gcc5.1)
//
//=====================================================================
#ifndef __FAST_MEMCPY_H__ #ifndef __FAST_MEMCPY_H__
#define __FAST_MEMCPY_H__ #define __FAST_MEMCPY_H__
...@@ -442,14 +434,22 @@ static void* memcpy_fast(void *destination, const void *source, size_t size) ...@@ -442,14 +434,22 @@ static void* memcpy_fast(void *destination, const void *source, size_t size)
c7 = _mm256_load_si256(((const __m256i*)src) + 7); c7 = _mm256_load_si256(((const __m256i*)src) + 7);
_mm_prefetch((const char*)(src + 512), _MM_HINT_NTA); _mm_prefetch((const char*)(src + 512), _MM_HINT_NTA);
src += 256; src += 256;
_mm256_stream_si256((((__m256i*)dst) + 0), c0); /*_mm256_stream_si256((((__m256i*)dst) + 0), c0);
_mm256_stream_si256((((__m256i*)dst) + 1), c1); _mm256_stream_si256((((__m256i*)dst) + 1), c1);
_mm256_stream_si256((((__m256i*)dst) + 2), c2); _mm256_stream_si256((((__m256i*)dst) + 2), c2);
_mm256_stream_si256((((__m256i*)dst) + 3), c3); _mm256_stream_si256((((__m256i*)dst) + 3), c3);
_mm256_stream_si256((((__m256i*)dst) + 4), c4); _mm256_stream_si256((((__m256i*)dst) + 4), c4);
_mm256_stream_si256((((__m256i*)dst) + 5), c5); _mm256_stream_si256((((__m256i*)dst) + 5), c5);
_mm256_stream_si256((((__m256i*)dst) + 6), c6); _mm256_stream_si256((((__m256i*)dst) + 6), c6);
_mm256_stream_si256((((__m256i*)dst) + 7), c7); _mm256_stream_si256((((__m256i*)dst) + 7), c7);*/
_mm256_storeu_si256((((__m256i*)dst) + 0), c0);
_mm256_storeu_si256((((__m256i*)dst) + 1), c1);
_mm256_storeu_si256((((__m256i*)dst) + 2), c2);
_mm256_storeu_si256((((__m256i*)dst) + 3), c3);
_mm256_storeu_si256((((__m256i*)dst) + 4), c4);
_mm256_storeu_si256((((__m256i*)dst) + 5), c5);
_mm256_storeu_si256((((__m256i*)dst) + 6), c6);
_mm256_storeu_si256((((__m256i*)dst) + 7), c7);
dst += 256; dst += 256;
} }
} }
...@@ -465,14 +465,22 @@ static void* memcpy_fast(void *destination, const void *source, size_t size) ...@@ -465,14 +465,22 @@ static void* memcpy_fast(void *destination, const void *source, size_t size)
c7 = _mm256_loadu_si256(((const __m256i*)src) + 7); c7 = _mm256_loadu_si256(((const __m256i*)src) + 7);
_mm_prefetch((const char*)(src + 512), _MM_HINT_NTA); _mm_prefetch((const char*)(src + 512), _MM_HINT_NTA);
src += 256; src += 256;
_mm256_stream_si256((((__m256i*)dst) + 0), c0); /*_mm256_stream_si256((((__m256i*)dst) + 0), c0);
_mm256_stream_si256((((__m256i*)dst) + 1), c1); _mm256_stream_si256((((__m256i*)dst) + 1), c1);
_mm256_stream_si256((((__m256i*)dst) + 2), c2); _mm256_stream_si256((((__m256i*)dst) + 2), c2);
_mm256_stream_si256((((__m256i*)dst) + 3), c3); _mm256_stream_si256((((__m256i*)dst) + 3), c3);
_mm256_stream_si256((((__m256i*)dst) + 4), c4); _mm256_stream_si256((((__m256i*)dst) + 4), c4);
_mm256_stream_si256((((__m256i*)dst) + 5), c5); _mm256_stream_si256((((__m256i*)dst) + 5), c5);
_mm256_stream_si256((((__m256i*)dst) + 6), c6); _mm256_stream_si256((((__m256i*)dst) + 6), c6);
_mm256_stream_si256((((__m256i*)dst) + 7), c7); _mm256_stream_si256((((__m256i*)dst) + 7), c7);*/
_mm256_storeu_si256((((__m256i*)dst) + 0), c0);
_mm256_storeu_si256((((__m256i*)dst) + 1), c1);
_mm256_storeu_si256((((__m256i*)dst) + 2), c2);
_mm256_storeu_si256((((__m256i*)dst) + 3), c3);
_mm256_storeu_si256((((__m256i*)dst) + 4), c4);
_mm256_storeu_si256((((__m256i*)dst) + 5), c5);
_mm256_storeu_si256((((__m256i*)dst) + 6), c6);
_mm256_storeu_si256((((__m256i*)dst) + 7), c7);
dst += 256; dst += 256;
} }
} }
......
MomentaMedia/include/Utils/Memory4k.h
#pragma once #pragma once
#include <iostream> #include <iostream>
#include "FastMemcpy_Avx.h"
class Memory class Memory
{ {
...@@ -22,6 +23,12 @@ public: ...@@ -22,6 +23,12 @@ public:
memcpy(dst2, src2, step); memcpy(dst2, src2, step);
memcpy(dst3, src3, step); memcpy(dst3, src3, step);
memcpy(dst4, src4, step); memcpy(dst4, src4, step);
/*memcpy_fast(dst1, src1, step);
memcpy_fast(dst2, src2, step);
memcpy_fast(dst3, src3, step);
memcpy_fast(dst4, src4, step);*/
} }
} }
}; };
\ No newline at end of file
MomentaMedia/src/BlackMagicDesign/DeckLinkOutputDevice.cpp
...@@ -1062,7 +1062,7 @@ bool DeckLinkOutputDevice::getReferenceSignalMode(BMDDisplayMode* mode) ...@@ -1062,7 +1062,7 @@ bool DeckLinkOutputDevice::getReferenceSignalMode(BMDDisplayMode* mode)
qDebug() << "frame order is error! error num:" << outputFrame->timestamp_ << ",last num:" << last_tm << "\n"; qDebug() << "frame order is error! error num:" << outputFrame->timestamp_ << ",last num:" << last_tm << "\n";
} }
last_tm = outputFrame->timestamp_;*/ last_tm = outputFrame->timestamp_;*/
qDebug() << GetCurrDateTimeStr() << ":current frame tm:" << outputFrame->timestamp_ << "\n"; //qDebug() << GetCurrDateTimeStr() << ":current frame tm:" << outputFrame->timestamp_ << "\n";
if (outputFrame->flag_ == BS_START) if (outputFrame->flag_ == BS_START)
{ {
send_sdi_start_time = outputFrame->start_tm_; send_sdi_start_time = outputFrame->start_tm_;
...@@ -1572,6 +1572,7 @@ void DeckLinkOutputDevice::AddZoomFrame(std::shared_ptr<VideoFrameWithMask> fram ...@@ -1572,6 +1572,7 @@ void DeckLinkOutputDevice::AddZoomFrame(std::shared_ptr<VideoFrameWithMask> fram
void DeckLinkOutputDevice::AddVideoFrameMask(std::shared_ptr<VideoFrameWithMask> frame) void DeckLinkOutputDevice::AddVideoFrameMask(std::shared_ptr<VideoFrameWithMask> frame)
{ {
//auto t1 = TimeMilliSecond(); //auto t1 = TimeMilliSecond();
if (outputMaskVideoFrameQueue.Size() > (50 * 3 + Settings::SecondSdiOutWaitNums) || output_video_frame_map.Size() > (50 * 3 + Settings::SecondSdiOutWaitNums)) if (outputMaskVideoFrameQueue.Size() > (50 * 3 + Settings::SecondSdiOutWaitNums) || output_video_frame_map.Size() > (50 * 3 + Settings::SecondSdiOutWaitNums))
{ {
if(outputMaskVideoFrameQueue.Size()) outputMaskVideoFrameQueue.Reset(); if(outputMaskVideoFrameQueue.Size()) outputMaskVideoFrameQueue.Reset();
...@@ -1591,8 +1592,45 @@ void DeckLinkOutputDevice::AddVideoFrameMask(std::shared_ptr<VideoFrameWithMask> ...@@ -1591,8 +1592,45 @@ void DeckLinkOutputDevice::AddVideoFrameMask(std::shared_ptr<VideoFrameWithMask>
{ {
if (Settings::SecondSdiOutWaitNums) if (Settings::SecondSdiOutWaitNums)
{ {
outputMaskVideoFrameQueue.Push(frame); if (frame->flag_ == BS_IDEL)
outputMaskVideoFrameDeque.PushBack(frame); {
outputMaskVideoFrameQueue.Push(frame);
outputMaskVideoFrameDeque.PushBack(frame);
}
else
{
auto itor = masked_map.find(frame->start_tm_);
if (frame->flag_ == BS_START)
{
if (itor != masked_map.end()) return;
else
{
auto tmp_map = new std::map<qint64, std::shared_ptr<VideoFrameWithMask>>();
int size = outputMaskVideoFrameDeque.Size();
int nums = (size > Settings::SecondSdiOutWaitNums ? Settings::SecondSdiOutWaitNums : size);
std::vector<std::shared_ptr<VideoFrameWithMask>> tmp_vec;
outputMaskVideoFrameDeque.Put(nums, tmp_vec);
for (auto data : tmp_vec)
{
if (data)
{
data->start_tm_ = frame->timestamp_;
tmp_map->insert({ data->timestamp_,data });
}
}
masked_map.insert({ frame->timestamp_,tmp_map });
tmp_map->insert({ frame->timestamp_, frame});
}
}
else
{
if (itor == masked_map.end()) return;
itor->second->insert({ frame->timestamp_, frame });
}
}
} }
else else
{ {
......
MomentaMedia/src/BlackMagicDesign/DeckLinkOutputPage.cpp
...@@ -110,7 +110,7 @@ DeckLinkOutputPage::DeckLinkOutputPage() : SelectedDevice(nullptr), Process(null ...@@ -110,7 +110,7 @@ DeckLinkOutputPage::DeckLinkOutputPage() : SelectedDevice(nullptr), Process(null
Zoom->start(); Zoom->start();
if (Zoom) if (Zoom)
{ {
connect(this, &DeckLinkOutputPage::PushAttribute, Zoom.get(), &ZoomThread::addSportAttr); connect(this, &DeckLinkOutputPage::PushAttribute, Zoom.get(), &ZoomThread::addSportAttr, Qt::DirectConnection);
} }
} }
} }
...@@ -306,7 +306,7 @@ void DeckLinkOutputPage::RequestedDeviceGranted(ComPtr<IDeckLink>& device) ...@@ -306,7 +306,7 @@ void DeckLinkOutputPage::RequestedDeviceGranted(ComPtr<IDeckLink>& device)
connect(BindingInputPage->GetReplay(), &ReplayThread::PushFrame, ProcessMask.get(), &ProcessMaskThread::AddFrame, Qt::DirectConnection); connect(BindingInputPage->GetReplay(), &ReplayThread::PushFrame, ProcessMask.get(), &ProcessMaskThread::AddFrame, Qt::DirectConnection);
connect(ProcessMask.get(), &ProcessMaskThread::PushFrame, NDIOutput.get(), &NDIOutputThread::AddVideoFrameWithMask, Qt::DirectConnection); connect(ProcessMask.get(), &ProcessMaskThread::PushFrame, NDIOutput.get(), &NDIOutputThread::AddVideoFrameWithMask, Qt::DirectConnection);
//if (MqThread) connect(MqThread.get(), &ConsumerMqThread::PushMask, ProcessMask.get(), &ProcessMaskThread::addMaskBuffer); //if (MqThread) connect(MqThread.get(), &ConsumerMqThread::PushMask, ProcessMask.get(), &ProcessMaskThread::addMaskBuffer);
connect(this, &DeckLinkOutputPage::PushMask, ProcessMask.get(), &ProcessMaskThread::addMaskBuffer); connect(this, &DeckLinkOutputPage::PushMask, ProcessMask.get(), &ProcessMaskThread::addMaskBuffer, Qt::DirectConnection);
connect(ProcessMask.get(), &ProcessMaskThread::PushFrame, SelectedDevice.Get(), &DeckLinkOutputDevice::AddVideoFrameMask, Qt::DirectConnection); connect(ProcessMask.get(), &ProcessMaskThread::PushFrame, SelectedDevice.Get(), &DeckLinkOutputDevice::AddVideoFrameMask, Qt::DirectConnection);
if (Zoom) if (Zoom)
{ {
......
MomentaMedia/src/NDI/NDIOutputThread.cpp
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
//extern int OneFrameDuration; //extern int OneFrameDuration;
#define SENDBGRA 1 #define SENDBGRA 1
#define MAXSIZE 30 #define MAXSIZE 30
#define OUT_UYVY 1
NDIOutputThread::NDIOutputThread(const QString& Name, int w, int h, qint32 deleyTime) : NDISenderName(Name), deleyTime_(deleyTime), width(w), height(h), isSending(false), Instance(nullptr), cropFlag(false), NDIOutputThread::NDIOutputThread(const QString& Name, int w, int h, qint32 deleyTime) : NDISenderName(Name), deleyTime_(deleyTime), width(w), height(h), isSending(false), Instance(nullptr), cropFlag(false),
m_lastTS(TimeMilliSecond()), m_lastTS(TimeMilliSecond()),
...@@ -126,7 +127,7 @@ bool NDIOutputThread::Init() ...@@ -126,7 +127,7 @@ bool NDIOutputThread::Init()
Frame.yres = height; Frame.yres = height;
/*Frame.xres = 3840; /*Frame.xres = 3840;
Frame.yres = 2160;*/ Frame.yres = 2160;*/
if(timePlusFlag) Frame.FourCC = NDIlib_FourCC_type_BGRA; if(timePlusFlag) Frame.FourCC = NDIlib_FourCC_type_UYVY;
#if SENDBGRA #if SENDBGRA
else Frame.FourCC = NDIlib_FourCC_type_BGRA; else Frame.FourCC = NDIlib_FourCC_type_BGRA;
#else #else
...@@ -134,7 +135,7 @@ bool NDIOutputThread::Init() ...@@ -134,7 +135,7 @@ bool NDIOutputThread::Init()
#endif // SENDBGRA #endif // SENDBGRA
if (timePlusFlag) Frame.line_stride_in_bytes = Frame.xres * 4; if (timePlusFlag) Frame.line_stride_in_bytes = Frame.xres * 2 ;
#if SENDBGRA #if SENDBGRA
else Frame.line_stride_in_bytes = Frame.xres * 4; else Frame.line_stride_in_bytes = Frame.xres * 4;
#else #else
...@@ -261,10 +262,10 @@ void NDIOutputThread::run() ...@@ -261,10 +262,10 @@ void NDIOutputThread::run()
else else
{ {
if (frame_mask->data_) Frame.p_data = frame_mask->data_; if (frame_mask->data_) Frame.p_data = frame_mask->data_;
else Frame.p_data = frame_mask->pImage->data; else Frame.p_data = frame_mask->pImage->uyvy_data;
} }
Frame.timestamp = frame_mask->timestamp_; Frame.timestamp = frame_mask->timestamp_;
Frame.timecode = frame_mask->timestamp_ * 10000; Frame.timecode = frame_mask->timestamp_ * 1000;
NDIlib_send_send_video_v2(Instance, &Frame); NDIlib_send_send_video_v2(Instance, &Frame);
} }
......
MomentaMedia/src/Threads/CaptureThread.cpp
...@@ -73,8 +73,9 @@ void CaptureThread::AddFrame(ComPtr<IDeckLinkVideoInputFrame> videoFrame, const ...@@ -73,8 +73,9 @@ void CaptureThread::AddFrame(ComPtr<IDeckLinkVideoInputFrame> videoFrame, const
{ {
//videoFrame->GetTimecode(); //videoFrame->GetTimecode();
auto t1 = TimeMilliSecond();
std::shared_ptr<videoFrameData> video_data = std::make_shared<videoFrameData>(videoFrame, sequenceNum, sequenceNum,meta); std::shared_ptr<videoFrameData> video_data = std::make_shared<videoFrameData>(videoFrame, sequenceNum, sequenceNum,meta);
//qDebug() << "create videoFrameData duration:" << TimeMilliSecond() - t1 << "\n";
/*std::shared_ptr<videoFrameData> videoFrame1 = std::make_shared<videoFrameData>(videoFrame, timestamp, timestamp); /*std::shared_ptr<videoFrameData> videoFrame1 = std::make_shared<videoFrameData>(videoFrame, timestamp, timestamp);
if (NDIOutput) NDIOutput->AddFrame(videoFrame1);*/ if (NDIOutput) NDIOutput->AddFrame(videoFrame1);*/
......
MomentaMedia/src/Threads/ReplayThread.cpp
...@@ -30,6 +30,7 @@ void ReplayThread::addFrame(std::shared_ptr<videoFrameData> frameData) ...@@ -30,6 +30,7 @@ void ReplayThread::addFrame(std::shared_ptr<videoFrameData> frameData)
storeVideoMap.erase(storeVideoMap.begin()->first); storeVideoMap.erase(storeVideoMap.begin()->first);
} }
if ((replay_params.status == RS_START || replay_params.status == RS_RE_START)) { if ((replay_params.status == RS_START || replay_params.status == RS_RE_START)) {
if (send_err_flag) send_err_flag = false;
cv.notify_all(); cv.notify_all();
} }
...@@ -111,13 +112,17 @@ void ReplayThread::run() ...@@ -111,13 +112,17 @@ void ReplayThread::run()
if (itor_end == storeVideoMap.end() || itor_begin == storeVideoMap.end() || tm_end <= tm_begin) if (itor_end == storeVideoMap.end() || itor_begin == storeVideoMap.end() || tm_end <= tm_begin)
{ {
if (!send_err_flag)
qint32 errNo = (itor_end == storeVideoMap.end() ? 2 : (itor_begin == storeVideoMap.end() ? 1 : 3)); {
send_err_flag = true;
qint32 errNo = (itor_end == storeVideoMap.end() ? 2 : (itor_begin == storeVideoMap.end() ? 1 : 3));
QString msg = "{\"signal\":\"ReplayResp\",\"data\":{\"inTime\":" + QString::number(replay_params.start_time) +",\"outTime\":" + QString::number(replay_params.end_time) + QString msg = "{\"signal\":\"ReplayResp\",\"data\":{\"inTime\":" + QString::number(replay_params.start_time) + ",\"outTime\":" + QString::number(replay_params.end_time) +
",\"status\":0,\"errNo\":" + QString::number(errNo) +"}}"; ",\"status\":0,\"errNo\":" + QString::number(errNo) + "}}";
UdpSend::GetInstance().SendUdpMsg(msg, Settings::UIIpAddr, QString::number(Settings::UIUdpPort)); UdpSend::GetInstance().SendUdpMsg(msg, Settings::UIIpAddr, QString::number(Settings::UIUdpPort));
qDebug() << "replay fail,errno:"<<errNo << "\n"; qDebug() << "replay fail,errno:" << errNo << "\n";
}
continue; continue;
} }
bool first = true; bool first = true;
......
x64/Debug/FigureOut.exe
No preview for this file type
x64/Debug/FigureOut.ilk
No preview for this file type
x64/Debug/FigureOut.log
...@@ -3,15 +3,15 @@ objct name changed "deviceOutputPage4" ...@@ -3,15 +3,15 @@ objct name changed "deviceOutputPage4"
available device "DeckLink 8K Pro (1)" available device "DeckLink 8K Pro (1)"
available device "DeckLink 8K Pro (2)" available device "DeckLink 8K Pro (2)"
available device "DeckLink 8K Pro (3)" available device "DeckLink 8K Pro (3)"
"2024-05-27 15:23:37.946" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------
available device "DeckLink 8K Pro (4)" available device "DeckLink 8K Pro (4)"
"2024-05-17 19:02:03.216" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------ "2024-05-27 15:23:37.966" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------
"2024-05-17 19:02:03.236" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------ "2024-05-27 15:23:38.009" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------
"2024-05-17 19:02:03.256" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------ "2024-05-27 15:23:38.029" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------
"2024-05-17 19:02:03.276" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------ "2024-05-27 15:23:38.049" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------
"2024-05-17 19:02:03.296" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------ "2024-05-27 15:23:38.069" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------
"2024-05-17 19:02:03.316" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------ "2024-05-27 15:23:38.089" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------
"2024-05-17 19:02:03.336" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------ "2024-05-27 15:23:38.109" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------
"2024-05-17 19:02:03.394" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------ "2024-05-27 15:23:38.129" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------
"2024-05-17 19:02:04.438" decklink input fps 51 "2024-05-27 15:23:38.187" index: 0 DeckLinkInputDevice get video frame No input source 80000000 ------------
"2024-05-17 19:02:05.439" decklink input fps 50 "2024-05-27 15:23:39.211" decklink input fps 50
"2024-05-17 19:02:06.439" decklink input fps 50
x64/Debug/settings.ini
...@@ -42,10 +42,10 @@ SDIONEFRAMEDURATION=50 ...@@ -42,10 +42,10 @@ SDIONEFRAMEDURATION=50
RECORDFLAG=1 RECORDFLAG=1
OPENOMP=1 OPENOMP=1
TIMEOUTFRAMES=250 TIMEOUTFRAMES=250
SECONDDELEYSDINUMS=100 SECONDDELEYSDINUMS=0
REPLAY_START_FORWARD=50 REPLAY_START_FORWARD=50
REPLAY_END_DELEY=50 REPLAY_END_DELEY=50
RTSDIOUTPUTWAITNUMS=5 RTSDIOUTPUTWAITNUMS=0
CROPRECORD=0 CROPRECORD=0
CROP_X=400 CROP_X=400
CROP_Y=1800 CROP_Y=1800
......
x64/Release/settings.ini
...@@ -24,7 +24,7 @@ BLACK_BOTTOM_HEIGHT_2=20 ...@@ -24,7 +24,7 @@ BLACK_BOTTOM_HEIGHT_2=20
BLACK_BOTTOM_HEIGHT_3=20 BLACK_BOTTOM_HEIGHT_3=20
BLACK_BOTTOM_HEIGHT_4=30 BLACK_BOTTOM_HEIGHT_4=30
ZOOM_DRAW=0 ZOOM_DRAW=0
ZOOM_FLAG=0 ZOOM_FLAG=1
ZOOM_SCALE=1.5 ZOOM_SCALE=1.5
ZOOM_SCALE_N=1 ZOOM_SCALE_N=1
ZOOM_SCALE_D=2 ZOOM_SCALE_D=2
...@@ -48,7 +48,7 @@ REPLAY_END_DELEY=50 ...@@ -48,7 +48,7 @@ REPLAY_END_DELEY=50
RTSDIOUTPUTWAITNUMS=5 RTSDIOUTPUTWAITNUMS=5
CROPRECORD=0 CROPRECORD=0
CROP_X=400 CROP_X=400
CROP_Y=1800 CROP_Y=400
CROP_DIRECTION=3 CROP_DIRECTION=1
UI_UDP_PORT=8100 UI_UDP_PORT=8100
UI_IP_ADDR=127.0.0.1 UI_IP_ADDR=127.0.0.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment