#include "film.h"
#include "image.h"
#include "log.h"
-#include "options.h"
#include "job.h"
+#include "i18n.h"
+
+using std::cout;
using boost::shared_ptr;
using boost::optional;
-VideoDecoder::VideoDecoder (shared_ptr<Film> f, DecodeOptions o, Job* j)
- : Decoder (f, o, j)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
+ : Decoder (f)
, _video_frame (0)
- , _last_source_time (0)
+ , _last_content_time (0)
{
}
* @param t Time of the frame within the source, in seconds.
*/
void
-VideoDecoder::emit_video (shared_ptr<Image> image, double t)
+VideoDecoder::emit_video (shared_ptr<Image> image, bool same, double t)
{
shared_ptr<Subtitle> sub;
if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
sub = _timed_subtitle->subtitle ();
}
- signal_video (image, false, sub);
- _last_source_time = t;
-}
-
-void
-VideoDecoder::repeat_last_video ()
-{
- if (!_last_image) {
- _last_image.reset (new SimpleImage (pixel_format(), native_size(), true));
- _last_image->make_black ();
- }
-
- signal_video (_last_image, true, _last_subtitle);
-}
-
-void
-VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
-{
- TIMING ("Decoder emits %1", _video_frame);
- Video (image, same, sub);
+ TIMING (N_("Decoder emits %1"), _video_frame);
+ Video (image, same, sub, t);
++_video_frame;
- _last_image = image;
- _last_subtitle = sub;
+ _last_content_time = t;
}
+/** Set up the current subtitle. This will be put onto frames that
+ * fit within its time specification. s may be 0 to say that there
+ * is no current subtitle.
+ * @param s New current subtitle, or 0.
+ */
void
VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
{
}
void
-VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
+VideoDecoder::set_progress (Job* j) const
{
- _subtitle_stream = s;
-}
+ assert (j);
-void
-VideoDecoder::set_progress () const
-{
- if (_job && _film->length()) {
- _job->set_progress (float (_video_frame) / _film->length().get());
+ if (_film->video_length()) {
+ j->set_progress (float (_video_frame) / _film->video_length());
}
}