Merge
Demosaicing and pre-processing parameters selectable for each image. Dark frames subtraction and badpixels file support Fast loading in editor.
This commit is contained in:
ffsup2
@@ -1,175 +1,285 @@
|
||||
/*
|
||||
* This file is part of RawTherapee.
|
||||
*
|
||||
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
|
||||
*
|
||||
* RawTherapee is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* RawTherapee is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include <thumbimageupdater.h>
|
||||
#include <gtkmm.h>
|
||||
|
||||
#define threadNum 4 // IF LCMS GETS THREAD SAFETY WE CAN ENABLE MORE THREADS
|
||||
ThumbImageUpdater thumbImageUpdater;
|
||||
|
||||
ThumbImageUpdater::ThumbImageUpdater ()
|
||||
: tostop(false), stopped(true), qMutex(NULL), startMutex(NULL) {
|
||||
|
||||
threadPool = new Glib::Thread* [threadNum];
|
||||
|
||||
}
|
||||
|
||||
ThumbImageUpdater::~ThumbImageUpdater ()
|
||||
{
|
||||
delete [] threadPool;
|
||||
}
|
||||
|
||||
void ThumbImageUpdater::add (Thumbnail* t, const rtengine::procparams::ProcParams& params, int height, bool* priority, ThumbImageUpdateListener* l) {
|
||||
|
||||
if (!qMutex)
|
||||
qMutex = new Glib::Mutex ();
|
||||
if (!startMutex)
|
||||
startMutex = new Glib::Mutex ();
|
||||
|
||||
qMutex->lock ();
|
||||
// look up if an older version is in the queue
|
||||
std::list<Job>::iterator i;
|
||||
for (i=jqueue.begin(); i!=jqueue.end(); i++)
|
||||
if (i->thumbnail==t && i->listener==l) {
|
||||
i->pparams = params;
|
||||
i->height = height;
|
||||
i->priority = priority;
|
||||
break;
|
||||
}
|
||||
// not found, create and append new job
|
||||
if (i==jqueue.end ()) {
|
||||
Job j;
|
||||
j.thumbnail = t;
|
||||
j.pparams = params;
|
||||
j.height = height;
|
||||
j.listener = l;
|
||||
j.priority = priority;
|
||||
jqueue.push_back (j);
|
||||
}
|
||||
qMutex->unlock ();
|
||||
}
|
||||
|
||||
void ThumbImageUpdater::process () {
|
||||
|
||||
if (stopped) {
|
||||
#undef THREAD_PRIORITY_LOW
|
||||
stopped = false;
|
||||
thread = Glib::Thread::create(sigc::mem_fun(*this, &ThumbImageUpdater::process_), (unsigned long int)0, true, true, Glib::THREAD_PRIORITY_LOW);
|
||||
}
|
||||
}
|
||||
|
||||
void ThumbImageUpdater::process_ () {
|
||||
|
||||
stopped = false;
|
||||
tostop = false;
|
||||
|
||||
|
||||
while (!tostop && !jqueue.empty ()) {
|
||||
|
||||
qMutex->lock ();
|
||||
int threads = 0;
|
||||
for (; threads<threadNum && !jqueue.empty (); threads++) {
|
||||
// find first entry having update priority, if any
|
||||
std::list<Job>::iterator i;
|
||||
for (i=jqueue.begin (); i!=jqueue.end(); i++)
|
||||
if (*(i->priority))
|
||||
break;
|
||||
if (i==jqueue.end())
|
||||
i = jqueue.begin();
|
||||
Job current = *i;
|
||||
jqueue.erase (i);
|
||||
if (current.listener)
|
||||
threadPool[threads] = Glib::Thread::create(sigc::bind(sigc::mem_fun(*this, &ThumbImageUpdater::processJob), current), 0, true, true, Glib::THREAD_PRIORITY_LOW);
|
||||
//else
|
||||
// threadPool[threads] = NULL;
|
||||
}
|
||||
qMutex->unlock ();
|
||||
|
||||
for (int j=0; j<threads; j++)
|
||||
if (threadPool[j])
|
||||
threadPool[j]->join ();
|
||||
|
||||
for(int j =0; j <threadNum;j++)
|
||||
threadPool[j] = NULL;
|
||||
}
|
||||
stopped = true;
|
||||
}
|
||||
|
||||
void ThumbImageUpdater::processJob (Job current) {
|
||||
|
||||
if (current.listener) {
|
||||
double scale = 1.0;
|
||||
rtengine::IImage8* img = current.thumbnail->processThumbImage (current.pparams, current.height, scale);
|
||||
if (img)
|
||||
current.listener->updateImage (img, scale, current.pparams.crop);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void ThumbImageUpdater::stop () {
|
||||
|
||||
if (stopped) {
|
||||
tostop = true;
|
||||
return; }
|
||||
|
||||
gdk_threads_leave();
|
||||
tostop = true;
|
||||
Glib::Thread::self()->yield();
|
||||
if (!stopped)
|
||||
thread->join ();
|
||||
gdk_threads_enter();
|
||||
}
|
||||
|
||||
void ThumbImageUpdater::removeJobs () {
|
||||
|
||||
if (!qMutex)
|
||||
return;
|
||||
|
||||
qMutex->lock ();
|
||||
while (!jqueue.empty())
|
||||
jqueue.pop_front ();
|
||||
qMutex->unlock ();
|
||||
}
|
||||
|
||||
void ThumbImageUpdater::removeJobs (ThumbImageUpdateListener* listener) {
|
||||
|
||||
if (!qMutex)
|
||||
return;
|
||||
|
||||
qMutex->lock ();
|
||||
bool ready = false;
|
||||
while (!ready) {
|
||||
ready = true;
|
||||
std::list<Job>::iterator i;
|
||||
for (i=jqueue.begin(); i!=jqueue.end(); i++)
|
||||
if (i->listener == listener) {
|
||||
jqueue.erase (i);
|
||||
ready = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
qMutex->unlock ();
|
||||
}
|
||||
|
||||
void ThumbImageUpdater::terminate () {
|
||||
|
||||
stop ();
|
||||
removeJobs ();
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* This file is part of RawTherapee.
|
||||
*
|
||||
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
|
||||
*
|
||||
* RawTherapee is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* RawTherapee is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <set>
|
||||
#include <thumbimageupdater.h>
|
||||
#include <gtkmm.h>
|
||||
#include <guiutils.h>
|
||||
|
||||
#ifdef _OPENMP
|
||||
#include <omp.h>
|
||||
#endif
|
||||
|
||||
#define DEBUG(format,args...)
|
||||
//#define DEBUG(format,args...) printf("ThumbImageUpdate::%s: " format "\n", __FUNCTION__, ## args)
|
||||
|
||||
class
|
||||
ThumbImageUpdater::Impl
|
||||
{
|
||||
public:
|
||||
|
||||
struct Job
|
||||
{
|
||||
Job(Thumbnail* thumbnail, const rtengine::procparams::ProcParams& pparams,
|
||||
int height, bool* priority, bool upgrade,
|
||||
ThumbImageUpdateListener* listener):
|
||||
thumbnail_(thumbnail),
|
||||
pparams_(pparams),
|
||||
height_(height),
|
||||
priority_(priority),
|
||||
upgrade_(upgrade),
|
||||
listener_(listener)
|
||||
{}
|
||||
|
||||
Job():
|
||||
thumbnail_(0),
|
||||
listener_(0)
|
||||
{}
|
||||
|
||||
Thumbnail* thumbnail_;
|
||||
rtengine::procparams::ProcParams pparams_;
|
||||
int height_;
|
||||
bool* priority_;
|
||||
bool upgrade_;
|
||||
ThumbImageUpdateListener* listener_;
|
||||
};
|
||||
|
||||
typedef std::list<Job> JobList;
|
||||
|
||||
Impl():
|
||||
active_(0),
|
||||
inactive_waiting_(false)
|
||||
{
|
||||
int threadCount=1;
|
||||
#ifdef _OPENMP
|
||||
threadCount=omp_get_num_procs();
|
||||
#endif
|
||||
|
||||
threadPool_=new Glib::ThreadPool(threadCount,0);
|
||||
}
|
||||
|
||||
Glib::ThreadPool* threadPool_;
|
||||
|
||||
Glib::Mutex mutex_;
|
||||
|
||||
JobList jobs_;
|
||||
|
||||
unsigned int active_;
|
||||
|
||||
bool inactive_waiting_;
|
||||
|
||||
Glib::Cond inactive_;
|
||||
|
||||
void
|
||||
processNextJob(void)
|
||||
{
|
||||
Job j;
|
||||
|
||||
{
|
||||
Glib::Mutex::Lock lock(mutex_);
|
||||
|
||||
// nothing to do; could be jobs have been removed
|
||||
if ( jobs_.empty() )
|
||||
{
|
||||
DEBUG("processing: nothing to do (%d,%d)",paused_,jobs_.empty());
|
||||
return;
|
||||
}
|
||||
|
||||
JobList::iterator i;
|
||||
|
||||
// see if any priority jobs exist
|
||||
for ( i = jobs_.begin(); i != jobs_.end(); ++i)
|
||||
{
|
||||
if ( *(i->priority_) )
|
||||
{
|
||||
DEBUG("processing(priority) %s",i->thumbnail_->getFileName().c_str());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// see if any none upgrade jobs exist
|
||||
for ( i = jobs_.begin(); i != jobs_.end(); ++i)
|
||||
{
|
||||
if ( !i->upgrade_ )
|
||||
{
|
||||
DEBUG("processing(not-upgrade) %s",i->thumbnail_->getFileName().c_str());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// if none, then use first
|
||||
if ( i == jobs_.end() )
|
||||
{
|
||||
i = jobs_.begin();
|
||||
DEBUG("processing(first) %s",i->thumbnail_->getFileName().c_str());
|
||||
}
|
||||
|
||||
// copy found job
|
||||
j = *i;
|
||||
|
||||
// remove so not run again
|
||||
jobs_.erase(i);
|
||||
DEBUG("%d job(s) remaining",jobs_.size());
|
||||
|
||||
++active_;
|
||||
}
|
||||
|
||||
// unlock and do processing; will relock on block exit, then call listener
|
||||
double scale = 1.0;
|
||||
rtengine::IImage8* img = 0;
|
||||
|
||||
if ( j.upgrade_ )
|
||||
{
|
||||
if ( j.thumbnail_->isQuick() )
|
||||
{
|
||||
img = j.thumbnail_->upgradeThumbImage(j.pparams_, j.height_, scale);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
img = j.thumbnail_->processThumbImage(j.pparams_, j.height_, scale);
|
||||
}
|
||||
|
||||
if (img)
|
||||
{
|
||||
DEBUG("pushing image %s",j.thumbnail_->getFileName().c_str());
|
||||
j.listener_->updateImage(img, scale, j.pparams_.crop);
|
||||
}
|
||||
|
||||
{
|
||||
Glib::Mutex::Lock lock(mutex_);
|
||||
|
||||
if ( --active_ == 0 &&
|
||||
inactive_waiting_ )
|
||||
{
|
||||
inactive_waiting_ = false;
|
||||
inactive_.signal();
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
ThumbImageUpdater*
|
||||
ThumbImageUpdater::getInstance(void)
|
||||
{
|
||||
// this will not be deleted...
|
||||
static ThumbImageUpdater* instance_ = 0;
|
||||
if ( instance_ == 0 )
|
||||
{
|
||||
instance_ = new ThumbImageUpdater();
|
||||
}
|
||||
return instance_;
|
||||
}
|
||||
|
||||
ThumbImageUpdater::ThumbImageUpdater():
|
||||
impl_(new Impl())
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
ThumbImageUpdater::add(Thumbnail* t, const rtengine::procparams::ProcParams& params,
|
||||
int height, bool* priority, bool upgrade, ThumbImageUpdateListener* l)
|
||||
{
|
||||
// nobody listening?
|
||||
if ( l == 0 )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Glib::Mutex::Lock lock(impl_->mutex_);
|
||||
|
||||
// look up if an older version is in the queue
|
||||
Impl::JobList::iterator i(impl_->jobs_.begin());
|
||||
for ( ; i != impl_->jobs_.end(); ++i )
|
||||
{
|
||||
if ( i->thumbnail_ == t &&
|
||||
i->listener_ == l &&
|
||||
i->upgrade_ == upgrade )
|
||||
{
|
||||
DEBUG("updating job %s",t->getFileName().c_str());
|
||||
// we have one, update queue entry, will be picked up by thread when processed
|
||||
i->pparams_ = params;
|
||||
i->height_ = height;
|
||||
i->priority_ = priority;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// create a new job and append to queue
|
||||
DEBUG("queing job %s",t->getFileName().c_str());
|
||||
impl_->jobs_.push_back(Impl::Job(t,params,height,priority,upgrade,l));
|
||||
|
||||
DEBUG("adding run request %s",t->getFileName().c_str());
|
||||
impl_->threadPool_->push(sigc::mem_fun(*impl_, &ThumbImageUpdater::Impl::processNextJob));
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
ThumbImageUpdater::removeJobs(ThumbImageUpdateListener* listener)
|
||||
{
|
||||
DEBUG("removeJobs(%p)",listener);
|
||||
|
||||
Glib::Mutex::Lock lock(impl_->mutex_);
|
||||
|
||||
for( Impl::JobList::iterator i(impl_->jobs_.begin()); i != impl_->jobs_.end(); )
|
||||
{
|
||||
if (i->listener_ == listener)
|
||||
{
|
||||
DEBUG("erasing specific job");
|
||||
Impl::JobList::iterator e(i++);
|
||||
impl_->jobs_.erase(e);
|
||||
}
|
||||
else
|
||||
{
|
||||
++i;
|
||||
}
|
||||
}
|
||||
|
||||
while ( impl_->active_ != 0 )
|
||||
{
|
||||
// XXX this is nasty... it would be nicer if we weren't called with
|
||||
// this lock held
|
||||
GThreadUnLock unlock;
|
||||
DEBUG("waiting for running jobs1");
|
||||
impl_->inactive_waiting_ = true;
|
||||
impl_->inactive_.wait(impl_->mutex_);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
ThumbImageUpdater::removeAllJobs(void)
|
||||
{
|
||||
DEBUG("stop");
|
||||
|
||||
|
||||
Glib::Mutex::Lock lock(impl_->mutex_);
|
||||
|
||||
impl_->jobs_.clear();
|
||||
|
||||
while ( impl_->active_ != 0 )
|
||||
{
|
||||
// XXX this is nasty... it would be nicer if we weren't called with
|
||||
// this lock held
|
||||
GThreadUnLock unlock;
|
||||
DEBUG("waiting for running jobs2");
|
||||
impl_->inactive_waiting_ = true;
|
||||
impl_->inactive_.wait(impl_->mutex_);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user