videorenderer: use qmutexlocker in more cases

Minor code cleanup.
This commit is contained in:
itsmattkc
2020-02-20 17:48:28 +11:00
parent 8cb74a8218
commit 054281596e
3 changed files with 13 additions and 23 deletions
@@ -151,10 +151,6 @@ void VideoRenderBackend::InvalidateCacheInternal(const rational &start_range, co
Requeue();
}
void VideoRenderBackend::ParamsChangedEvent()
{
}
VideoRenderFrameCache *VideoRenderBackend::frame_cache()
{
return &frame_cache_;
+1 -1
View File
@@ -93,7 +93,7 @@ protected:
virtual void InvalidateCacheInternal(const rational &start_range, const rational &end_range) override;
virtual void ParamsChangedEvent();
virtual void ParamsChangedEvent(){}
VideoRenderWorker::OperatingMode operating_mode_;
+12 -18
View File
@@ -14,9 +14,10 @@ void VideoRenderFrameCache::Clear()
{
time_hash_map_.clear();
currently_caching_lock_.lock();
currently_caching_list_.clear();
currently_caching_lock_.unlock();
{
QMutexLocker locker(&currently_caching_lock_);
currently_caching_list_.clear();
}
cache_id_.clear();
}
@@ -28,28 +29,21 @@ bool VideoRenderFrameCache::HasHash(const QByteArray &hash, const PixelFormat::F
bool VideoRenderFrameCache::IsCaching(const QByteArray &hash)
{
currently_caching_lock_.lock();
QMutexLocker locker(&currently_caching_lock_);
bool is_caching = currently_caching_list_.contains(hash);
currently_caching_lock_.unlock();
return is_caching;
return currently_caching_list_.contains(hash);
}
bool VideoRenderFrameCache::TryCache(const QByteArray &hash)
{
currently_caching_lock_.lock();
QMutexLocker locker(&currently_caching_lock_);
bool is_caching = currently_caching_list_.contains(hash);
if (!is_caching) {
if (!currently_caching_list_.contains(hash)) {
currently_caching_list_.append(hash);
return true;
}
currently_caching_lock_.unlock();
return !is_caching;
return false;
}
void VideoRenderFrameCache::SetCacheID(const QString &id)
@@ -84,9 +78,9 @@ void VideoRenderFrameCache::Truncate(const rational &time)
void VideoRenderFrameCache::RemoveHashFromCurrentlyCaching(const QByteArray &hash)
{
currently_caching_lock_.lock();
QMutexLocker locker(&currently_caching_lock_);
currently_caching_list_.removeOne(hash);
currently_caching_lock_.unlock();
}
QList<rational> VideoRenderFrameCache::FramesWithHash(const QByteArray &hash)