projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing include for older gcc.
[dcpomatic.git]
/
src
/
lib
/
video_decoder.cc
diff --git
a/src/lib/video_decoder.cc
b/src/lib/video_decoder.cc
index 4c05d5fcdf335e931414e72e569125b4ef535fe2..e0a7576eeaf5c51670cf1702c6b7b4597467db15 100644
(file)
--- a/
src/lib/video_decoder.cc
+++ b/
src/lib/video_decoder.cc
@@
-31,25
+31,26
@@
using boost::optional;
VideoDecoder::VideoDecoder (shared_ptr<Film> f, shared_ptr<const DecodeOptions> o, Job* j)
: Decoder (f, o, j)
, _video_frame (0)
VideoDecoder::VideoDecoder (shared_ptr<Film> f, shared_ptr<const DecodeOptions> o, Job* j)
: Decoder (f, o, j)
, _video_frame (0)
- , _last_source_
fra
me (0)
+ , _last_source_
ti
me (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 emit.
+ * @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,
SourceFrame f
)
+VideoDecoder::emit_video (shared_ptr<Image> image,
double t
)
{
shared_ptr<Subtitle> sub;
{
shared_ptr<Subtitle> sub;
- if (_timed_subtitle && _timed_subtitle->displayed_at (
f / _film->frames_per_second()
)) {
+ if (_timed_subtitle && _timed_subtitle->displayed_at (
t
)) {
sub = _timed_subtitle->subtitle ();
}
sub = _timed_subtitle->subtitle ();
}
- signal_video (image, sub);
- _last_source_
frame = f
;
+ signal_video (image,
false,
sub);
+ _last_source_
time = t
;
}
void
}
void
@@
-60,14
+61,14
@@
VideoDecoder::repeat_last_video ()
_last_image->make_black ();
}
_last_image->make_black ();
}
- signal_video (_last_image, _last_subtitle);
+ signal_video (_last_image,
true,
_last_subtitle);
}
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);
{
TIMING ("Decoder emits %1", _video_frame);
- Video (image, sub);
+ Video (image, s
ame, s
ub);
++_video_frame;
_last_image = image;
++_video_frame;
_last_image = image;