-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
#include "video_decoder.h"
-#include "subtitle.h"
-#include "film.h"
#include "image.h"
-#include "log.h"
-#include "job.h"
+#include "content_video.h"
#include "i18n.h"
using std::cout;
+using std::list;
using boost::shared_ptr;
using boost::optional;
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
- : Decoder (f)
- , _video_frame (0)
- , _last_content_time (0)
+VideoDecoder::VideoDecoder (shared_ptr<const VideoContent> c)
+ : _video_content (c)
{
}
-/** 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.
- */
-void
-VideoDecoder::emit_video (shared_ptr<Image> image, bool same, Time t)
+optional<ContentVideo>
+VideoDecoder::decoded_video (VideoFrame frame)
{
- shared_ptr<Subtitle> sub;
- if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
- sub = _timed_subtitle->subtitle ();
+ for (list<ContentVideo>::const_iterator i = _decoded_video.begin(); i != _decoded_video.end(); ++i) {
+ if (i->frame == frame) {
+ return *i;
+ }
}
- TIMING (N_("Decoder emits %1"), _video_frame);
- Video (image, same, sub, t);
- ++_video_frame;
+ return optional<ContentVideo> ();
+}
- _last_content_time = t;
+optional<ContentVideo>
+VideoDecoder::get_video (VideoFrame frame, bool accurate)
+{
+ if (_decoded_video.empty() || (frame < _decoded_video.front().frame || frame > (_decoded_video.back().frame + 1))) {
+ /* Either we have no decoded data, or what we do have is a long way from what we want: seek */
+ seek (ContentTime::from_frames (frame, _video_content->video_frame_rate()), accurate);
+ }
+
+ optional<ContentVideo> dec;
+
+ /* Now enough pass() calls will either:
+ * (a) give us what we want, or
+ * (b) hit the end of the decoder.
+ */
+ if (accurate) {
+ /* We are being accurate, so we want the right frame */
+ while (!decoded_video (frame) && !pass ()) {}
+ dec = decoded_video (frame);
+ } else {
+ /* Any frame will do: use the first one that comes out of pass() */
+ while (_decoded_video.empty() && !pass ()) {}
+ if (!_decoded_video.empty ()) {
+ dec = _decoded_video.front ();
+ }
+ }
+
+ /* Clean up decoded_video */
+ while (!_decoded_video.empty() && _decoded_video.front().frame < (frame - 1)) {
+ _decoded_video.pop_front ();
+ }
+
+ return dec;
}
-/** 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.
- */
+
+/** Called by subclasses when they have a video frame ready */
void
-VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
+VideoDecoder::video (shared_ptr<const Image> image, VideoFrame frame)
{
- _timed_subtitle = s;
+ /* Fill in gaps */
+ /* XXX: 3D */
+ while (!_decoded_video.empty () && (_decoded_video.back().frame + 1) < frame) {
+ _decoded_video.push_back (
+ ContentVideo (
+ _decoded_video.back().image,
+ _decoded_video.back().eyes,
+ _decoded_video.back().frame + 1
+ )
+ );
+ }
- 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));
+ switch (_video_content->video_frame_type ()) {
+ case VIDEO_FRAME_TYPE_2D:
+ _decoded_video.push_back (ContentVideo (image, EYES_BOTH, frame));
+ break;
+ case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+ _decoded_video.push_back (ContentVideo (image, (frame % 2) ? EYES_RIGHT : EYES_LEFT, frame));
+ break;
+ case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+ {
+ int const half = image->size().width / 2;
+ _decoded_video.push_back (ContentVideo (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, frame));
+ _decoded_video.push_back (ContentVideo (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, frame));
+ break;
+ }
+ case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+ {
+ int const half = image->size().height / 2;
+ _decoded_video.push_back (ContentVideo (image->crop (Crop (0, 0, 0, half), true), EYES_LEFT, frame));
+ _decoded_video.push_back (ContentVideo (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, frame));
+ break;
+ }
+ case VIDEO_FRAME_TYPE_3D_LEFT:
+ _decoded_video.push_back (ContentVideo (image, EYES_LEFT, frame));
+ break;
+ case VIDEO_FRAME_TYPE_3D_RIGHT:
+ _decoded_video.push_back (ContentVideo (image, EYES_RIGHT, frame));
+ break;
+ default:
+ assert (false);
}
}
void
-VideoDecoder::set_progress (Job* j) const
+VideoDecoder::seek (ContentTime, bool)
{
- assert (j);
-
- if (_film->length()) {
- j->set_progress (float (_video_frame) / _film->time_to_video_frames (_film->length()));
- }
+ _decoded_video.clear ();
}
+
projects / dcpomatic.git / blobdiff