diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-21 22:25:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-21 22:25:09 +0100 |
| commit | 02e4022f540915f8a38f9ab9576ac896fe39a1ab (patch) | |
| tree | 2301065f001f992c0c02f61fe2d2a321a0d5f7ce /src/lib/ffmpeg_content.cc | |
| parent | 237a0052c60af768f4d62b00321932918b7ba4d9 (diff) | |
Vaguely working new layout.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index fcc775f0a..2a4283353 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -112,26 +112,17 @@ FFmpegContent::as_xml (xmlpp::Node* node) const } void -FFmpegContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick) +FFmpegContent::examine (shared_ptr<Film> film, shared_ptr<Job> job) { job->set_progress_unknown (); - Content::examine (film, job, quick); + Content::examine (film, job); shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, shared_from_this (), true, false, false)); ContentVideoFrame video_length = 0; - if (quick) { - video_length = decoder->video_length (); - film->log()->log (String::compose ("Video length obtained from header as %1 frames", decoder->video_length ())); - } else { - while (!decoder->pass ()) { - /* keep going */ - } - - video_length = decoder->video_frame (); - film->log()->log (String::compose ("Video length examined as %1 frames", decoder->video_frame ())); - } + video_length = decoder->video_length (); + film->log()->log (String::compose ("Video length obtained from header as %1 frames", decoder->video_length ())); { boost::mutex::scoped_lock lm (_mutex); @@ -332,7 +323,6 @@ FFmpegContent::audio_mapping () const return AudioMapping (); } - cout << "returning am from stream " << _audio_stream.get() << ".\n"; return _audio_stream->mapping; } |