Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@CrendKing
CrendKing committed Jun 12, 2021
1 parent 75e2cb3 commit e6341b4
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 38 deletions.
6 changes: 3 additions & 3 deletions avisynth_filter/src/frame_handler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ auto FrameHandler::AddInputSample(IMediaSample *inputSample) -> HRESULT {
const std::shared_lock sharedSourceLock(_sourceMutex);

// since the key of _sourceFrames is frame number, which only strictly increases, rbegin() returns the last emplaced frame
if (const REFERENCE_TIME lastSampleStartTime = _sourceFrames.empty() ? 0 : _sourceFrames.crbegin()->second.startTime;
if (const REFERENCE_TIME lastSampleStartTime = _sourceFrames.empty() ? -1 : _sourceFrames.rbegin()->second.startTime;
inputSampleStartTime <= lastSampleStartTime) {
Environment::GetInstance().Log(L"Rejecting source sample due to start time going backward: curr %10lli last %10lli", inputSampleStartTime, lastSampleStartTime);
return S_FALSE;
Expand Down Expand Up @@ -115,7 +115,7 @@ auto FrameHandler::GetSourceFrame(int frameNb) -> PVideoFrame {

// use map.lower_bound() in case the exact frame is removed by the script
iter = _sourceFrames.lower_bound(frameNb);
return iter != _sourceFrames.cend();
return iter != _sourceFrames.end();
});

if (_isFlushing || iter->second.frame == nullptr) {
Expand Down Expand Up @@ -312,7 +312,7 @@ auto FrameHandler::WorkerProc() -> void {
continue;
}

processSourceFrameIters[0] = _sourceFrames.cbegin();
processSourceFrameIters[0] = _sourceFrames.begin();

for (int i = 1; i < NUM_SRC_FRAMES_PER_PROCESSING; ++i) {
processSourceFrameIters[i] = processSourceFrameIters[i - 1];
Expand Down
8 changes: 4 additions & 4 deletions filter_common/src/environment.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ class Environment : public RefCountedSingleton<Environment> {
auto SetScriptPath(const std::filesystem::path &scriptPath) -> void;
auto IsInputFormatEnabled(const WCHAR *formatName) const -> bool;
auto SetInputFormatEnabled(const WCHAR *formatName, bool enabled) -> void;
auto IsRemoteControlEnabled() const -> bool { return _isRemoteControlEnabled; }
constexpr auto IsRemoteControlEnabled() const -> bool { return _isRemoteControlEnabled; }
auto SetRemoteControlEnabled(bool enabled) -> void;
auto GetExtraSourceBuffer() const -> int { return _extraSourceBuffer; }
auto IsSupportAVXx() const -> bool { return _isSupportAVXx; }
auto IsSupportSSSE3() const -> bool { return _isSupportSSSE3; }
constexpr auto GetExtraSourceBuffer() const -> int { return _extraSourceBuffer; }
constexpr auto IsSupportAVXx() const -> bool { return _isSupportAVXx; }
constexpr auto IsSupportSSSE3() const -> bool { return _isSupportSSSE3; }

private:
auto LoadSettingsFromIni() -> void;
Expand Down
2 changes: 1 addition & 1 deletion filter_common/src/filter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ auto CSynthFilter::CheckConnect(PIN_DIRECTION direction, IPin *pPin) -> HRESULT
const std::shared_ptr<AM_MEDIA_TYPE> nextTypePtr(nextType, &DeleteMediaType);

if (const Format::PixelFormat *optInputPixelFormat = GetInputPixelFormat(nextType);
optInputPixelFormat && std::ranges::find(_compatibleMediaTypes, optInputPixelFormat, &MediaTypePair::inputPixelFormat) == _compatibleMediaTypes.cend()) {
optInputPixelFormat && std::ranges::find(_compatibleMediaTypes, optInputPixelFormat, &MediaTypePair::inputPixelFormat) == _compatibleMediaTypes.end()) {
// invoke the script with each supported input pixel format, and observe the output frameserver format
if (!AuxFrameServer::GetInstance().ReloadScript(*nextType, Environment::GetInstance().IsRemoteControlEnabled())) {
Environment::GetInstance().Log(L"Disconnect filter by user request");
Expand Down
2 changes: 1 addition & 1 deletion filter_common/src/frame_handler_common.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ auto FrameHandler::GarbageCollect(int srcFrameNb) -> void {

// search for all previous frames in case of some source frames are never used
// this could happen by plugins that decrease frame rate
const auto sourceEnd = _sourceFrames.cend();
const auto sourceEnd = _sourceFrames.end();
for (decltype(_sourceFrames)::const_iterator iter = _sourceFrames.begin(); iter != sourceEnd && iter->first <= srcFrameNb; iter = _sourceFrames.begin()) {
_sourceFrames.erase(iter);
}
Expand Down
50 changes: 26 additions & 24 deletions vapoursynth_filter/src/frame_handler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ auto FrameHandler::AddInputSample(IMediaSample *inputSample) -> HRESULT {
}

// add headroom to avoid blocking and context switch
return _nextSourceFrameNb <= _nextOutputSourceFrameNb + NUM_SRC_FRAMES_PER_PROCESSING + Environment::GetInstance().GetExtraSourceBuffer();
return _nextSourceFrameNb <= _lastUsedSourceFrameNb + NUM_SRC_FRAMES_PER_PROCESSING + Environment::GetInstance().GetExtraSourceBuffer();
});

if (_isFlushing || _isStopping) {
Expand All @@ -43,7 +43,7 @@ auto FrameHandler::AddInputSample(IMediaSample *inputSample) -> HRESULT {
const std::shared_lock sharedSourceLock(_sourceMutex);

// since the key of _sourceFrames is frame number, which only strictly increases, rbegin() returns the last emplaced frame
if (const REFERENCE_TIME lastSampleStartTime = _sourceFrames.empty() ? 0 : _sourceFrames.crbegin()->second.startTime;
if (const REFERENCE_TIME lastSampleStartTime = _sourceFrames.empty() ? -1 : _sourceFrames.rbegin()->second.startTime;
inputSampleStartTime <= lastSampleStartTime) {
Environment::GetInstance().Log(L"Rejecting source sample due to start time going backward: curr %10lli last %10lli", inputSampleStartTime, lastSampleStartTime);
return S_FALSE;
Expand Down Expand Up @@ -93,8 +93,8 @@ auto FrameHandler::AddInputSample(IMediaSample *inputSample) -> HRESULT {
std::forward_as_tuple(frame, inputSampleStartTime, hdrSideData));
}

Environment::GetInstance().Log(L"Stored source frame: %6i at %10lli ~ %10lli duration(literal) %10lli",
_nextSourceFrameNb, inputSampleStartTime, inputSampleStopTime, inputSampleStopTime - inputSampleStartTime);
Environment::GetInstance().Log(L"Stored source frame: %6i at %10lli ~ %10lli duration(literal) %10lli, last used: %6i",
_nextSourceFrameNb, inputSampleStartTime, inputSampleStopTime, inputSampleStopTime - inputSampleStartTime, _lastUsedSourceFrameNb.load());

_nextSourceFrameNb += 1;

Expand All @@ -110,7 +110,7 @@ auto FrameHandler::AddInputSample(IMediaSample *inputSample) -> HRESULT {
const std::shared_lock sharedSourceLock(_sourceMutex);

for (int i = 0; i < NUM_SRC_FRAMES_PER_PROCESSING; ++i) {
if (processSourceFrameIters[i] == _sourceFrames.cend()) {
if (processSourceFrameIters[i] == _sourceFrames.end()) {
return S_OK;
}

Expand All @@ -134,10 +134,12 @@ auto FrameHandler::AddInputSample(IMediaSample *inputSample) -> HRESULT {
MainFrameServer::GetInstance().GetScriptAvgFrameDuration(),
0);
while (_nextOutputFrameNb <= maxRequestOutputFrameNb) {
// preemptively put frame data into the queue instead of passing a new pointer to the callback userdata
// so that if the callback is not called due to frameserver shutdown, there won't be memory leak
{
std::unique_lock uniqueOutputLock(_outputMutex);

_outputSamples.emplace(std::piecewise_construct,
_outputFrames.emplace(std::piecewise_construct,
std::forward_as_tuple(_nextOutputFrameNb),
std::forward_as_tuple(processSourceFrameIters[0]->first, processSourceFrameIters[0]->second.hdrSideData));
}
Expand All @@ -164,7 +166,7 @@ auto FrameHandler::GetSourceFrame(int frameNb) -> const VSFrameRef * {

// use map.lower_bound() in case the exact frame is removed by the script
iter = _sourceFrames.lower_bound(frameNb);
if (iter == _sourceFrames.cend()) {
if (iter == _sourceFrames.end()) {
return false;
}

Expand Down Expand Up @@ -215,7 +217,7 @@ auto FrameHandler::EndFlush(const std::function<void ()> &interim) -> void {
std::shared_lock sharedOutputLock(_outputMutex);

_flushOutputSampleCv.wait(sharedOutputLock, [this]() {
return std::ranges::all_of(_outputSamples | std::views::values, [](const OutputSampleData &data) {
return std::ranges::all_of(_outputFrames | std::views::values, [](const OutputFrameData &data) {
return data.frame!= nullptr;
});
});
Expand All @@ -226,7 +228,7 @@ auto FrameHandler::EndFlush(const std::function<void ()> &interim) -> void {
}

_sourceFrames.clear();
_outputSamples.clear();
_outputFrames.clear();

ResetInput();

Expand Down Expand Up @@ -264,7 +266,7 @@ FrameHandler::SourceFrameInfo::~SourceFrameInfo() {
AVSF_VS_API->freeFrame(frame);
}

FrameHandler::OutputSampleData::~OutputSampleData() {
FrameHandler::OutputFrameData::~OutputFrameData() {
if (frame != nullptr) {
AVSF_VS_API->freeFrame(frame);
}
Expand All @@ -277,26 +279,25 @@ auto VS_CC FrameHandler::VpsGetFrameCallback(void *userData, const VSFrameRef *f
}

FrameHandler *frameHandler = static_cast<FrameHandler *>(userData);
Environment::GetInstance().Log(L"Output frame %6i is ready, output queue size %2zu", n, frameHandler->_outputSamples.size());
Environment::GetInstance().Log(L"Output frame %6i is ready, output queue size %2zu", n, frameHandler->_outputFrames.size());

if (frameHandler->_isFlushing) {
{
std::unique_lock uniqueOutputLock(frameHandler->_outputMutex);

frameHandler->_outputSamples.erase(n);
frameHandler->_outputFrames.erase(n);
}
frameHandler->_flushOutputSampleCv.notify_all();

AVSF_VS_API->freeFrame(f);
frameHandler->_flushOutputSampleCv.notify_all();
} else {
{
std::shared_lock sharedOutputLock(frameHandler->_outputMutex);

const decltype(frameHandler->_outputSamples)::iterator iter = frameHandler->_outputSamples.find(n);
ASSERT(iter != frameHandler->_outputSamples.end());
const decltype(frameHandler->_outputFrames)::iterator iter = frameHandler->_outputFrames.find(n);
ASSERT(iter != frameHandler->_outputFrames.end());
iter->second.frame = f;
}

frameHandler->_deliverSampleCv.notify_all();
}
}
Expand All @@ -305,7 +306,7 @@ auto FrameHandler::ResetInput() -> void {
_nextSourceFrameNb = 0;
_nextProcessSourceFrameNb = 0;
_nextOutputFrameNb = 0;
_nextOutputSourceFrameNb = 0;
_lastUsedSourceFrameNb = 0;
_notifyChangedOutputMediaType = false;

_frameRateCheckpointInputSampleNb = 0;
Expand All @@ -322,7 +323,7 @@ auto FrameHandler::ResetOutput() -> void {
_nextDeliveryFrameNb = 0;
}

auto FrameHandler::PrepareOutputSample(ATL::CComPtr<IMediaSample> &sample, int frameNb, OutputSampleData &data) -> bool {
auto FrameHandler::PrepareOutputSample(ATL::CComPtr<IMediaSample> &sample, int frameNb, OutputFrameData &data) -> bool {
const VSMap *frameProps = AVSF_VS_API->getFramePropsRO(data.frame);
int propGetError;
const int64_t frameDurationNum = AVSF_VS_API->propGetInt(frameProps, VS_PROP_NAME_DURATION_NUM, 0, &propGetError);
Expand Down Expand Up @@ -413,7 +414,7 @@ auto FrameHandler::WorkerProc() -> void {
_isWorkerLatched = false;
}

decltype(_outputSamples)::iterator iter;
decltype(_outputFrames)::iterator iter;
{
std::shared_lock sharedOutputLock(_outputMutex);

Expand All @@ -422,8 +423,8 @@ auto FrameHandler::WorkerProc() -> void {
return true;
}

iter = _outputSamples.find(_nextDeliveryFrameNb);
if (iter == _outputSamples.end()) {
iter = _outputFrames.find(_nextDeliveryFrameNb);
if (iter == _outputFrames.end()) {
return false;
}

Expand All @@ -435,7 +436,8 @@ auto FrameHandler::WorkerProc() -> void {
continue;
}

_nextOutputSourceFrameNb = iter->second.sourceFrameNb;
_lastUsedSourceFrameNb = iter->second.sourceFrameNb;
_addInputSampleCv.notify_all();

if (ATL::CComPtr<IMediaSample> outputSample; PrepareOutputSample(outputSample, iter->first, iter->second)) {
_filter.m_pOutput->Deliver(outputSample);
Expand All @@ -445,10 +447,10 @@ auto FrameHandler::WorkerProc() -> void {
{
std::unique_lock uniqueOutputLock(_outputMutex);

_outputSamples.erase(iter);
_outputFrames.erase(iter);
}

GarbageCollect(_nextOutputSourceFrameNb - 1);
GarbageCollect(_lastUsedSourceFrameNb - 1);
_nextDeliveryFrameNb += 1;
}

Expand Down
10 changes: 5 additions & 5 deletions vapoursynth_filter/src/frame_handler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class FrameHandler {
std::shared_ptr<HDRSideData> hdrSideData;
};

struct OutputSampleData {
~OutputSampleData();
struct OutputFrameData {
~OutputFrameData();

int sourceFrameNb;
std::shared_ptr<HDRSideData> hdrSideData;
Expand All @@ -52,7 +52,7 @@ class FrameHandler {

auto ResetInput() -> void;
auto ResetOutput() -> void;
auto PrepareOutputSample(ATL::CComPtr<IMediaSample> &sample, int frameNb, OutputSampleData &data) -> bool;
auto PrepareOutputSample(ATL::CComPtr<IMediaSample> &sample, int frameNb, OutputFrameData &data) -> bool;
auto WorkerProc() -> void;
auto GarbageCollect(int srcFrameNb) -> void;
auto ChangeOutputFormat() -> bool;
Expand All @@ -67,7 +67,7 @@ class FrameHandler {
CSynthFilter &_filter;

std::map<int, SourceFrameInfo> _sourceFrames;
std::map<int, OutputSampleData> _outputSamples;
std::map<int, OutputFrameData> _outputFrames;

mutable std::shared_mutex _sourceMutex;
std::shared_mutex _outputMutex;
Expand All @@ -81,7 +81,7 @@ class FrameHandler {
int _nextSourceFrameNb;
int _nextProcessSourceFrameNb;
int _nextOutputFrameNb;
std::atomic<int> _nextOutputSourceFrameNb;
std::atomic<int> _lastUsedSourceFrameNb;
bool _notifyChangedOutputMediaType = false;
int _nextDeliveryFrameNb;

Expand Down

0 comments on commit e6341b4

Please sign in to comment.