projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't bother decoding video frames when we're seeking around trying to find subtitles.
[dcpomatic.git]
/
src
/
lib
/
subtitle_decoder.cc
diff --git
a/src/lib/subtitle_decoder.cc
b/src/lib/subtitle_decoder.cc
index ac9a67e33f18405eb0704cc63c587f3fc866f379..edb291ab8dc65924c1f314a944fff21b0e1fd825 100644
(file)
--- a/
src/lib/subtitle_decoder.cc
+++ b/
src/lib/subtitle_decoder.cc
@@
-70,7
+70,7
@@
SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
* (a) give us what we want, or
* (b) hit the end of the decoder.
*/
* (a) give us what we want, or
* (b) hit the end of the decoder.
*/
- while (!pass() && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
+ while (!pass(
PASS_REASON_SUBTITLE
) && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
/* Now look for what we wanted in the data we have collected */
/* XXX: inefficient */
/* Now look for what we wanted in the data we have collected */
/* XXX: inefficient */
@@
-82,6
+82,8
@@
SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
}
}
}
}
+ /* XXX: should clear out _decoded_* at some point */
+
return out;
}
return out;
}