[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdemultimedia/mplayerthumbs/src
From:       Marco Gulino <marco.gulino () gmail ! com>
Date:       2009-08-30 22:09:57
Message-ID: 1251670197.820992.9365.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1017563 by gulino:

Backport commit 1017562


 M  +6 -2      mplayervideobackend.cpp  
 M  +7 -4      servicesfactory.cpp  


--- branches/KDE/4.3/kdemultimedia/mplayerthumbs/src/mplayervideobackend.cpp \
#1017562:1017563 @@ -121,8 +121,12 @@
     KMD5 md5builder(previewingFile->getFilePath().toLatin1() );
     QString md5file=md5builder.hexDigest().data();
     QString tmpDirPath = tmpdir->name() + md5file + QDir::separator();
-    args << "-nocache" << "-idx" /*@TODO check if it's too slow..*/ << "-ao" << \
                "null"/*"-nosound" << */<< "-speed" << "99"  /*<< "-sstep" << "5"*/
-            << "-vo" << QString("jpeg:outdir=%1").arg(tmpDirPath ) << "-vf" << \
QString("scale=%1:%2").arg(scalingWidth).arg(scalingHeight); +    args << "-nocache" 
+    // << "-idx" /*@TODO check if it's too slow..*/ Update: probably yes...
+    << "-ao" << "null"/*"-nosound" << */<< "-speed" << "99"  /*<< "-sstep" << "5"*/
+            << "-vo" << QString("jpeg:outdir=%1").arg(tmpDirPath ) 
+//  << "-vf" << QString("scale=%1:%2").arg(scalingWidth).arg(scalingHeight) // This \
is probably just a waste of resources, as KDE API suggests to not scale the image. +  \
;  args+=customargs;
 
     if (! startAndWaitProcess(args) ) return NULL;
--- branches/KDE/4.3/kdemultimedia/mplayerthumbs/src/servicesfactory.cpp \
#1017562:1017563 @@ -37,16 +37,19 @@
 VideoBackendIFace *ServicesFactory::videoBackend(PreviewingFile* previewingFile, \
MPlayerThumbsCfg* cfg) {  kDebug(DBG_AREA) << "videopreview: backend: " << \
cfg->backend() << endl;  switch(cfg->backend() ) {
-    case VideoBackendIFace::MPlayer:
-      kDebug(DBG_AREA) << "videopreview: Selected mplayer backend\n";
-      return new MPlayerVideoBackend(previewingFile, cfg);
-	  break;
 #ifdef PHONON_API
     case VideoBackendIFace::Phonon:
       kDebug(DBG_AREA) << "videopreview: Selected phonon backend\n";
       return new PhononBackend(previewingFile, cfg);
 	  break;
+    case VideoBackendIFace::MPlayer:
+#else
+    #warning using mplayer as only backend
+    default:
 #endif
+      kDebug(DBG_AREA) << "videopreview: Selected mplayer backend\n";
+      return new MPlayerVideoBackend(previewingFile, cfg);
+      break;
   }
   // Well, we should never be here...
   return NULL;


[prev in list] [next in list] [prev in thread] [next in thread]