fixed gcc compile issues

This commit is contained in:
itsmattkc
2020-01-19 20:39:48 +11:00
parent 1101b58ee8
commit 4697b98980
30 changed files with 55 additions and 46 deletions
+1 -6
View File
@@ -37,7 +37,7 @@ bool VideoRenderFrameCache::IsCaching(const QByteArray &hash)
return is_caching;
}
bool VideoRenderFrameCache::TryCache(const rational& time, const QByteArray &hash)
bool VideoRenderFrameCache::TryCache(const QByteArray &hash)
{
currently_caching_lock_.lock();
@@ -69,11 +69,6 @@ void VideoRenderFrameCache::SetHash(const rational &time, const QByteArray &hash
time_hash_map_.insert(time, hash);
}
void VideoRenderFrameCache::RemoveHash(const rational &time, const QByteArray &hash)
{
time_hash_map_.remove(time);
}
void VideoRenderFrameCache::Truncate(const rational &time)
{
QMap<rational, QByteArray>::iterator i = time_hash_map_.begin();
+1 -2
View File
@@ -26,7 +26,7 @@ public:
/**
* @brief Check if a frame is currently being cached, and if not reserve it
*/
bool TryCache(const rational &time, const QByteArray& hash);
bool TryCache(const QByteArray& hash);
/**
* @brief Return the path of the cached image at this time
@@ -38,7 +38,6 @@ public:
QByteArray TimeToHash(const rational& time) const;
void SetHash(const rational& time, const QByteArray& hash);
void RemoveHash(const rational& time, const QByteArray &hash);
void Truncate(const rational& time);
+3 -3
View File
@@ -54,7 +54,7 @@ NodeValueTable VideoRenderWorker::RenderInternal(const NodeDependency& path, con
// We've already cached this hash, no need to continue
emit HashAlreadyExists(path, job_time, hash);
} else if (!(operating_mode_ & kHashOnly) || frame_cache_->TryCache(path.in(), hash)) {
} else if (!(operating_mode_ & kHashOnly) || frame_cache_->TryCache(hash)) {
// This hash is available for us to cache, start traversing graph
value = ProcessNode(path);
@@ -67,7 +67,7 @@ NodeValueTable VideoRenderWorker::RenderInternal(const NodeDependency& path, con
// If we actually have a texture, download it into the disk cache
if ((operating_mode_ & kDownloadOnly) && !texture.isNull()) {
Download(path, hash, texture, frame_cache_->CachePathName(hash, video_params_.format()));
Download(texture, frame_cache_->CachePathName(hash, video_params_.format()));
}
frame_cache_->RemoveHashFromCurrentlyCaching(hash);
@@ -206,7 +206,7 @@ void VideoRenderWorker::CloseInternal()
download_buffer_.clear();
}
void VideoRenderWorker::Download(NodeDependency dep, QByteArray hash, QVariant texture, QString filename)
void VideoRenderWorker::Download(QVariant texture, QString filename)
{
PixelFormat::Info format_info = PixelService::GetPixelFormatInfo(video_params().format());
+1 -1
View File
@@ -78,7 +78,7 @@ protected:
private:
void HashNodeRecursively(QCryptographicHash* hash, const Node *n, const rational &time);
void Download(NodeDependency dep, QByteArray hash, QVariant texture, QString filename);
void Download(QVariant texture, QString filename);
VideoRenderingParams video_params_;