#include "subtitle.h"
#include "film.h"
#include "image.h"
-#include "log.h"
-#include "options.h"
-#include "job.h"
+#include "ratio.h"
-using boost::shared_ptr;
-using boost::optional;
-
-VideoDecoder::VideoDecoder (shared_ptr<Film> f, shared_ptr<const DecodeOptions> o, Job* j)
- : Decoder (f, o, j)
- , _video_frame (0)
- , _last_source_time (0)
-{
+#include "i18n.h"
-}
+using std::cout;
+using boost::shared_ptr;
-/** Called by subclasses to tell the world that some video data is ready.
- * We find a subtitle then emit it for listeners.
- * @param image frame to emit.
- * @param t Time of the frame within the source, in seconds.
- */
-void
-VideoDecoder::emit_video (shared_ptr<Image> image, double t)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
+ : Decoder (f)
+ , _video_position (0)
{
- shared_ptr<Subtitle> sub;
- if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
- sub = _timed_subtitle->subtitle ();
- }
- signal_video (image, sub);
- _last_source_time = t;
}
void
-VideoDecoder::repeat_last_video ()
+VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
{
- if (!_last_image) {
- _last_image.reset (new SimpleImage (pixel_format(), native_size(), false));
- _last_image->make_black ();
- }
-
- signal_video (_last_image, _last_subtitle);
+ Video (image, same, frame);
+ _video_position = frame + 1;
}
-void
-VideoDecoder::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;
-}
+#if 0
+/** Called by subclasses when a subtitle is ready.
+ * 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)
+VideoDecoder::subtitle (shared_ptr<TimedSubtitle> s)
{
_timed_subtitle = s;
if (_timed_subtitle) {
Position const p = _timed_subtitle->subtitle()->position ();
- _timed_subtitle->subtitle()->set_position (Position (p.x - _film->crop().left, p.y - _film->crop().top));
+ _timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top));
}
}
+#endif
-void
-VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
-{
- _subtitle_stream = s;
-}
-
-void
-VideoDecoder::set_progress () const
-{
- if (_job && _film->length()) {
- _job->set_progress (float (_video_frame) / _film->length().get());
- }
-}