From 308cf01bf7ba51af4b09a06d8483c78a1eecb7f6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Jul 2013 18:58:49 +0100 Subject: Fix a few warnings. --- src/lib/writer.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/lib') diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 6601fb2fe..a9c920c81 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -358,15 +358,19 @@ Writer::check_existing_picture_mxf () /* Read the data from the MXF and hash it */ fseek (mxf, info.offset, SEEK_SET); EncodedData data (info.size); - fread (data.data(), 1, data.size(), mxf); - string const existing_hash = md5_digest (data.data(), data.size()); + size_t const read = fread (data.data(), 1, data.size(), mxf); + if (read != static_cast (data.size ())) { + _film->log()->log (String::compose ("Existing frame %1 is incomplete", _first_nonexistant_frame)); + break; + } + string const existing_hash = md5_digest (data.data(), data.size()); if (existing_hash != info.hash) { - _film->log()->log (String::compose (N_("Existing frame %1 failed hash check"), _first_nonexistant_frame)); + _film->log()->log (String::compose ("Existing frame %1 failed hash check", _first_nonexistant_frame)); break; } - _film->log()->log (String::compose (N_("Have existing frame %1"), _first_nonexistant_frame)); + _film->log()->log (String::compose ("Have existing frame %1", _first_nonexistant_frame)); ++_first_nonexistant_frame; } -- cgit v1.2.3 From e5da5518951e91f7bfb80718c9cf546e3ece059c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Jul 2013 00:14:38 +0100 Subject: Basics of making loop do something. --- src/lib/analyse_audio_job.cc | 4 +-- src/lib/content.cc | 16 ++++++++++ src/lib/content.h | 2 ++ src/lib/content_factory.cc | 44 ++++++++++++++++++++++++++++ src/lib/content_factory.h | 22 ++++++++++++++ src/lib/film.cc | 16 ++++++---- src/lib/film.h | 5 ++-- src/lib/player.cc | 4 +-- src/lib/playlist.cc | 50 ++++++++++++++++++++++--------- src/lib/playlist.h | 16 +++++----- src/lib/transcode_job.cc | 2 +- src/lib/writer.cc | 6 ++-- src/lib/wscript | 1 + src/wx/film_editor.cc | 10 +++---- src/wx/film_viewer.cc | 8 +++-- src/wx/properties_dialog.cc | 8 ++--- src/wx/timeline.cc | 70 ++++++++++++++++++++------------------------ 17 files changed, 197 insertions(+), 87 deletions(-) create mode 100644 src/lib/content_factory.cc create mode 100644 src/lib/content_factory.h (limited to 'src/lib') diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc index 2848c1ed7..9a9116690 100644 --- a/src/lib/analyse_audio_job.cc +++ b/src/lib/analyse_audio_job.cc @@ -68,14 +68,14 @@ AnalyseAudioJob::run () player->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1, _2)); - _samples_per_point = max (int64_t (1), _film->time_to_audio_frames (_film->length()) / _num_points); + _samples_per_point = max (int64_t (1), _film->time_to_audio_frames (_film->length_without_loop()) / _num_points); _current.resize (_film->dcp_audio_channels ()); _analysis.reset (new AudioAnalysis (_film->dcp_audio_channels ())); _done = 0; while (!player->pass ()) { - set_progress (double (_film->audio_frames_to_time (_done)) / _film->length ()); + set_progress (double (_film->audio_frames_to_time (_done)) / _film->length_without_loop ()); } _analysis->write (content->audio_analysis_path ()); diff --git a/src/lib/content.cc b/src/lib/content.cc index b49ea4316..531dbc38f 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -22,6 +22,7 @@ #include #include "content.h" #include "util.h" +#include "content_factory.h" using std::string; using std::set; @@ -90,3 +91,18 @@ Content::set_start (Time s) signal_changed (ContentProperty::START); } + +shared_ptr +Content::clone () const +{ + shared_ptr film = _film.lock (); + if (!film) { + return shared_ptr (); + } + + /* This is a bit naughty, but I can't think of a compelling reason not to do it ... */ + xmlpp::Document doc; + xmlpp::Node* node = doc.create_root_node ("Content"); + as_xml (node); + return content_factory (film, shared_ptr (new cxml::Node (node))); +} diff --git a/src/lib/content.h b/src/lib/content.h index a340fb1aa..26e115354 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -56,6 +56,8 @@ public: virtual void as_xml (xmlpp::Node *) const; virtual Time length () const = 0; + boost::shared_ptr clone () const; + boost::filesystem::path file () const { boost::mutex::scoped_lock lm (_mutex); return _file; diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc new file mode 100644 index 000000000..cf45b6aa6 --- /dev/null +++ b/src/lib/content_factory.cc @@ -0,0 +1,44 @@ +/* + Copyright (C) 2013 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include +#include "ffmpeg_content.h" +#include "imagemagick_content.h" +#include "sndfile_content.h" + +using std::string; +using boost::shared_ptr; + +shared_ptr +content_factory (shared_ptr film, shared_ptr node) +{ + string const type = node->string_child ("Type"); + + boost::shared_ptr content; + + if (type == "FFmpeg") { + content.reset (new FFmpegContent (film, node)); + } else if (type == "ImageMagick") { + content.reset (new ImageMagickContent (film, node)); + } else if (type == "Sndfile") { + content.reset (new SndfileContent (film, node)); + } + + return content; +} diff --git a/src/lib/content_factory.h b/src/lib/content_factory.h new file mode 100644 index 000000000..27cd36024 --- /dev/null +++ b/src/lib/content_factory.h @@ -0,0 +1,22 @@ +/* + Copyright (C) 2013 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +class Film; + +extern boost::shared_ptr content_factory (boost::shared_ptr, boost::shared_ptr); diff --git a/src/lib/film.cc b/src/lib/film.cc index b78622a90..2bb8b3155 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -246,7 +246,7 @@ Film::make_dcp () throw MissingSettingError (_("container")); } - if (_playlist->content().empty ()) { + if (content_without_loop().empty()) { throw StringError (_("You must add some content to the DCP before creating it")); } @@ -729,9 +729,9 @@ Film::playlist () const } Playlist::ContentList -Film::content () const +Film::content_without_loop () const { - return _playlist->content (); + return _playlist->content_without_loop (); } void @@ -769,9 +769,15 @@ Film::remove_content (shared_ptr c) } Time -Film::length () const +Film::length_with_loop () const { - return _playlist->length (); + return _playlist->length_with_loop (); +} + +Time +Film::length_without_loop () const +{ + return _playlist->length_without_loop (); } bool diff --git a/src/lib/film.h b/src/lib/film.h index bd9dcc88d..1f3899885 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -106,9 +106,10 @@ public: /* Proxies for some Playlist methods */ - Playlist::ContentList content () const; + Playlist::ContentList content_without_loop () const; - Time length () const; + Time length_with_loop () const; + Time length_without_loop () const; bool has_subtitles () const; OutputVideoFrame best_dcp_video_frame_rate () const; diff --git a/src/lib/player.cc b/src/lib/player.cc index 4ad930610..f5212f8d0 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -45,7 +45,7 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; -//#define DEBUG_PLAYER 1 +#define DEBUG_PLAYER 1 class Piece { @@ -401,7 +401,7 @@ Player::setup_pieces () _pieces.clear (); - Playlist::ContentList content = _playlist->content (); + Playlist::ContentList content = _playlist->content_with_loop (); sort (content.begin(), content.end(), ContentSorter ()); for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) { diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 8c4a7f7d7..172b6fbb9 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -28,6 +28,7 @@ #include "ffmpeg_content.h" #include "imagemagick_decoder.h" #include "imagemagick_content.h" +#include "content_factory.h" #include "job.h" #include "config.h" #include "util.h" @@ -119,19 +120,7 @@ Playlist::set_from_xml (shared_ptr film, shared_ptr > c = node->node_children ("Content"); for (list >::iterator i = c.begin(); i != c.end(); ++i) { - string const type = (*i)->string_child ("Type"); - - boost::shared_ptr content; - - if (type == "FFmpeg") { - content.reset (new FFmpegContent (film, *i)); - } else if (type == "ImageMagick") { - content.reset (new ImageMagickContent (film, *i)); - } else if (type == "Sndfile") { - content.reset (new SndfileContent (film, *i)); - } - - _content.push_back (content); + _content.push_back (content_factory (film, *i)); } reconnect (); @@ -257,7 +246,7 @@ Playlist::best_dcp_frame_rate () const } Time -Playlist::length () const +Playlist::length_without_loop () const { Time len = 0; for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { @@ -267,6 +256,12 @@ Playlist::length () const return len; } +Time +Playlist::length_with_loop () const +{ + return length_without_loop() * _loop; +} + void Playlist::reconnect () { @@ -305,3 +300,30 @@ ContentSorter::operator() (shared_ptr a, shared_ptr b) { return a->start() < b->start(); } + +/** @return content in an undefined order, not taking looping into account */ +Playlist::ContentList +Playlist::content_without_loop () const +{ + return _content; +} + +/** @return content in an undefined order, taking looping into account */ +Playlist::ContentList +Playlist::content_with_loop () const +{ + ContentList looped = _content; + Time const length = length_without_loop (); + + Time offset = length; + for (int i = 1; i < _loop; ++i) { + for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { + shared_ptr copy = (*i)->clone (); + copy->set_start (copy->start() + offset); + looped.push_back (copy); + } + offset += length; + } + + return looped; +} diff --git a/src/lib/playlist.h b/src/lib/playlist.h index a31b6826e..330681c56 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -41,10 +41,7 @@ class Region; * @brief A set of content files (video and audio), with knowledge of how they should be arranged into * a DCP. * - * This class holds Content objects, and it knows how they should be arranged. At the moment - * the ordering is implicit; video content is placed sequentially, and audio content is taken - * from the video unless any sound-only files are present. If sound-only files exist, they - * are played simultaneously (i.e. they can be split up into multiple files for different channels) + * This class holds Content objects, and it knows how they should be arranged. */ struct ContentSorter @@ -67,10 +64,9 @@ public: bool has_subtitles () const; typedef std::vector > ContentList; - - ContentList content () const { - return _content; - } + + ContentList content_without_loop () const; + ContentList content_with_loop () const; std::string video_identifier () const; @@ -80,7 +76,9 @@ public: void set_loop (int l); - Time length () const; + Time length_without_loop () const; + Time length_with_loop () const; + int best_dcp_frame_rate () const; Time video_end () const; diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 6d5edd7c0..f0faf7c63 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -111,6 +111,6 @@ TranscodeJob::remaining_time () const } /* Compute approximate proposed length here, as it's only here that we need it */ - OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out(); + OutputVideoFrame const left = _film->time_to_video_frames (_film->length_with_loop ()) - _transcoder->video_frames_out(); return left / fps; } diff --git a/src/lib/writer.cc b/src/lib/writer.cc index a9c920c81..b3d2fdb1c 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -204,8 +204,10 @@ try } lock.lock (); - if (_film->length ()) { - _job->set_progress (float(_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length())); + if (_film->length_with_loop()) { + _job->set_progress ( + float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length_with_loop()) + ); } ++_last_written_frame; diff --git a/src/lib/wscript b/src/lib/wscript index 0d3f2913c..2bedc1fce 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -10,6 +10,7 @@ sources = """ audio_mapping.cc config.cc content.cc + content_factory.cc cross.cc dci_metadata.cc dcp_content_type.cc diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 0b9f86988..427afb6e8 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -890,8 +890,8 @@ FilmEditor::set_film (shared_ptr f) film_changed (Film::DCP_VIDEO_FRAME_RATE); film_changed (Film::DCP_AUDIO_CHANNELS); - if (!_film->content().empty ()) { - set_selection (_film->content().front ()); + if (!_film->content_without_loop().empty ()) { + set_selection (_film->content_without_loop().front ()); } wxListEvent ev; @@ -1152,7 +1152,7 @@ FilmEditor::setup_content () _content->DeleteAllItems (); - Playlist::ContentList content = _film->content (); + Playlist::ContentList content = _film->content_without_loop (); for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) { int const t = _content->GetItemCount (); _content->InsertItem (t, std_to_wx ((*i)->summary ())); @@ -1260,7 +1260,7 @@ FilmEditor::selected_content () return shared_ptr (); } - Playlist::ContentList c = _film->content (); + Playlist::ContentList c = _film->content_without_loop (); if (s < 0 || size_t (s) >= c.size ()) { return shared_ptr (); } @@ -1510,7 +1510,7 @@ FilmEditor::length_changed () void FilmEditor::set_selection (weak_ptr wc) { - Playlist::ContentList content = _film->content (); + Playlist::ContentList content = _film->content_without_loop (); for (size_t i = 0; i < content.size(); ++i) { if (content[i] == wc.lock ()) { _content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 1fa7bdb91..d00a582e5 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -164,8 +164,10 @@ FilmViewer::timer (wxTimerEvent &) fetch_next_frame (); - if (_film->length()) { - int const new_slider_position = 4096 * _player->video_position() / _film->length(); + Time const len = _film->length_with_loop (); + + if (len) { + int const new_slider_position = 4096 * _player->video_position() / len; if (new_slider_position != _slider->GetValue()) { _slider->SetValue (new_slider_position); } @@ -211,7 +213,7 @@ void FilmViewer::slider_moved (wxScrollEvent &) { if (_film && _player) { - _player->seek (_slider->GetValue() * _film->length() / 4096, false); + _player->seek (_slider->GetValue() * _film->length_with_loop() / 4096, false); fetch_next_frame (); } } diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc index d525fe38b..b8d97cb59 100644 --- a/src/wx/properties_dialog.cc +++ b/src/wx/properties_dialog.cc @@ -50,8 +50,8 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr film) _encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this)); table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL); - _frames->SetLabel (std_to_wx (lexical_cast (_film->time_to_video_frames (_film->length())))); - double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length() / (TIME_HZ * 1073741824.0f); + _frames->SetLabel (std_to_wx (lexical_cast (_film->time_to_video_frames (_film->length_with_loop())))); + double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length_with_loop() / (TIME_HZ * 1073741824.0f); stringstream s; s << fixed << setprecision (1) << disk << wx_to_std (_("Gb")); _disk->SetLabel (std_to_wx (s.str ())); @@ -78,9 +78,9 @@ PropertiesDialog::frames_already_encoded () const return ""; } - if (_film->length()) { + if (_film->length_with_loop()) { /* XXX: encoded_frames() should check which frames have been encoded */ - u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length())) << "%)"; + u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length_with_loop())) << "%)"; } return u.str (); } diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index ff10b7d91..c50b89f6e 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -34,7 +34,7 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::bind; -class View +class View : public boost::noncopyable { public: View (Timeline& t) @@ -45,6 +45,7 @@ public: void paint (wxGraphicsContext* g) { + cout << "base paint " << this << "\n"; _last_paint_bbox = bbox (); do_paint (g); } @@ -86,15 +87,14 @@ public: dcpomatic::Rect bbox () const { shared_ptr film = _timeline.film (); - shared_ptr content = _content.lock (); - if (!film || !content) { + if (!film) { return dcpomatic::Rect (); } return dcpomatic::Rect ( - time_x (content->start ()) - 8, + time_x (_content->start ()) - 8, y_pos (_track) - 8, - content->length () * _timeline.pixels_per_time_unit() + 16, + _content->length () * _timeline.pixels_per_time_unit() + 16, _timeline.track_height() + 16 ); } @@ -108,7 +108,7 @@ public: return _selected; } - weak_ptr content () const { + shared_ptr content () const { return _content; } @@ -128,13 +128,12 @@ private: void do_paint (wxGraphicsContext* gc) { shared_ptr film = _timeline.film (); - shared_ptr content = _content.lock (); - if (!film || !content) { + if (!film) { return; } - Time const start = content->start (); - Time const len = content->length (); + Time const start = _content->start (); + Time const len = _content->length (); wxColour selected (colour().Red() / 2, colour().Green() / 2, colour().Blue() / 2); @@ -146,6 +145,8 @@ private: } else { gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxBRUSHSTYLE_SOLID)); } + + cout << "paint " << static_cast (this) << " " << _content.get() << " @ " << time_x (start) << "\n"; wxGraphicsPath path = gc->CreatePath (); path.MoveToPoint (time_x (start), y_pos (_track) + 4); @@ -156,7 +157,7 @@ private: gc->StrokePath (path); gc->FillPath (path); - wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (content->file().filename().string()).data(), type().data()); + wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (_content->file().filename().string()).data(), type().data()); wxDouble name_width; wxDouble name_height; wxDouble name_descent; @@ -180,7 +181,11 @@ private: } } - boost::weak_ptr _content; + /* This must be a shared_ptr, not a weak_ptr, as in the looped case this + will be the only remaining pointer to the looped content that we get + from the playlist. + */ + boost::shared_ptr _content; int _track; bool _selected; @@ -352,6 +357,7 @@ Timeline::paint (wxPaintEvent &) gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); + cout << "painting " << _views.size() << "\n"; for (list >::iterator i = _views.begin(); i != _views.end(); ++i) { (*i)->paint (gc); } @@ -367,9 +373,10 @@ Timeline::playlist_changed () return; } + cout << "clearing views.\n"; _views.clear (); - Playlist::ContentList content = fl->playlist()->content (); + Playlist::ContentList content = fl->playlist()->content_with_loop (); for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) { if (dynamic_pointer_cast (*i)) { @@ -401,8 +408,7 @@ Timeline::assign_tracks () continue; } - shared_ptr acv_content = acv->content().lock (); - assert (acv_content); + shared_ptr acv_content = acv->content(); int t = 1; while (1) { @@ -414,12 +420,11 @@ Timeline::assign_tracks () continue; } - shared_ptr test_content = test->content().lock (); - assert (test_content); + shared_ptr test_content = test->content(); if (test && test->track() == t) { - if ((acv_content->start() <= test_content->start() && test_content->start() <= acv_content->end()) || - (acv_content->start() <= test_content->end() && test_content->end() <= acv_content->end())) { + if ((acv_content->start() < test_content->start() && test_content->start() < acv_content->end()) || + (acv_content->start() < test_content->end() && test_content->end() < acv_content->end())) { /* we have an overlap on track `t' */ ++t; break; @@ -456,7 +461,7 @@ Timeline::setup_pixels_per_time_unit () return; } - _pixels_per_time_unit = static_cast(width() - x_offset() * 2) / film->length(); + _pixels_per_time_unit = static_cast(width() - x_offset() * 2) / film->length_with_loop(); } void @@ -474,9 +479,7 @@ Timeline::left_down (wxMouseEvent& ev) shared_ptr cv = dynamic_pointer_cast (*i); if (cv) { _down_view = cv; - shared_ptr c = cv->content().lock(); - assert (c); - _down_view_start = c->start (); + _down_view_start = cv->content()->start (); } } @@ -495,10 +498,7 @@ Timeline::left_down (wxMouseEvent& ev) _first_move = false; if (_down_view) { - shared_ptr c = _down_view->content().lock (); - if (c) { - c->set_change_signals_frequent (true); - } + _down_view->content()->set_change_signals_frequent (true); } } @@ -508,10 +508,7 @@ Timeline::left_up (wxMouseEvent& ev) _left_down = false; if (_down_view) { - shared_ptr c = _down_view->content().lock (); - if (c) { - c->set_change_signals_frequent (false); - } + _down_view->content()->set_change_signals_frequent (false); } set_start_from_event (ev); @@ -542,14 +539,11 @@ Timeline::set_start_from_event (wxMouseEvent& ev) Time const time_diff = (p.x - _down_point.x) / _pixels_per_time_unit; if (_down_view) { - shared_ptr c = _down_view->content().lock(); - if (c) { - c->set_start (max (static_cast