#include "subtitle.h"
#include "film.h"
#include "image.h"
-#include "log.h"
-#include "job.h"
+#include "ratio.h"
#include "i18n.h"
+using std::cout;
using boost::shared_ptr;
-using boost::optional;
VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
: Decoder (f)
- , _video_frame (0)
- , _last_source_time (0)
+ , _video_position (0)
{
}
-/** 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)
-{
- 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;
-}
-
-/** Called by subclasses to repeat the last video frame that we
- * passed to emit_video(). If emit_video hasn't yet been called,
- * we will generate a black frame.
- */
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(), true));
- _last_image->make_black ();
- }
-
- signal_video (_last_image, true, _last_subtitle);
+ Video (image, same, frame);
+ _video_position = frame + 1;
}
-/** Emit our signal to say that some video data is ready.
- * @param image Video frame.
- * @param same true if `image' is the same as the last one we emitted.
- * @param sub Subtitle for this frame, or 0.
- */
-void
-VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
-{
- TIMING (N_("Decoder emits %1"), _video_frame);
- Video (image, same, sub);
- ++_video_frame;
-
- _last_image = image;
- _last_subtitle = sub;
-}
+#if 0
-/** 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.
+/** 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_progress (Job* j) const
-{
- assert (j);
-
- if (_film->video_length()) {
- j->set_progress (float (_video_frame) / _film->video_length());
- }
-}