X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexamine_content_job.cc;h=4b30c943136a522d3b2197794ca38ca5eb2b187d;hb=f20cd70a9afc28f785ef4a50c875ccf6c3729462;hp=eaf1033d9830d262192c08d12517b846d3a8e0fb;hpb=0813034d7193dc8869126d13a9d12d2c4d1e6c14;p=dcpomatic.git

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index eaf1033d9..4b30c9431 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -31,13 +31,15 @@
 #include "film.h"
 #include "video_decoder.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::vector;
 using std::pair;
 using boost::shared_ptr;
 
-ExamineContentJob::ExamineContentJob (shared_ptr<Film> f, shared_ptr<Job> req)
-	: Job (f, req)
+ExamineContentJob::ExamineContentJob (shared_ptr<Film> f)
+	: Job (f)
 {
 
 }
@@ -50,40 +52,58 @@ string
 ExamineContentJob::name () const
 {
 	if (_film->name().empty ()) {
-		return "Examine content";
+		return _("Examine content");
 	}
 	
-	return String::compose ("Examine content of %1", _film->name());
+	return String::compose (_("Examine content of %1"), _film->name());
 }
 
 void
 ExamineContentJob::run ()
 {
-	/* Decode the content to get an accurate length */
+	descend (0.5);
+	_film->set_content_digest (md5_digest (_film->content_path ()));
+	ascend ();
 
-	/* We don't want to use any existing length here, as progress
-	   will be messed up.
+	descend (0.5);
+
+	/* 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.
 	*/
-	_film->unset_length ();
-	_film->set_crop (Crop ());
+	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 ());
+		
+		DecodeOptions o;
+		o.decode_audio = false;
+		
+		Decoders decoders = decoder_factory (_film, o);
+		
+		set_progress_unknown ();
+		while (!decoders.video->pass()) {
+			/* keep going */
+		}
+		
+		_film->set_length (decoders.video->video_frame());
+		
+		_film->log()->log (String::compose (N_("Video length examined as %1 frames"), _film->length().get()));
+		
+	} else {
+
+		/* Get a quick decoder to get the content's length from its header */
+		
+		Decoders d = decoder_factory (_film, DecodeOptions());
+		_film->set_length (d.video->length());
 	
-	shared_ptr<Options> o (new Options ("", "", ""));
-	o->out_size = Size (512, 512);
-	o->decode_audio = false;
-
-	descend (1);
-
-	Decoders decoders = decoder_factory (_film, o, this);
-
-	set_progress_unknown ();
-	while (!decoders.video->pass()) {
-		/* keep going */
+		_film->log()->log (String::compose (N_("Video length obtained from header as %1 frames"), _film->length().get()));
 	}
 
-	_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);