Split Options into encode / decode.

[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 e71ab361aecf623090012aabc5969e1fedebdb5f..dc2fc305cdd5618524371bf299affbd101ba0ee6 100644 (file)
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -26,13 +26,14 @@
 #include "options.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 std::string;
 using std::vector;
+using std::pair;
 using boost::shared_ptr;
 
 ExamineContentJob::ExamineContentJob (shared_ptr<Film> f, shared_ptr<Job> req)
@@ -59,72 +60,28 @@ void
 ExamineContentJob::run ()
 {
        /* Decode the content to get an accurate length */
-       
-       shared_ptr<Options> o (new Options ("", "", ""));
-       o->out_size = Size (512, 512);
-       o->apply_crop = false;
-
-       descend (0.5);
-
-       _decoder = decoder_factory (_film, o, this);
-       _decoder->go ();
 
-       _film->set_length (_decoder->video_frame_index());
+       /* We don't want to use any existing length here, as progress
+          will be messed up.
+       */
+       _film->unset_length ();
+       _film->set_crop (Crop ());
+       
+       shared_ptr<DecodeOptions> o (new DecodeOptions);
+       o->decode_audio = false;
 
-       _film->log()->log (String::compose ("Video length is %1 frames", _decoder->video_frame_index()));
+       descend (1);
 
-       ascend ();
+       Decoders decoders = decoder_factory (_film, o, this);
 
-       /* Now make thumbnails for it */
-
-       descend (0.5);
-
-       try {
-               o.reset (new Options (_film->dir ("thumbs"), ".png", ""));
-               o->out_size = _film->size ();
-               o->apply_crop = false;
-               o->decode_audio = false;
-               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 (_film, o));
-               Transcoder w (_film, o, this, e);
-               w.go ();
-               
-       } catch (std::exception& e) {
-
-               ascend ();
-               set_progress (1);
-               set_error (e.what ());
-               set_state (FINISHED_ERROR);
-               return;
-               
+       set_progress_unknown ();
+       while (!decoders.video->pass()) {
+               /* keep going */
        }
 
-       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()));
-               }
-       }
+       _film->set_length (decoders.video->video_frame());
 
-       sort (thumbs.begin(), thumbs.end());
-       _film->set_thumbs (thumbs);     
+       _film->log()->log (String::compose ("Video length is %1 frames", _film->length()));
 
        ascend ();
        set_progress (1);