projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested merge of master.
[dcpomatic.git]
/
src
/
lib
/
video_decoder.cc
diff --git
a/src/lib/video_decoder.cc
b/src/lib/video_decoder.cc
index 9c0d2bbe3a610e44d51e6cf608454bd20f53e25e..fd82384416b6166a461b0f9d9d43e1430ae2695b 100644
(file)
--- a/
src/lib/video_decoder.cc
+++ b/
src/lib/video_decoder.cc
@@
-22,7
+22,6
@@
#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 "i18n.h"
#include "job.h"
#include "i18n.h"
@@
-31,10
+30,10
@@
using std::cout;
using boost::shared_ptr;
using boost::optional;
using boost::shared_ptr;
using boost::optional;
-VideoDecoder::VideoDecoder (shared_ptr<
Film> f, DecodeOptions o
)
- : Decoder (f
, o
)
+VideoDecoder::VideoDecoder (shared_ptr<
const Film> f
)
+ : Decoder (f)
, _video_frame (0)
, _video_frame (0)
- , _last_
source
_time (0)
+ , _last_
content
_time (0)
{
}
{
}
@@
-45,17
+44,18
@@
VideoDecoder::VideoDecoder (shared_ptr<Film> f, DecodeOptions o)
* @param t Time of the frame within the source, in seconds.
*/
void
* @param t Time of the frame within the source, in seconds.
*/
void
-VideoDecoder::emit_video (shared_ptr<Image> image, double t)
+VideoDecoder::emit_video (shared_ptr<Image> image,
bool same,
double t)
{
shared_ptr<Subtitle> sub;
if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
sub = _timed_subtitle->subtitle ();
}
{
shared_ptr<Subtitle> sub;
if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
sub = _timed_subtitle->subtitle ();
}
- Video (image, false, sub, t);
+ TIMING (N_("Decoder emits %1"), _video_frame);
+ Video (image, same, sub, t);
++_video_frame;
++_video_frame;
-
- _last_
source
_time = t;
+
+ _last_
content
_time = t;
}
/** Set up the current subtitle. This will be put onto frames that
}
/** Set up the current subtitle. This will be put onto frames that
@@
-74,21
+74,12
@@
VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
}
}
}
}
-/** Set which stream of subtitles we should use from our source.
- * @param s Stream to use.
- */
-void
-VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
-{
- _subtitle_stream = s;
-}
-
void
VideoDecoder::set_progress (Job* j) const
{
assert (j);
void
VideoDecoder::set_progress (Job* j) const
{
assert (j);
-
- if (_film->length()) {
- j->set_progress (float (_video_frame) / _film->
length().get
());
+
+ if (_film->
video_
length()) {
+ j->set_progress (float (_video_frame) / _film->
video_length
());
}
}
}
}