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 d77ede2f91abf1d1c0d0d9348ed19247429a3272..dc2fc305cdd5618524371bf299affbd101ba0ee6 100644 (file)
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -21,17 +21,23 @@
  *  @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 "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)
-       : Job (fs, shared_ptr<Options> (), l)
+ExamineContentJob::ExamineContentJob (shared_ptr<Film> f, shared_ptr<Job> req)
+       : Job (f, req)
 {
 
 }
@@ -43,25 +49,41 @@ 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<Options> o (new Options ("", "", ""));
-       o->out_size = Size (512, 512);
-       o->apply_crop = false;
+       /* Decode the content to get an accurate length */
 
-       _decoder = decoder_factory (_fs, o, this, _log, true, true);
-       _decoder->go ();
+       /* 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;
+
+       descend (1);
+
+       Decoders decoders = decoder_factory (_film, o, this);
+
+       set_progress_unknown ();
+       while (!decoders.video->pass()) {
+               /* keep going */
+       }
+
+       _film->set_length (decoders.video->video_frame());
+
+       _film->log()->log (String::compose ("Video length is %1 frames", _film->length()));
+
+       ascend ();
        set_progress (1);
        set_state (FINISHED_OK);
 }
-
-int
-ExamineContentJob::last_video_frame () const
-{
-       return _decoder->last_video_frame ();
-}