projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Runs.
[dcpomatic.git]
/
src
/
lib
/
video_decoder.cc
diff --git
a/src/lib/video_decoder.cc
b/src/lib/video_decoder.cc
index 23a69f9586c08a96a39f6e6aa792640f1792de0d..ca1e7ab568df884e6708a7da77d3dabcf9022211 100644
(file)
--- a/
src/lib/video_decoder.cc
+++ b/
src/lib/video_decoder.cc
@@
-25,74
+25,92
@@
#include "options.h"
#include "job.h"
#include "options.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, shared_ptr<const Options> o, Job* j
)
- : Decoder (f, o
, j
)
+VideoDecoder::VideoDecoder (shared_ptr<
const Film> f, shared_ptr<VideoContent> c, DecodeOptions o
)
+ : Decoder (f, o)
, _video_frame (0)
, _video_frame (0)
+ , _last_source_time (0)
{
}
/** Called by subclasses to tell the world that some video data is ready.
* We find a subtitle then emit it for listeners.
{
}
/** Called by subclasses to tell the world that some video data is ready.
* We find a subtitle then emit it for listeners.
- * @param frame to decode; caller manages memory.
+ * @param image frame to emit.
+ * @param t Time of the frame within the source, in seconds.
*/
void
*/
void
-VideoDecoder::emit_video (shared_ptr<Image> image)
+VideoDecoder::emit_video (shared_ptr<Image> image
, double t
)
{
shared_ptr<Subtitle> sub;
{
shared_ptr<Subtitle> sub;
- if (_timed_subtitle && _timed_subtitle->displayed_at (
double (video_frame()) / _film->frames_per_second()
)) {
+ if (_timed_subtitle && _timed_subtitle->displayed_at (
t
)) {
sub = _timed_subtitle->subtitle ();
}
sub = _timed_subtitle->subtitle ();
}
- signal_video (image, sub);
+ 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 ()
{
if (!_last_image) {
void
VideoDecoder::repeat_last_video ()
{
if (!_last_image) {
- _last_image.reset (new
CompactImage (pixel_format(), native_size()
));
+ _last_image.reset (new
SimpleImage (pixel_format(), native_size(), true
));
_last_image->make_black ();
}
_last_image->make_black ();
}
- signal_video (_last_image, _last_subtitle);
+ 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
void
-VideoDecoder::signal_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
+VideoDecoder::signal_video (shared_ptr<Image> image,
bool same,
shared_ptr<Subtitle> sub)
{
{
- TIMING (
"Decoder emits %1"
, _video_frame);
- Video (image, sub);
+ TIMING (
N_("Decoder emits %1")
, _video_frame);
+ Video (image, s
ame, s
ub);
++_video_frame;
_last_image = image;
_last_subtitle = sub;
}
++_video_frame;
_last_image = image;
_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)
{
_timed_subtitle = s;
void
VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
{
_timed_subtitle = s;
- if (_timed_subtitle
&& _opt->apply_crop
) {
+ 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));
}
}
void
Position const p = _timed_subtitle->subtitle()->position ();
_timed_subtitle->subtitle()->set_position (Position (p.x - _film->crop().left, p.y - _film->crop().top));
}
}
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->dcp_length()) {
- _job->set_progress (float (_video_frame) / _film->length().get());
+#if 0
+ XXX
+ if (_film->length()) {
+ j->set_progress (float (_video_frame) / _film->length().get());
}
}
+#endif
}
}