footage: check files for changes
This commit is contained in:
@@ -39,7 +39,18 @@ private:
|
||||
|
||||
};
|
||||
|
||||
using DecoderCache = RenderCache<Decoder::CodecStream, DecoderPtr>;
|
||||
struct DecoderPair {
|
||||
DecoderPair()
|
||||
{
|
||||
decoder = nullptr;
|
||||
last_modified = 0;
|
||||
}
|
||||
|
||||
DecoderPtr decoder;
|
||||
qint64 last_modified;
|
||||
};
|
||||
|
||||
using DecoderCache = RenderCache<Decoder::CodecStream, DecoderPair>;
|
||||
using ShaderCache = RenderCache<QString, QVariant>;
|
||||
|
||||
}
|
||||
|
||||
@@ -91,10 +91,10 @@ void RenderManager::ClearOldDecoders()
|
||||
qint64 min_age = QDateTime::currentMSecsSinceEpoch() - kDecoderMaximumInactivity;
|
||||
|
||||
for (auto it=decoder_cache_->begin(); it!=decoder_cache_->end(); ) {
|
||||
DecoderPtr decoder = it.value();
|
||||
DecoderPair decoder = it.value();
|
||||
|
||||
if (decoder->GetLastAccessedTime() < min_age) {
|
||||
decoder->Close();
|
||||
if (decoder.decoder->GetLastAccessedTime() < min_age) {
|
||||
decoder.decoder->Close();
|
||||
it = decoder_cache_->erase(it);
|
||||
} else {
|
||||
it++;
|
||||
|
||||
@@ -187,13 +187,16 @@ DecoderPtr RenderProcessor::ResolveDecoderFromInput(const QString& decoder_id, c
|
||||
|
||||
QMutexLocker locker(decoder_cache_->mutex());
|
||||
|
||||
DecoderPtr decoder = decoder_cache_->value(stream);
|
||||
DecoderPair decoder = decoder_cache_->value(stream);
|
||||
|
||||
if (!decoder) {
|
||||
qint64 file_last_modified = QFileInfo(stream.filename()).lastModified().toMSecsSinceEpoch();
|
||||
|
||||
if (!decoder.decoder || decoder.last_modified != file_last_modified) {
|
||||
// No decoder
|
||||
decoder = Decoder::CreateFromID(decoder_id);
|
||||
decoder.decoder = Decoder::CreateFromID(decoder_id);
|
||||
decoder.last_modified = file_last_modified;
|
||||
|
||||
if (decoder->Open(stream)) {
|
||||
if (decoder.decoder->Open(stream)) {
|
||||
decoder_cache_->insert(stream, decoder);
|
||||
} else {
|
||||
qWarning() << "Failed to open decoder for" << stream.filename()
|
||||
@@ -202,7 +205,7 @@ DecoderPtr RenderProcessor::ResolveDecoderFromInput(const QString& decoder_id, c
|
||||
}
|
||||
}
|
||||
|
||||
return decoder;
|
||||
return decoder.decoder;
|
||||
}
|
||||
|
||||
void RenderProcessor::Process(RenderTicketPtr ticket, Renderer *render_ctx, StillImageCache *still_image_cache, DecoderCache *decoder_cache, ShaderCache *shader_cache, QVariant default_shader)
|
||||
|
||||
Reference in New Issue
Block a user