X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexamine_content_job.cc;h=dc2fc305cdd5618524371bf299affbd101ba0ee6;hb=1f2bc4d8f3601ad1e12b94f37b3889fcd003509b;hp=5800c6f24dd643e40d2bf4db26f426be08681e04;hpb=6b368187e7bc16cbe0e83858f35990e536c5ccc8;p=dcpomatic.git

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 5800c6f24..dc2fc305c 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -21,19 +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 "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,61 +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<FilmState> fs = _fs->state_copy ();
-	
 	/* 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);
+	/* 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;
 
-	_decoder = decoder_factory (fs, o, this, _log, true, true);
-	_decoder->go ();
-	fs->set_length (last_video_frame ());
+	descend (1);
 
-	ascend ();
+	Decoders decoders = decoder_factory (_film, o, this);
 
-	/* Now make thumbnails for it */
-
-	descend (0.5);
-
-	try {
-		o.reset (new Options (fs->dir ("thumbs"), ".png", ""));
-		o->out_size = fs->size ();
-		o->apply_crop = false;
-		o->decode_audio = false;
-		o->decode_video_frequency = 128;
-		o->decode_subtitles = true;
-		shared_ptr<ImageMagickEncoder> e (new ImageMagickEncoder (fs, o, _log));
-		Transcoder w (fs, o, this, _log, e);
-		w.go ();
-		set_progress (1);
-		set_state (FINISHED_OK);
-		
-	} catch (std::exception& e) {
-
-		ascend ();
-		set_progress (1);
-		set_error (e.what ());
-		set_state (FINISHED_ERROR);
-		
+	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 ();
-}