Untested external audio support; AB transcodes still broken.

[dcpomatic.git] / src / lib / examine_content_job.cc

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 5800c6f24dd643e40d2bf4db26f426be08681e04..8db74801fdd634feed5e2a822c4d4f97691884b6 100644 (file)
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -21,19 +21,24 @@
  *  @brief A class to run through content at high speed to find its length.
  */
 
+#include <boost/filesystem.hpp>
 #include "examine_content_job.h"
 #include "options.h"
-#include "film_state.h"
 #include "decoder_factory.h"
 #include "decoder.h"
 #include "imagemagick_encoder.h"
 #include "transcoder.h"
+#include "log.h"
+#include "film.h"
+#include "video_decoder.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::vector;
+using std::pair;
+using boost::shared_ptr;
 
-ExamineContentJob::ExamineContentJob (shared_ptr<const FilmState> fs, Log* l, shared_ptr<Job> req)
-       : Job (fs, shared_ptr<Options> (), l, req)
+ExamineContentJob::ExamineContentJob (shared_ptr<Film> f, shared_ptr<Job> req)
+       : Job (f, req)
 {
 
 }
@@ -45,25 +50,40 @@ ExamineContentJob::~ExamineContentJob ()
 string
 ExamineContentJob::name () const
 {
-       return String::compose ("Examine content of %1", _fs->name());
+       if (_film->name().empty ()) {
+               return "Examine content";
+       }
+       
+       return String::compose ("Examine content of %1", _film->name());
 }
 
 void
 ExamineContentJob::run ()
 {
-       shared_ptr<FilmState> fs = _fs->state_copy ();
-       
        /* Decode the content to get an accurate length */
+
+       /* We don't want to use any existing length here, as progress
+          will be messed up.
+       */
+       _film->unset_length ();
        
        shared_ptr<Options> o (new Options ("", "", ""));
        o->out_size = Size (512, 512);
        o->apply_crop = false;
+       o->decode_audio = false;
 
        descend (0.5);
 
-       _decoder = decoder_factory (fs, o, this, _log, true, true);
-       _decoder->go ();
-       fs->set_length (last_video_frame ());
+       pair<shared_ptr<VideoDecoder>, shared_ptr<AudioDecoder> > decoders = decoder_factory (_film, o, this);
+
+       set_progress_unknown ();
+       while (!decoders.first->pass()) {
+               /* keep going */
+       }
+
+       _film->set_length (decoders.first->video_frame());
+
+       _film->log()->log (String::compose ("Video length is %1 frames", _film->length()));
 
        ascend ();
 
@@ -72,17 +92,19 @@ ExamineContentJob::run ()
        descend (0.5);
 
        try {
-               o.reset (new Options (fs->dir ("thumbs"), ".png", ""));
-               o->out_size = fs->size ();
+               o.reset (new Options (_film->dir ("thumbs"), ".png", ""));
+               o->out_size = _film->size ();
                o->apply_crop = false;
                o->decode_audio = false;
-               o->decode_video_frequency = 128;
+               if (_film->length() > 0) {
+                       o->decode_video_skip = _film->length().get() / 128;
+               } else {
+                       o->decode_video_skip = 0;
+               }
                o->decode_subtitles = true;
-               shared_ptr<ImageMagickEncoder> e (new ImageMagickEncoder (fs, o, _log));
-               Transcoder w (fs, o, this, _log, e);
+               shared_ptr<ImageMagickEncoder> e (new ImageMagickEncoder (_film, o));
+               Transcoder w (_film, o, this, e);
                w.go ();
-               set_progress (1);
-               set_state (FINISHED_OK);
                
        } catch (std::exception& e) {
 
@@ -90,16 +112,33 @@ ExamineContentJob::run ()
                set_progress (1);
                set_error (e.what ());
                set_state (FINISHED_ERROR);
+               return;
                
        }
 
+       string const tdir = _film->dir ("thumbs");
+       vector<SourceFrame> thumbs;
+
+       for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (tdir); i != boost::filesystem::directory_iterator(); ++i) {
+
+               /* Aah, the sweet smell of progress */
+#if BOOST_FILESYSTEM_VERSION == 3              
+               string const l = boost::filesystem::path(*i).leaf().generic_string();
+#else
+               string const l = i->leaf ();
+#endif
+               
+               size_t const d = l.find (".png");
+               size_t const t = l.find (".tmp");
+               if (d != string::npos && t == string::npos) {
+                       thumbs.push_back (atoi (l.substr (0, d).c_str()));
+               }
+       }
+
+       sort (thumbs.begin(), thumbs.end());
+       _film->set_thumbs (thumbs);     
+
        ascend ();
        set_progress (1);
        set_state (FINISHED_OK);
 }
-
-int
-ExamineContentJob::last_video_frame () const
-{
-       return _decoder->last_video_frame ();
-}