Mostly-merge master.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 97f1bc92f5197d1f6472779996f0d37b1bb03159..0901f73b020027cc733ab325c2085f494db65d45 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -21,152 +21,56 @@
  *  @brief Parent class for decoders of content.
  */
 
-#include <iostream>
-#include <stdint.h>
-#include <boost/lexical_cast.hpp>
-#include "film.h"
-#include "format.h"
-#include "job.h"
-#include "options.h"
-#include "exceptions.h"
-#include "image.h"
-#include "util.h"
-#include "log.h"
 #include "decoder.h"
-#include "delay_line.h"
-#include "subtitle.h"
-#include "filter_graph.h"
-
-using std::string;
-using std::stringstream;
-using std::min;
-using std::pair;
-using std::list;
-using boost::shared_ptr;
-using boost::optional;
+#include "decoded.h"
 
-/** @param f Film.
- *  @param o 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)
-       : _film (f)
-       , _opt (o)
-       , _job (j)
-       , _video_frame (0)
-{
-       
-}
+#include "i18n.h"
 
-/** 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());
-               }
-       }
-}
+using std::cout;
+using boost::shared_ptr;
 
-/** Called to tell the world that some audio data is ready
- *  @param audio Audio data.
+/** @param o Decode options.
  */
-void
-Decoder::process_audio (shared_ptr<AudioBuffers> audio)
+Decoder::Decoder ()
+       : _done (false)
 {
-       /* Maybe apply gain */
-       if (_film->audio_gain() != 0) {
-               float const linear_gain = pow (10, _film->audio_gain() / 20);
-               for (int i = 0; i < audio->channels(); ++i) {
-                       for (int j = 0; j < audio->frames(); ++j) {
-                               audio->data(i)[j] *= linear_gain;
-                       }
-               }
-       }
 
-       Audio (audio);
 }
 
-/** Called by subclasses to tell the world that some video data is ready.
- *  We do some post-processing / filtering then emit it for listeners.
- *  @param frame to decode; caller manages memory.
- */
-void
-Decoder::process_video (AVFrame* frame)
+struct DecodedSorter
 {
-       shared_ptr<FilterGraph> graph;
-
-       list<shared_ptr<FilterGraph> >::iterator i = _filter_graphs.begin();
-       while (i != _filter_graphs.end() && !(*i)->can_process (Size (frame->width, frame->height), (AVPixelFormat) frame->format)) {
-               ++i;
+       bool operator() (shared_ptr<Decoded> a, shared_ptr<Decoded> b)
+       {
+               return a->dcp_time < b->dcp_time;
        }
+};
 
-       if (i == _filter_graphs.end ()) {
-               graph.reset (new FilterGraph (_film, this, _opt->apply_crop, Size (frame->width, frame->height), (AVPixelFormat) frame->format));
-               _filter_graphs.push_back (graph);
-               _film->log()->log (String::compose ("New graph for %1x%2, pixel format %3", frame->width, frame->height, frame->format));
-       } else {
-               graph = *i;
-       }
-
-       list<shared_ptr<Image> > images = graph->process (frame);
-
-       for (list<shared_ptr<Image> >::iterator i = images.begin(); i != images.end(); ++i) {
-               shared_ptr<Subtitle> sub;
-               if (_timed_subtitle && _timed_subtitle->displayed_at (double (video_frame()) / _film->frames_per_second())) {
-                       sub = _timed_subtitle->subtitle ();
-               }
-
-               emit_video (*i, sub);
-       }
-}
-
-void
-Decoder::repeat_last_video ()
+shared_ptr<Decoded>
+Decoder::peek ()
 {
-       if (!_last_image) {
-               _last_image.reset (new CompactImage (pixel_format(), native_size()));
-               _last_image->make_black ();
+       while (!_done && _pending.empty ()) {
+               _done = pass ();
        }
 
-       emit_video (_last_image, _last_subtitle);
-}
-
-void
-Decoder::emit_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
-{
-       TIMING ("Decoder emits %1", _video_frame);
-       Video (image, sub);
-       ++_video_frame;
+       if (_done && _pending.empty ()) {
+               return shared_ptr<Decoded> ();
+       }
 
-       _last_image = image;
-       _last_subtitle = sub;
+       _pending.sort (DecodedSorter ());
+       return _pending.front ();
 }
 
 void
-Decoder::process_subtitle (shared_ptr<TimedSubtitle> s)
+Decoder::consume ()
 {
-       _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));
+       if (!_pending.empty ()) {
+               _pending.pop_front ();
        }
 }
 
 void
-Decoder::set_audio_stream (optional<AudioStream> s)
-{
-       _audio_stream = s;
-}
-
-void
-Decoder::set_subtitle_stream (optional<SubtitleStream> s)
+Decoder::seek (ContentTime, bool)
 {
-       _subtitle_stream = s;
+       _pending.clear ();
+       _done = false;
 }