Merge.

[dcpomatic.git] / src / lib / decoder.cc

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 8d087b6ee00c338413948d5f6b499d132a15775e..fd0abee4183e540b4a4db5c5a9cb3588e5d8a34c 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -46,89 +46,31 @@ using boost::shared_ptr;
 using boost::optional;
 
 /** @param f Film.
- *  @param o Options.
+ *  @param o Decode options.
  *  @param j Job that we are running within, or 0
  */
-Decoder::Decoder (boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j)
+Decoder::Decoder (boost::shared_ptr<Film> f, DecodeOptions o, Job* j)
        : _film (f)
        , _opt (o)
        , _job (j)
-       , _video_frame (0)
 {
-       
+       _film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
 }
 
-/** Start decoding */
-void
-Decoder::go ()
-{
-       if (_job && !_film->dcp_length()) {
-               _job->set_progress_unknown ();
-       }
-
-       while (pass () == false) {
-               if (_job && _film->dcp_length()) {
-                       _job->set_progress (float (_video_frame) / _film->length().get());
-               }
-       }
-}
-
-/** Called by subclasses to tell the world that some video data is ready.
- *  We find a subtitle then emit it for listeners.
- *  @param frame to decode; caller manages memory.
+/** Seek to a position as a source timestamp in seconds.
+ *  @return true on error.
  */
-void
-Decoder::emit_video (shared_ptr<Image> image)
-{
-       shared_ptr<Subtitle> sub;
-       if (_timed_subtitle && _timed_subtitle->displayed_at (double (video_frame()) / _film->frames_per_second())) {
-               sub = _timed_subtitle->subtitle ();
-       }
-
-       signal_video (image, sub);
-}
-
-void
-Decoder::repeat_last_video ()
-{
-       if (!_last_image) {
-               _last_image.reset (new CompactImage (pixel_format(), native_size()));
-               _last_image->make_black ();
-       }
-
-       signal_video (_last_image, _last_subtitle);
-}
-
-void
-Decoder::signal_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
-{
-       TIMING ("Decoder emits %1", _video_frame);
-       Video (image, sub);
-       ++_video_frame;
-
-       _last_image = image;
-       _last_subtitle = sub;
-}
-
-void
-Decoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
+bool
+Decoder::seek (double)
 {
-       _timed_subtitle = s;
-       
-       if (_timed_subtitle && _opt->apply_crop) {
-               Position const p = _timed_subtitle->subtitle()->position ();
-               _timed_subtitle->subtitle()->set_position (Position (p.x - _film->crop().left, p.y - _film->crop().top));
-       }
+       throw DecodeError ("decoder does not support seek");
 }
 
-void
-Decoder::set_audio_stream (optional<AudioStream> s)
-{
-       _audio_stream = s;
-}
-
-void
-Decoder::set_subtitle_stream (optional<SubtitleStream> s)
+/** Seek so that the next frame we will produce is the same as the last one.
+ *  @return true on error.
+ */
+bool
+Decoder::seek_to_last ()
 {
-       _subtitle_stream = s;
+       throw DecodeError ("decoder does not support seek");
 }