diff options
| -rw-r--r-- | src/lib/examine_content_job.cc | 5 | ||||
| -rw-r--r-- | src/lib/ffmpeg_examiner.cc | 5 | ||||
| -rw-r--r-- | src/lib/job.cc | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc index d12d736a7..b3cfbd097 100644 --- a/src/lib/examine_content_job.cc +++ b/src/lib/examine_content_job.cc @@ -20,16 +20,15 @@ #include "content.h" +#include "dcpomatic_log.h" #include "examine_content_job.h" #include "film.h" #include "log.h" #include <boost/filesystem.hpp> -#include <iostream> #include "i18n.h" -using std::cout; using std::shared_ptr; using std::string; using std::vector; @@ -69,7 +68,9 @@ ExamineContentJob::run() { int n = 0; for (auto c: _content) { + LOG_GENERAL("Examine {}", c->path(0).string()); c->examine(_film, shared_from_this(), _tolerant); + LOG_GENERAL("Examine {} finished", c->path(0).string()); set_progress(float(n) / _content.size()); ++n; } diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index d2e1c9d40..66d6c399e 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -63,6 +63,8 @@ static const int PULLDOWN_CHECK_FRAMES = 16; FFmpegExaminer::FFmpegExaminer(shared_ptr<const FFmpegContent> c, shared_ptr<Job> job) : FFmpeg(c) { + LOG_GENERAL_NC("Starting FFmpegExaminer constructor"); + _need_length = _format_context->duration == AV_NOPTS_VALUE; /* Find audio and subtitle streams */ @@ -116,6 +118,7 @@ FFmpegExaminer::FFmpegExaminer(shared_ptr<const FFmpegContent> c, shared_ptr<Job string temporal_reference; bool carry_on_video = has_video(); std::vector<bool> carry_on_audio(_audio_streams.size(), true); + LOG_GENERAL_NC("Looking for interesting things"); while (true) { auto packet = av_packet_alloc(); DCPOMATIC_ASSERT(packet); @@ -171,6 +174,7 @@ FFmpegExaminer::FFmpegExaminer(shared_ptr<const FFmpegContent> c, shared_ptr<Job } } } + LOG_GENERAL_NC("Looking for interesting things finished"); if (_video_stream) { auto context = _codec_context[_video_stream.get()]; @@ -212,6 +216,7 @@ FFmpegExaminer::FFmpegExaminer(shared_ptr<const FFmpegContent> c, shared_ptr<Job } check_for_duplicate_ids(); + LOG_GENERAL_NC("Ending FFmpegExaminer constructor"); } void diff --git a/src/lib/job.cc b/src/lib/job.cc index ab4f5c37a..369e3a7b6 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -105,6 +105,7 @@ void Job::run_wrapper() { start_of_thread(fmt::format("Job-{}", json_name())); + LOG_GENERAL("Job {} start", json_name()); try { @@ -308,6 +309,8 @@ Job::run_wrapper() set_progress(1); set_state(FINISHED_ERROR); } + + LOG_GENERAL("Job {} finished", json_name()); } |