projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various bits.
[dcpomatic.git]
/
src
/
lib
/
video_decoder.cc
diff --git
a/src/lib/video_decoder.cc
b/src/lib/video_decoder.cc
index 3a803a86339a9fdf955bc59bdcb6c45cca8d05ca..32b06085f21b741e060111cb0bd913fcfcf51d93 100644
(file)
--- a/
src/lib/video_decoder.cc
+++ b/
src/lib/video_decoder.cc
@@
-22,14
+22,15
@@
#include "film.h"
#include "image.h"
#include "log.h"
#include "film.h"
#include "image.h"
#include "log.h"
-#include "options.h"
#include "job.h"
#include "job.h"
+#include "i18n.h"
+
using boost::shared_ptr;
using boost::optional;
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)
{
, _video_frame (0)
, _last_source_time (0)
{
@@
-53,21
+54,30
@@
VideoDecoder::emit_video (shared_ptr<Image> image, double t)
_last_source_time = t;
}
_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 ()
{
if (!_last_image) {
void
VideoDecoder::repeat_last_video ()
{
if (!_last_image) {
- _last_image.reset (new SimpleImage (pixel_format(), native_size(),
fals
e));
+ _last_image.reset (new SimpleImage (pixel_format(), native_size(),
tru
e));
_last_image->make_black ();
}
signal_video (_last_image, true, _last_subtitle);
}
_last_image->make_black ();
}
signal_video (_last_image, true, _last_subtitle);
}
+/** 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)
{
void
VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
{
- TIMING (
"Decoder emits %1"
, _video_frame);
+ TIMING (
N_("Decoder emits %1")
, _video_frame);
Video (image, same, sub);
++_video_frame;
Video (image, same, sub);
++_video_frame;
@@
-75,6
+85,11
@@
VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subti
_last_subtitle = sub;
}
_last_subtitle = sub;
}
+/** 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::emit_subtitle (shared_ptr<TimedSubtitle> s)
{
@@
-87,15
+102,11
@@
VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
}
void
}
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());
}
}
}
}