Skip to content

M
MomentaMedia
Commit 46675251 by 景炳强
Options

1.add 720p 2.add audio 3.syn frame 4.delay output

parent 8306c261
Showing with 306 additions and 27 deletions
MomentaMedia.log 0 → 100644
CaptureThread::AddFrame::fps:: 0 10
ProcessThread::run::fps:: 0 7
CaptureThread::AddFrame::fps:: 2 11
ProcessThread::run::fps:: 2 6
ProcessThread::run::fps:: 3 6
CaptureThread::AddFrame::fps:: 3 11
CaptureThread::AddFrame::fps:: 1 14
ProcessThread::run::fps:: 1 0
CaptureThread::AddFrame::fps:: 0 20
CaptureThread::AddFrame::fps:: 2 19
ProcessThread::run::fps:: 0 15
ProcessThread::run::fps:: 3 15
ProcessThread::run::fps:: 2 15
CaptureThread::AddFrame::fps:: 3 19
CaptureThread::AddFrame::fps:: 1 19
MomentaMedia/MomentaMedia - Copy.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
MomentaMedia/MomentaMedia.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
MomentaMedia/MomentaMedia.vcxproj
...@@ -131,6 +131,7 @@ ...@@ -131,6 +131,7 @@
<ClInclude Include="include\BlackMagicDesign\ReferenceTime.h" /> <ClInclude Include="include\BlackMagicDesign\ReferenceTime.h" />
<QtMoc Include="include\Threads\ProcessThread.h" /> <QtMoc Include="include\Threads\ProcessThread.h" />
<ClInclude Include="include\Orbit.h" /> <ClInclude Include="include\Orbit.h" />
<QtMoc Include="include\Utils\AudioPacket.h" />
<ClInclude Include="include\Utils\Common.h" /> <ClInclude Include="include\Utils\Common.h" />
<ClInclude Include="include\Utils\DispatchQueue.h" /> <ClInclude Include="include\Utils\DispatchQueue.h" />
<ClInclude Include="include\Utils\LatencyStatistics.h" /> <ClInclude Include="include\Utils\LatencyStatistics.h" />
...@@ -174,6 +175,7 @@ ...@@ -174,6 +175,7 @@
</ClCompile> </ClCompile>
<ClCompile Include="src\Threads\CaptureThread.cpp" /> <ClCompile Include="src\Threads\CaptureThread.cpp" />
<ClCompile Include="src\Threads\ProcessThread.cpp" /> <ClCompile Include="src\Threads\ProcessThread.cpp" />
<ClCompile Include="src\Utils\AudioPacket.cpp" />
<ClCompile Include="src\Utils\Common.cpp" /> <ClCompile Include="src\Utils\Common.cpp" />
<ClCompile Include="src\Utils\Image.cpp" /> <ClCompile Include="src\Utils\Image.cpp" />
<ClCompile Include="src\Utils\LatencyStatistics.cpp" /> <ClCompile Include="src\Utils\LatencyStatistics.cpp" />
......
MomentaMedia/MomentaMedia.vcxproj.filters
...@@ -89,6 +89,9 @@ ...@@ -89,6 +89,9 @@
<QtMoc Include="include\Threads\ProcessThread.h"> <QtMoc Include="include\Threads\ProcessThread.h">
<Filter>Header Files\Threads</Filter> <Filter>Header Files\Threads</Filter>
</QtMoc> </QtMoc>
<QtMoc Include="include\Utils\AudioPacket.h">
<Filter>Header Files\Utils</Filter>
</QtMoc>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\stdafx.h"> <ClInclude Include="include\stdafx.h">
...@@ -223,6 +226,9 @@ ...@@ -223,6 +226,9 @@
<ClCompile Include="src\Threads\ProcessThread.cpp"> <ClCompile Include="src\Threads\ProcessThread.cpp">
<Filter>Source Files\Threads</Filter> <Filter>Source Files\Threads</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Utils\AudioPacket.cpp">
<Filter>Source Files\Utils</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<QtUic Include="Form\MomentaMedia.ui"> <QtUic Include="Form\MomentaMedia.ui">
......
MomentaMedia/include/BlackMagicDesign/DeckLinkInputDevice.h
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "Utils/CustomEvents.h" #include "Utils/CustomEvents.h"
#include "Utils/ComPtr.h" #include "Utils/ComPtr.h"
#include "Utils/Image.h" #include "Utils/Image.h"
#include "Utils/AudioPacket.h"
#include "Threads/CaptureThread.h" #include "Threads/CaptureThread.h"
class DeckLinkInputDevice : public QObject, public IDeckLinkInputCallback class DeckLinkInputDevice : public QObject, public IDeckLinkInputCallback
...@@ -59,7 +60,7 @@ public: ...@@ -59,7 +60,7 @@ public:
signals: signals:
void ArrivedFrame(ComPtr<IDeckLinkVideoInputFrame> videoFrame); void ArrivedFrame(ComPtr<IDeckLinkVideoInputFrame> videoFrame);
void PushAudioFrame(std::shared_ptr<AudioPacket> image);
private: private:
std::atomic<ULONG> RefCount; std::atomic<ULONG> RefCount;
QObject* Owner; QObject* Owner;
......
MomentaMedia/include/BlackMagicDesign/DeckLinkOutputDevice.h
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "Utils/Platform.h" #include "Utils/Platform.h"
#include "DeckLinkOutputVideoFrame.h" #include "DeckLinkOutputVideoFrame.h"
#include "Utils/Image.h" #include "Utils/Image.h"
#include "Utils/AudioPacket.h"
class DeckLinkOutputDevice : public QObject, public IDeckLinkVideoOutputCallback class DeckLinkOutputDevice : public QObject, public IDeckLinkVideoOutputCallback
{ {
...@@ -56,6 +57,7 @@ public: ...@@ -56,6 +57,7 @@ public:
ComPtr<IDeckLinkOutput> getDeckLinkOutput(void) const { return deckLinkOutput; } ComPtr<IDeckLinkOutput> getDeckLinkOutput(void) const { return deckLinkOutput; }
public slots: public slots:
void AddAudioFrame(std::shared_ptr<AudioPacket> audio_packet);
void AddFrame(std::shared_ptr<Image> image); void AddFrame(std::shared_ptr<Image> image);
private: private:
...@@ -67,6 +69,7 @@ private: ...@@ -67,6 +69,7 @@ private:
BMDVideoConnection SelectedOutputConnection; BMDVideoConnection SelectedOutputConnection;
// //
SampleQueue<std::shared_ptr<Image>> outputVideoFrameQueue; SampleQueue<std::shared_ptr<Image>> outputVideoFrameQueue;
SampleQueue<std::shared_ptr<AudioPacket>> outputAudioFrameQueue;
//ScheduledFramesList scheduledFramesList; //ScheduledFramesList scheduledFramesList;
// //
uint32_t videoPrerollSize; uint32_t videoPrerollSize;
...@@ -76,16 +79,20 @@ private: ...@@ -76,16 +79,20 @@ private:
// //
bool seenFirstVideoFrame; bool seenFirstVideoFrame;
BMDTimeValue startPlaybackTime; BMDTimeValue startPlaybackTime;
bool first_sleep;
// //
//std::mutex mutex; //std::mutex mutex;
//std::condition_variable playbackStoppedCondition; //std::condition_variable playbackStoppedCondition;
// //
std::thread scheduleVideoFramesThread; std::thread scheduleVideoFramesThread;
std::thread scheduleAudioFramesThread;
// //
ScheduledFrameCompletedCallback scheduledFrameCompletedCallback; ScheduledFrameCompletedCallback scheduledFrameCompletedCallback;
// Private methods // Private methods
void scheduleVideoFramesFunc(void); void scheduleVideoFramesFunc(void);
void scheduleAudioFramesFunc(void);
void outputAudioFrameFunc(void);
bool waitForReferenceSignalToLock(void); bool waitForReferenceSignalToLock(void);
void checkEndOfPreroll(void); void checkEndOfPreroll(void);
}; };
MomentaMedia/include/Threads/CaptureThread.h
...@@ -19,12 +19,17 @@ public: ...@@ -19,12 +19,17 @@ public:
~CaptureThread(); ~CaptureThread();
public slots: public slots:
void AddFrame(ComPtr<IDeckLinkVideoInputFrame> videoFrame); void AddFrame(ComPtr<IDeckLinkVideoInputFrame> videoFrame,const qint64& timestamp);
signals: signals:
void PushFrame(std::shared_ptr<Image> image); void PushFrame(std::shared_ptr<Image> image);
private: private:
typedef struct videoFrameData
{
ComPtr<IDeckLinkVideoInputFrame> video_frame;
qint64 timestamp;
}videoFrameData;
static int s_count; static int s_count;
int idx; int idx;
//SampleQueue<ComPtr<IDeckLinkVideoInputFrame>> taskQueue; //SampleQueue<ComPtr<IDeckLinkVideoInputFrame>> taskQueue;
...@@ -35,6 +40,7 @@ private: ...@@ -35,6 +40,7 @@ private:
int64_t recvStartTime; int64_t recvStartTime;
std::queue<ComPtr<IDeckLinkVideoInputFrame>> taskQueue; std::queue<ComPtr<IDeckLinkVideoInputFrame>> taskQueue;
std::queue<videoFrameData> taskVideoQueue;
std::condition_variable cv; std::condition_variable cv;
std::mutex mutex; std::mutex mutex;
}; };
\ No newline at end of file
MomentaMedia/include/Threads/ProcessThread.h
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <QWaitCondition> #include <QWaitCondition>
#include <QUdpSocket> #include <QUdpSocket>
#include <QJsonDocument> #include <QJsonDocument>
#include <map>
#include "Utils/SampleQueue.h" #include "Utils/SampleQueue.h"
#include "Utils/Image.h" #include "Utils/Image.h"
...@@ -14,20 +15,36 @@ const QString MODE_CROP = "crop_roi"; ...@@ -14,20 +15,36 @@ const QString MODE_CROP = "crop_roi";
const QString MODE_STOP = "stop"; const QString MODE_STOP = "stop";
const QString MODE_ACK = "checked_ok"; const QString MODE_ACK = "checked_ok";
#define CROP1080WIDTH 810
#define CROP720WIDTH 720
#define CROPHEIGHT 1080
#define USE_1080P 1
class RoiMessage class RoiMessage
{ {
public: public:
RoiMessage() : w(800), h(1080) #if USE_1080P
RoiMessage() : w(CROP1080WIDTH), h(CROPHEIGHT)
{ {
x = 1920 / 2 - w / 2; x = 1920 / 2 - w / 2;
y = 1080 / 2 - h / 2; y = 1080 / 2 - h / 2;
timecode = 0;
} }
#else
RoiMessage() : w(CROP720WIDTH), h(CROPHEIGHT)
{
x = 1920 / 2 - w / 2;
y = 1080 / 2 - h / 2;
timecode = 0;
}
#endif
RoiMessage(QByteArray& data) RoiMessage(QByteArray& data)
{ {
QJsonDocument document = QJsonDocument::fromJson(data); QJsonDocument document = QJsonDocument::fromJson(data);
QJsonObject object; QJsonObject object;
if(document.isObject()) if (document.isObject())
{ {
object = document.object(); object = document.object();
mode = object.value("signal").toString(); mode = object.value("signal").toString();
...@@ -40,6 +57,7 @@ public: ...@@ -40,6 +57,7 @@ public:
width = object.value("width").toInt(); width = object.value("width").toInt();
height = object.value("height").toInt(); height = object.value("height").toInt();
timecode = QString::number(object.value("timecode").toDouble(), 'f', 0).toLongLong();
w = maxx - minx; w = maxx - minx;
h = maxy - miny; h = maxy - miny;
...@@ -65,6 +83,7 @@ public: ...@@ -65,6 +83,7 @@ public:
width = object.value("width").toInt(); width = object.value("width").toInt();
height = object.value("height").toInt(); height = object.value("height").toInt();
timecode = QString::number(object.value("timecode").toDouble(), 'f', 0).toLongLong();
w = maxx - minx; w = maxx - minx;
h = maxy - miny; h = maxy - miny;
...@@ -73,7 +92,7 @@ public: ...@@ -73,7 +92,7 @@ public:
} }
} }
RoiMessage(const RoiMessage& other) : x(other.x), y(other.y), w(other.w), h(other.h) RoiMessage(const RoiMessage& other) : x(other.x), y(other.y), w(other.w), h(other.h), timecode(other.timecode)
{ {
} }
...@@ -84,6 +103,7 @@ public: ...@@ -84,6 +103,7 @@ public:
y = other.y; y = other.y;
w = other.w; w = other.w;
h = other.h; h = other.h;
timecode = other.timecode;
} }
RoiMessage operator=(const RoiMessage& other) RoiMessage operator=(const RoiMessage& other)
...@@ -92,6 +112,7 @@ public: ...@@ -92,6 +112,7 @@ public:
y = other.y; y = other.y;
w = other.w; w = other.w;
h = other.h; h = other.h;
timecode = other.timecode;
return *this; return *this;
} }
...@@ -101,6 +122,7 @@ public: ...@@ -101,6 +122,7 @@ public:
y = other.y; y = other.y;
w = other.w; w = other.w;
h = other.h; h = other.h;
timecode = other.timecode;
return *this; return *this;
} }
...@@ -109,10 +131,16 @@ public: ...@@ -109,10 +131,16 @@ public:
return x > 0 && y > 0 && w > 0 && h > 0; return x > 0 && y > 0 && w > 0 && h > 0;
} }
void SetX(int x_)
{
this->x = x_;
}
int X() { return x; } int X() { return x; }
int Y() { return y; } int Y() { return y; }
int Width() { return w; } int Width() { return w; }
int Height() { return h; } int Height() { return h; }
qint64 Timecode() { return timecode; }
private: private:
int x; int x;
...@@ -121,6 +149,7 @@ private: ...@@ -121,6 +149,7 @@ private:
int h; int h;
QString mode; QString mode;
qint64 timecode;
int id = 0; int id = 0;
int width; int width;
int height; int height;
...@@ -138,17 +167,22 @@ public: ...@@ -138,17 +167,22 @@ public:
public slots: public slots:
void AddFrame(std::shared_ptr<Image> image); void AddFrame(std::shared_ptr<Image> image);
void ReadDatagrams(); void ReadDatagrams();
void ReadDatagramsNew();
signals: signals:
void PushFrame(std::shared_ptr<Image> image); void PushFrame(std::shared_ptr<Image> image);
protected: protected:
void run() override; void run() override;
private:
void WorkCutImage(std::shared_ptr<Image>& pImage, RoiMessage& roi);
void WorkCutImage720p(std::shared_ptr<Image>& pImage, RoiMessage& roi);
void cutRun();
private: private:
//SampleQueue<Image> taskPrerollQueue; //SampleQueue<Image> taskPrerollQueue;
SampleQueue<std::shared_ptr<Image>> taskImageQueue; SampleQueue<std::shared_ptr<Image>> taskImageQueue;
SampleQueue<RoiMessage> taskROIQueue; SampleQueue<RoiMessage> taskROIQueue;
std::map<qint64, RoiMessage> cutRuleMap;
QUdpSocket* udpSocket; QUdpSocket* udpSocket;
...@@ -166,4 +200,7 @@ private: ...@@ -166,4 +200,7 @@ private:
int recvROIs; int recvROIs;
int64_t recvROIStartTime; int64_t recvROIStartTime;
int continuousLostNums;//ʾղudp
}; };
\ No newline at end of file
MomentaMedia/include/Utils/AudioPacket.h 0 → 100644
#pragma once
#include <QtCore/QtCore>
#include <QMetaType>
#include "DeckLinkAPI.h"
class AudioPacket : public QObject
{
Q_OBJECT
public:
AudioPacket(IDeckLinkAudioInputPacket* audioPacket,qint64& timestamp);
~AudioPacket();
public:
QByteArray audio_data;
qint32 sample;
qint32 channel;
qint32 size;
qint64 frame_time_stamp;
};
MomentaMedia/include/Utils/SampleQueue.h
...@@ -20,8 +20,12 @@ public: ...@@ -20,8 +20,12 @@ public:
void Push(const T& sample); void Push(const T& sample);
void Push(T&& sample); void Push(T&& sample);
bool Pop(T& sample); bool Pop(T& sample);
bool Pop();
bool Front(T& sample);
bool WaitFor(T& sample); bool WaitFor(T& sample);
bool WaitFor();
bool WaitUntil(T& sample, int timeout); bool WaitUntil(T& sample, int timeout);
bool WaitUntil(int timeout);
void CancelWaiters(void); void CancelWaiters(void);
void Reset(void); void Reset(void);
...@@ -104,6 +108,28 @@ bool SampleQueue<T>::Pop(T& sample) ...@@ -104,6 +108,28 @@ bool SampleQueue<T>::Pop(T& sample)
} }
template <typename T> template <typename T>
bool SampleQueue<T>::Pop()
{
std::lock_guard<std::mutex> locker(mutex);
if (queue.empty())
return false;
queue.pop();
return true;
}
template <typename T>
bool SampleQueue<T>::Front(T& sample)
{
std::lock_guard<std::mutex> locker(mutex);
if (queue.empty())
return false;
//sample = std::move(queue.front());
sample = queue.front();
return true;
}
template <typename T>
bool SampleQueue<T>::WaitFor(T& sample) bool SampleQueue<T>::WaitFor(T& sample)
{ {
// Blocking wait for sample // Blocking wait for sample
...@@ -121,6 +147,38 @@ bool SampleQueue<T>::WaitFor(T& sample) ...@@ -121,6 +147,38 @@ bool SampleQueue<T>::WaitFor(T& sample)
} }
template <typename T> template <typename T>
bool SampleQueue<T>::WaitFor()
{
// Blocking wait for sample
std::unique_lock<std::mutex> locker(mutex);
queueCondition.wait(locker, [&] {return !queue.empty() || waitCancelled; });
if (waitCancelled)
return false;
else if (!queue.empty())
{
return true;
}
return true;
}
template <typename T>
bool SampleQueue<T>::WaitUntil(int timeout)
{
std::unique_lock<std::mutex> locker(mutex);
auto delay = std::chrono::system_clock::now() + std::chrono::milliseconds(timeout);
queueCondition.wait_until(locker, delay, [&] {return !queue.empty() || waitCancelled; });
if (waitCancelled || queue.empty())
return false;
else if (!queue.empty())
{
return true;
}
return true;
}
template <typename T>
bool SampleQueue<T>::WaitUntil(T& sample, int timeout) bool SampleQueue<T>::WaitUntil(T& sample, int timeout)
{ {
// Blocking wait for sample // Blocking wait for sample
......
MomentaMedia/src/BlackMagicDesign/DeckLinkInputDevice.cpp
...@@ -78,7 +78,15 @@ HRESULT DeckLinkInputDevice::VideoInputFrameArrived(IDeckLinkVideoInputFrame* vi ...@@ -78,7 +78,15 @@ HRESULT DeckLinkInputDevice::VideoInputFrameArrived(IDeckLinkVideoInputFrame* vi
ComPtr<IDeckLinkVideoInputFrame> frame = ComPtr<IDeckLinkVideoInputFrame>(videoFrame); ComPtr<IDeckLinkVideoInputFrame> frame = ComPtr<IDeckLinkVideoInputFrame>(videoFrame);
//emit ArrivedFrame(frame); //emit ArrivedFrame(frame);
if (Capture) { if (Capture) {
Capture->AddFrame(frame); auto cur_time = QDateTime::currentMSecsSinceEpoch();
Capture->AddFrame(frame, cur_time);
}
if(audioPacket)
{
//qDebug() << "DeckLinkInputDevice get audio packet--------------" << "\n";
auto cur_time = QDateTime::currentMSecsSinceEpoch();
std::shared_ptr<AudioPacket> audio_ptr = std::make_shared<AudioPacket>(audioPacket, cur_time);
emit PushAudioFrame(audio_ptr);
} }
/*std::unique_lock<std::mutex> ulock(mutex); /*std::unique_lock<std::mutex> ulock(mutex);
...@@ -197,6 +205,7 @@ bool DeckLinkInputDevice::Initialize() ...@@ -197,6 +205,7 @@ bool DeckLinkInputDevice::Initialize()
if (deckLinkAttributes->GetInt(BMDDeckLinkVideoInputConnections, &SupportedInputConnections) != S_OK) if (deckLinkAttributes->GetInt(BMDDeckLinkVideoInputConnections, &SupportedInputConnections) != S_OK)
SupportedInputConnections = 0; SupportedInputConnections = 0;
return true; return true;
} }
...@@ -220,6 +229,9 @@ bool DeckLinkInputDevice::StartCapture(BMDDisplayMode displayMode, IDeckLinkScre ...@@ -220,6 +229,9 @@ bool DeckLinkInputDevice::StartCapture(BMDDisplayMode displayMode, IDeckLinkScre
if (DeckLinkInput->EnableVideoInput(displayMode, bmdFormat10BitYUV, videoInputFlags) != S_OK) if (DeckLinkInput->EnableVideoInput(displayMode, bmdFormat10BitYUV, videoInputFlags) != S_OK)
return false; return false;
if (DeckLinkInput->EnableAudioInput(bmdAudioSampleRate48kHz, bmdAudioSampleType16bitInteger, 2) != S_OK)
return false;
// Set the capture // Set the capture
if (DeckLinkInput->StartStreams() != S_OK) if (DeckLinkInput->StartStreams() != S_OK)
return false; return false;
......
MomentaMedia/src/BlackMagicDesign/DeckLinkOpenGLWidget.cpp
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
/// DeckLinkOpenGLOverlay /// DeckLinkOpenGLOverlay
/// ///
extern int PrvwFlag;
DeckLinkOpenGLOverlayWidget::DeckLinkOpenGLOverlayWidget(QWidget* parent) : QWidget(parent) DeckLinkOpenGLOverlayWidget::DeckLinkOpenGLOverlayWidget(QWidget* parent) : QWidget(parent)
{ {
Delegate = new DeckLinkPreviewOverlay(this); Delegate = new DeckLinkPreviewOverlay(this);
...@@ -35,7 +37,7 @@ DeckLinkOpenGLWidget::DeckLinkOpenGLWidget(QWidget* parent) : QOpenGLWidget(pare ...@@ -35,7 +37,7 @@ DeckLinkOpenGLWidget::DeckLinkOpenGLWidget(QWidget* parent) : QOpenGLWidget(pare
GetDeckLinkOpenGLScreenPreviewHelper(DeckLinkScreenPreviewHelper); GetDeckLinkOpenGLScreenPreviewHelper(DeckLinkScreenPreviewHelper);
Delegate = MakeComPtr<ScreenPreviewCallback>(); Delegate = MakeComPtr<ScreenPreviewCallback>();
connect(Delegate.Get(), &ScreenPreviewCallback::FrameArrived, this, &DeckLinkOpenGLWidget::SetFrame, Qt::QueuedConnection); if(PrvwFlag) connect(Delegate.Get(), &ScreenPreviewCallback::FrameArrived, this, &DeckLinkOpenGLWidget::SetFrame, Qt::QueuedConnection);
OverlayWidget = new DeckLinkOpenGLOverlayWidget(this); OverlayWidget = new DeckLinkOpenGLOverlayWidget(this);
} }
......
MomentaMedia/src/BlackMagicDesign/DeckLinkOutputDevice.cpp
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
extern int OutputDeleyTime; extern int OutputDeleyTime;
#define OUTPUT_1080 1
DeckLinkOutputDevice::DeckLinkOutputDevice(ComPtr<IDeckLink>& decklink, int videoPrerollSize) DeckLinkOutputDevice::DeckLinkOutputDevice(ComPtr<IDeckLink>& decklink, int videoPrerollSize)
: RefCount(1), : RefCount(1),
state(PlaybackState::Idle), state(PlaybackState::Idle),
...@@ -14,7 +16,8 @@ DeckLinkOutputDevice::DeckLinkOutputDevice(ComPtr<IDeckLink>& decklink, int vide ...@@ -14,7 +16,8 @@ DeckLinkOutputDevice::DeckLinkOutputDevice(ComPtr<IDeckLink>& decklink, int vide
videoPrerollSize(1), videoPrerollSize(1),
seenFirstVideoFrame(false), seenFirstVideoFrame(false),
startPlaybackTime(0), startPlaybackTime(0),
scheduledFrameCompletedCallback(nullptr) scheduledFrameCompletedCallback(nullptr),
first_sleep(false)
{ {
// Check that device has an output interface, this will throw an error if using a capture-only device such as DeckLink Mini Recorder // Check that device has an output interface, this will throw an error if using a capture-only device such as DeckLink Mini Recorder
if (!deckLinkOutput) if (!deckLinkOutput)
...@@ -116,6 +119,12 @@ HRESULT DeckLinkOutputDevice::ScheduledPlaybackHasStopped() ...@@ -116,6 +119,12 @@ HRESULT DeckLinkOutputDevice::ScheduledPlaybackHasStopped()
bool DeckLinkOutputDevice::StartPlayback(BMDDisplayMode displayMode, bool enable3D, BMDPixelFormat pixelFormat, bool requireReferenceLocked, IDeckLinkScreenPreviewCallback* screenPreviewCallback) bool DeckLinkOutputDevice::StartPlayback(BMDDisplayMode displayMode, bool enable3D, BMDPixelFormat pixelFormat, bool requireReferenceLocked, IDeckLinkScreenPreviewCallback* screenPreviewCallback)
{ {
BMDDisplayMode outputDisplayMode;
#if OUTPUT_1080
outputDisplayMode = displayMode;
#else
outputDisplayMode = BMDDisplayMode::bmdModeHD720p50;
#endif
// Pass through RP188 timecode and VANC from input frame. VITC timecode is forwarded with VANC // Pass through RP188 timecode and VANC from input frame. VITC timecode is forwarded with VANC
BMDVideoOutputFlags outputFlags = (BMDVideoOutputFlags)(bmdVideoOutputRP188 | bmdVideoOutputVANC); BMDVideoOutputFlags outputFlags = (BMDVideoOutputFlags)(bmdVideoOutputRP188 | bmdVideoOutputVANC);
ComPtr<IDeckLinkDisplayMode> deckLinkDisplayMode; ComPtr<IDeckLinkDisplayMode> deckLinkDisplayMode;
...@@ -130,12 +139,12 @@ bool DeckLinkOutputDevice::StartPlayback(BMDDisplayMode displayMode, bool enable ...@@ -130,12 +139,12 @@ bool DeckLinkOutputDevice::StartPlayback(BMDDisplayMode displayMode, bool enable
state = PlaybackState::Starting; state = PlaybackState::Starting;
} }
if((deckLinkOutput->DoesSupportVideoMode(bmdVideoConnectionUnspecified, displayMode, pixelFormat, bmdNoVideoOutputConversion, supportedVideoModeFlags, nullptr, &displayModeSupported) != S_OK) || !displayModeSupported) if((deckLinkOutput->DoesSupportVideoMode(bmdVideoConnectionUnspecified, outputDisplayMode, pixelFormat, bmdNoVideoOutputConversion, supportedVideoModeFlags, nullptr, &displayModeSupported) != S_OK) || !displayModeSupported)
{ {
return false; return false;
} }
if (deckLinkOutput->GetDisplayMode(displayMode, deckLinkDisplayMode.ReleaseAndGetAddressOf()) != S_OK) if (deckLinkOutput->GetDisplayMode(outputDisplayMode, deckLinkDisplayMode.ReleaseAndGetAddressOf()) != S_OK)
return false; return false;
if (deckLinkDisplayMode->GetFrameRate(&frameDuration, &frameTimescale) != S_OK) if (deckLinkDisplayMode->GetFrameRate(&frameDuration, &frameTimescale) != S_OK)
...@@ -148,7 +157,10 @@ bool DeckLinkOutputDevice::StartPlayback(BMDDisplayMode displayMode, bool enable ...@@ -148,7 +157,10 @@ bool DeckLinkOutputDevice::StartPlayback(BMDDisplayMode displayMode, bool enable
if (deckLinkOutput->SetScheduledFrameCompletionCallback(this) != S_OK) if (deckLinkOutput->SetScheduledFrameCompletionCallback(this) != S_OK)
return false; return false;
if (deckLinkOutput->EnableVideoOutput(displayMode, outputFlags) != S_OK) if (deckLinkOutput->EnableVideoOutput(outputDisplayMode, outputFlags) != S_OK)
return false;
if (deckLinkOutput->EnableAudioOutput(bmdAudioSampleRate48kHz,bmdAudioSampleType16bitInteger,2,bmdAudioOutputStreamTimestamped) != S_OK)
return false; return false;
deckLinkOutput->SetScreenPreviewCallback(screenPreviewCallback); deckLinkOutput->SetScreenPreviewCallback(screenPreviewCallback);
...@@ -160,9 +172,10 @@ bool DeckLinkOutputDevice::StartPlayback(BMDDisplayMode displayMode, bool enable ...@@ -160,9 +172,10 @@ bool DeckLinkOutputDevice::StartPlayback(BMDDisplayMode displayMode, bool enable
} }
outputVideoFrameQueue.Reset(); outputVideoFrameQueue.Reset();
outputAudioFrameQueue.Reset();
scheduleVideoFramesThread = std::thread(&DeckLinkOutputDevice::scheduleVideoFramesFunc, this); scheduleVideoFramesThread = std::thread(&DeckLinkOutputDevice::scheduleVideoFramesFunc, this);
scheduleAudioFramesThread = std::thread(&DeckLinkOutputDevice::scheduleAudioFramesFunc, this);
{ {
//std::lock_guard<std::mutex> locker(mutex); //std::lock_guard<std::mutex> locker(mutex);
state = PlaybackState::Prerolling; state = PlaybackState::Prerolling;
...@@ -193,9 +206,13 @@ void DeckLinkOutputDevice::StopPlayback() ...@@ -193,9 +206,13 @@ void DeckLinkOutputDevice::StopPlayback()
} }
outputVideoFrameQueue.CancelWaiters(); outputVideoFrameQueue.CancelWaiters();
outputAudioFrameQueue.CancelWaiters();
if (scheduleVideoFramesThread.joinable()) if (scheduleVideoFramesThread.joinable())
scheduleVideoFramesThread.join(); scheduleVideoFramesThread.join();
if (scheduleAudioFramesThread.joinable())
scheduleAudioFramesThread.join();
} }
// In scheduled playback is running, stop video and audio streams immediately // In scheduled playback is running, stop video and audio streams immediately
...@@ -211,6 +228,8 @@ void DeckLinkOutputDevice::StopPlayback() ...@@ -211,6 +228,8 @@ void DeckLinkOutputDevice::StopPlayback()
// Disable video // Disable video
deckLinkOutput->DisableVideoOutput(); deckLinkOutput->DisableVideoOutput();
// Disable audio
deckLinkOutput->DisableAudioOutput();
// Dereference DeckLinkOutputDevice delegate from callbacks // Dereference DeckLinkOutputDevice delegate from callbacks
deckLinkOutput->SetScheduledFrameCompletionCallback(nullptr); deckLinkOutput->SetScheduledFrameCompletionCallback(nullptr);
...@@ -264,6 +283,14 @@ bool DeckLinkOutputDevice::getReferenceSignalMode(BMDDisplayMode* mode) ...@@ -264,6 +283,14 @@ bool DeckLinkOutputDevice::getReferenceSignalMode(BMDDisplayMode* mode)
return state != PlaybackState::Idle; return state != PlaybackState::Idle;
} }
void DeckLinkOutputDevice::outputAudioFrameFunc(void)
{
while (true)
{
}
}
void DeckLinkOutputDevice::scheduleVideoFramesFunc() void DeckLinkOutputDevice::scheduleVideoFramesFunc()
{ {
while(true) while(true)
...@@ -280,8 +307,8 @@ bool DeckLinkOutputDevice::getReferenceSignalMode(BMDDisplayMode* mode) ...@@ -280,8 +307,8 @@ bool DeckLinkOutputDevice::getReferenceSignalMode(BMDDisplayMode* mode)
qDebug() << "input frame cur time:" << input_time << " now time:" <<now_time << " dever time:"<<dever_time << "\n"; qDebug() << "input frame cur time:" << input_time << " now time:" <<now_time << " dever time:"<<dever_time << "\n";
if (dever_time < OutputDeleyTime * 1000) if (dever_time < OutputDeleyTime * 1000)
{ {
//qDebug() << "sleep ms:" << 5 * 1000 - dever_time << "\n"; std::this_thread::sleep_for(std::chrono::milliseconds(OutputDeleyTime * 1000 - dever_time));
Sleep(OutputDeleyTime * 1000 - dever_time);
} }
END_WAIT_TIME_COUNTER END_WAIT_TIME_COUNTER
//std::lock_guard<std::mutex> locker(mutex); //std::lock_guard<std::mutex> locker(mutex);
...@@ -305,6 +332,7 @@ bool DeckLinkOutputDevice::getReferenceSignalMode(BMDDisplayMode* mode) ...@@ -305,6 +332,7 @@ bool DeckLinkOutputDevice::getReferenceSignalMode(BMDDisplayMode* mode)
break; break;
} }
//scheduledFramesList.push_back(outputFrame); //scheduledFramesList.push_back(outputFrame);
//checkEndOfPreroll(); //checkEndOfPreroll();
...@@ -316,6 +344,33 @@ bool DeckLinkOutputDevice::getReferenceSignalMode(BMDDisplayMode* mode) ...@@ -316,6 +344,33 @@ bool DeckLinkOutputDevice::getReferenceSignalMode(BMDDisplayMode* mode)
} }
} }
void DeckLinkOutputDevice::scheduleAudioFramesFunc(void)
{
while (true)
{
std::shared_ptr<AudioPacket> audio_packet;
if (outputAudioFrameQueue.WaitFor(audio_packet))
{
auto data = audio_packet->audio_data.data();
auto sample = audio_packet->sample;
quint32 sampleFramesWritten;
HRESULT ret = deckLinkOutput->WriteAudioSamplesSync(data,sample,&sampleFramesWritten);
if(ret == S_OK)
{
if (sampleFramesWritten < sample)
{
}
}
else
{
qDebug() << "Unable to schedule output audio frame" << "\n";
break;
}
}
}
}
bool DeckLinkOutputDevice::waitForReferenceSignalToLock() bool DeckLinkOutputDevice::waitForReferenceSignalToLock()
{ {
ComPtr<IDeckLinkStatus> deckLinkStatus(IID_IDeckLinkStatus, deckLink); ComPtr<IDeckLinkStatus> deckLinkStatus(IID_IDeckLinkStatus, deckLink);
...@@ -359,8 +414,19 @@ void DeckLinkOutputDevice::AddFrame(std::shared_ptr<Image> image) ...@@ -359,8 +414,19 @@ void DeckLinkOutputDevice::AddFrame(std::shared_ptr<Image> image)
return; return;
if (outputVideoFrameQueue.Size() >= 4) if (outputVideoFrameQueue.Size() >= 4)
qDebug() << "DeckLinkOutputDevice::AddFrame::qsize::" << "\t" << outputVideoFrameQueue.Size() << "\n"; qDebug() << "DeckLinkOutputDevice::AddFrame video---qsize:" << "\t" << outputVideoFrameQueue.Size() << "\n";
outputVideoFrameQueue.Push(image); outputVideoFrameQueue.Push(image);
END_SLOT_TIME_COUNTER END_SLOT_TIME_COUNTER
} }
void DeckLinkOutputDevice::AddAudioFrame(std::shared_ptr<AudioPacket> audio_packet)
{
START_SLOT_TIME_COUNTER
if (outputAudioFrameQueue.Size() >= 4)
qDebug() << "DeckLinkOutputDevice::AddAudioFrame audio---qsize:" << "\t" << outputAudioFrameQueue.Size() << "\n";
if (audio_packet)
{
outputAudioFrameQueue.Push(audio_packet);
}
END_SLOT_TIME_COUNTER
}
MomentaMedia/src/BlackMagicDesign/DeckLinkOutputPage.cpp
...@@ -252,6 +252,7 @@ void DeckLinkOutputPage::RequestedDeviceGranted(ComPtr<IDeckLink>& device) ...@@ -252,6 +252,7 @@ void DeckLinkOutputPage::RequestedDeviceGranted(ComPtr<IDeckLink>& device)
// TODO: Connect // TODO: Connect
connect(BindingInputPage->GetCapture(), &CaptureThread::PushFrame, Process.get(), &ProcessThread::AddFrame); connect(BindingInputPage->GetCapture(), &CaptureThread::PushFrame, Process.get(), &ProcessThread::AddFrame);
connect(Process.get(), &ProcessThread::PushFrame, SelectedDevice.Get(), &DeckLinkOutputDevice::AddFrame); connect(Process.get(), &ProcessThread::PushFrame, SelectedDevice.Get(), &DeckLinkOutputDevice::AddFrame);
connect(BindingInputPage->GetSelectedDevice().Get(), &DeckLinkInputDevice::PushAudioFrame, SelectedDevice.Get(), &DeckLinkOutputDevice::AddAudioFrame);
connect(BindingInputPage, &DeckLinkInputPage::FormatChanged, this, &DeckLinkOutputPage::FormatChanged); connect(BindingInputPage, &DeckLinkInputPage::FormatChanged, this, &DeckLinkOutputPage::FormatChanged);
......
MomentaMedia/src/MomentaMedia.cpp
...@@ -12,13 +12,16 @@ ...@@ -12,13 +12,16 @@
int OutputDeleyTime = 5; int OutputDeleyTime = 5;
int FrameRate = 50;
int PrvwFlag = 0;
qint64 StartTimeStamp = 0;
MomentaMedia::MomentaMedia(QWidget *parent) MomentaMedia::MomentaMedia(QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)
{ {
ReadSettings();
ui.setupUi(this); ui.setupUi(this);
StartTimeStamp = QDateTime::currentMSecsSinceEpoch();
setWindowFlags(Qt::Window | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint); setWindowFlags(Qt::Window | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint);
InputDevicePages[0] = ui.devicePage1; InputDevicePages[0] = ui.devicePage1;
...@@ -41,7 +44,6 @@ MomentaMedia::MomentaMedia(QWidget *parent) ...@@ -41,7 +44,6 @@ MomentaMedia::MomentaMedia(QWidget *parent)
DeleyTimeEdit->setValidator(intValidator); DeleyTimeEdit->setValidator(intValidator);
connect(DeleyTimeEdit,&QLineEdit::textChanged,this,&MomentaMedia::DeleyTimeTextChanged); connect(DeleyTimeEdit,&QLineEdit::textChanged,this,&MomentaMedia::DeleyTimeTextChanged);
ReadSettings();
QSize previewViewSize = ui.previewContainer->size(); QSize previewViewSize = ui.previewContainer->size();
...@@ -503,6 +505,10 @@ void MomentaMedia::ReadSettings() ...@@ -503,6 +505,10 @@ void MomentaMedia::ReadSettings()
QSettings settings(ini_path, QSettings::IniFormat); QSettings settings(ini_path, QSettings::IniFormat);
settings.beginGroup("DELEYTIME"); settings.beginGroup("DELEYTIME");
OutputDeleyTime = settings.value("DELEY_TIME", "").toInt(); OutputDeleyTime = settings.value("DELEY_TIME", "").toInt();
if (OutputDeleyTime < 1) OutputDeleyTime = 1;
FrameRate = settings.value("FRAME_RATE", "").toInt();
if (FrameRate < 25) FrameRate = 25;
PrvwFlag = settings.value("PRVW_FLAG", "").toInt();
//qDebug() << "deleyTime=" << deleyTime << endl; //qDebug() << "deleyTime=" << deleyTime << endl;
settings.endGroup(); settings.endGroup();
} }
\ No newline at end of file
MomentaMedia/src/NDI/NDIOutputThread.cpp
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
#include <atomic> #include <atomic>
#include "NDI/NDIOutputThread.h" #include "NDI/NDIOutputThread.h"
extern qint64 StartTimeStamp;
NDIOutputThread::NDIOutputThread(const QString& Name, int w, int h) : NDISenderName(Name), width(w), height(h), isSending(false), Instance(nullptr) NDIOutputThread::NDIOutputThread(const QString& Name, int w, int h) : NDISenderName(Name), width(w), height(h), isSending(false), Instance(nullptr)
{ {
} }
...@@ -93,7 +95,8 @@ void NDIOutputThread::run() ...@@ -93,7 +95,8 @@ void NDIOutputThread::run()
if(frame->IsValid()) if(frame->IsValid())
{ {
frame->Fill(Frame.p_data, Frame.xres * Frame.yres * 4); frame->Fill(Frame.p_data, Frame.xres * Frame.yres * 4);
//qDebug() << "wgt-----------------------------"<<"ndi(" << NDISenderName << ")timestamp : " << frame->getInputFrameCurTimeStamp() - StartTimeStamp << "\n";
Frame.timestamp = frame->getInputFrameCurTimeStamp();
NDIlib_send_send_video_v2(Instance, &Frame); NDIlib_send_send_video_v2(Instance, &Frame);
} }
taskQueue.Pop(frame); taskQueue.Pop(frame);
......
MomentaMedia/src/Threads/CaptureThread.cpp
...@@ -32,7 +32,7 @@ CaptureThread::~CaptureThread() ...@@ -32,7 +32,7 @@ CaptureThread::~CaptureThread()
} }
void CaptureThread::AddFrame(ComPtr<IDeckLinkVideoInputFrame> videoFrame) void CaptureThread::AddFrame(ComPtr<IDeckLinkVideoInputFrame> videoFrame, const qint64& timestamp)
{ {
int64_t st = QDateTime::currentMSecsSinceEpoch(); int64_t st = QDateTime::currentMSecsSinceEpoch();
int64_t st2 = GetCurrTimeMS(); int64_t st2 = GetCurrTimeMS();
...@@ -77,7 +77,9 @@ void CaptureThread::AddFrame(ComPtr<IDeckLinkVideoInputFrame> videoFrame) ...@@ -77,7 +77,9 @@ void CaptureThread::AddFrame(ComPtr<IDeckLinkVideoInputFrame> videoFrame)
tags = tag.c_str(); tags = tag.c_str();
//PRINT_CURR_TIME(tags); //PRINT_CURR_TIME(tags);
taskQueue.push(videoFrame); //taskQueue.push(videoFrame);
videoFrameData video_data = { videoFrame,timestamp };
taskVideoQueue.push(video_data);
tag = "CaptureThread::AddFrame::S1::" + std::to_string(idx); tag = "CaptureThread::AddFrame::S1::" + std::to_string(idx);
tags = tag.c_str(); tags = tag.c_str();
...@@ -106,6 +108,7 @@ void CaptureThread::run() ...@@ -106,6 +108,7 @@ void CaptureThread::run()
START_WAIT_TIME_COUNTER START_WAIT_TIME_COUNTER
ComPtr<IDeckLinkVideoInputFrame> videoFrame; ComPtr<IDeckLinkVideoInputFrame> videoFrame;
qint64 cur_time = 0;
/*if (taskQueue.WaitFor(videoFrame)) /*if (taskQueue.WaitFor(videoFrame))
{ {
END_WAIT_TIME_COUNTER END_WAIT_TIME_COUNTER
...@@ -120,17 +123,19 @@ void CaptureThread::run() ...@@ -120,17 +123,19 @@ void CaptureThread::run()
{ {
std::unique_lock<std::mutex> ulock(mutex); std::unique_lock<std::mutex> ulock(mutex);
while (taskQueue.empty()) { while (taskVideoQueue.empty()) {
cv.wait(ulock); cv.wait(ulock);
} }
videoFrame = taskQueue.front(); auto& video_data = taskVideoQueue.front();
taskQueue.pop(); videoFrame = video_data.video_frame;
cur_time = video_data.timestamp;
taskVideoQueue.pop();
} }
if (videoFrame.Get() != nullptr) if (videoFrame.Get() != nullptr)
{ {
auto cur_time = QDateTime::currentMSecsSinceEpoch(); //auto cur_time = QDateTime::currentMSecsSinceEpoch();
qDebug() << "input frame cur time:" << cur_time << "\n"; //qDebug() << "input frame cur time:" << cur_time << "\n";
std::shared_ptr<Image> image = std::make_shared<Image>(videoFrame,cur_time); std::shared_ptr<Image> image = std::make_shared<Image>(videoFrame,cur_time);
emit PushFrame(image); emit PushFrame(image);
} }
......
MomentaMedia/src/Utils/AudioPacket.cpp 0 → 100644
#include "Utils/AudioPacket.h"
AudioPacket::AudioPacket(IDeckLinkAudioInputPacket* audioPacket, qint64& timestamp):frame_time_stamp(timestamp),channel(2)
{
if (audioPacket)
{
sample = audioPacket->GetSampleFrameCount();
size = sample * sizeof(int16_t) * channel;
void* data = nullptr;
audioPacket->GetBytes(&data);
if (data && size > 0) {
audio_data = QByteArray((char const*)data, size);
}
}
}
AudioPacket::~AudioPacket()
{
}
\ No newline at end of file
MomentaMedia/src/main.cpp
...@@ -54,6 +54,7 @@ int main(int argc, char *argv[]) ...@@ -54,6 +54,7 @@ int main(int argc, char *argv[])
qRegisterMetaType<Image>("Image"); qRegisterMetaType<Image>("Image");
qRegisterMetaType<Image>("Image&"); qRegisterMetaType<Image>("Image&");
qRegisterMetaType<std::shared_ptr<Image>>("std::shared_ptr<Image>"); qRegisterMetaType<std::shared_ptr<Image>>("std::shared_ptr<Image>");
qRegisterMetaType<std::shared_ptr<AudioPacket>>("std::shared_ptr<AudioPacket>");
MomentaMedia w; MomentaMedia w;
w.show(); w.show();
......
x64/Debug/MomentaMedia.log
This source diff could not be displayed because it is too large. You can view the blob instead.
x64/Debug/settings.ini 0 → 100644
[DELEYTIME]
DELEY_TIME=10
\ No newline at end of file
x64/Release/MomentaMedia - Copy .log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
x64/Release/MomentaMedia - Copy.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
x64/Release/MomentaMedia.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
x64/Release/settings.ini 0 → 100644
[DELEYTIME]
DELEY_TIME=5
FRAME_RATE=25
PRVW_FLAG=0
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