X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexamine_content_job.cc;h=a783cde339f646a009d7b4c3da9eea617ace0b16;hb=6a8f6bb77ab0a0e0b44bf3bd1cadbe7d55b1b632;hp=36b4cbabc95f453e52656dc7a62c7071e42d449b;hpb=d382f34db155ddaf4bb61538c18b87c7564e00b2;p=dcpomatic.git

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 36b4cbabc..a783cde33 100644
--- 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, shared_ptr<Job> req)
-	: Job (fs, shared_ptr<Options> (), l, req)
+ExamineContentJob::ExamineContentJob (shared_ptr<Film> f, shared_ptr<Job> req)
+	: Job (f, req)
 {
 
 }
@@ -43,25 +49,61 @@ 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;
+	descend (0.5);
+	_film->set_content_digest (md5_digest (_film->content_path ()));
+	ascend ();
+
+	descend (0.5);
 
-	_decoder = decoder_factory (_fs, o, this, _log, true, true);
-	_decoder->go ();
+	/* Set the film's length to either
+	   a) a length judged by running through the content or
+	   b) the length from a decoder's header.
+	*/
+	if (!_film->trust_content_header()) {
+		/* 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 ();
+		_film->set_crop (Crop ());
+		
+		shared_ptr<DecodeOptions> o (new DecodeOptions);
+		o->decode_audio = false;
+		
+		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 examined as %1 frames", _film->length().get()));
+		
+	} else {
+
+		/* Get a quick decoder to get the content's length from its header */
+		
+		shared_ptr<DecodeOptions> o (new DecodeOptions);
+		Decoders d = decoder_factory (_film, o, 0);
+		_film->set_length (d.video->length());
 	
+		_film->log()->log (String::compose ("Video length obtained from header as %1 frames", _film->length().get()));
+	}
+
+	ascend ();
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
-
-int
-ExamineContentJob::last_video_frame () const
-{
-	return _decoder->last_video_frame ();
-}