projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract common code out into kdm_for_screen()
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.h
diff --git
a/src/lib/ffmpeg_decoder.h
b/src/lib/ffmpeg_decoder.h
index 3a38f4475333d3f3871e057fb376c56ff3ca2122..65f36a00461b9115ca67fea8e7ee60c60a944ef8 100644
(file)
--- a/
src/lib/ffmpeg_decoder.h
+++ b/
src/lib/ffmpeg_decoder.h
@@
-45,10
+45,10
@@
struct ffmpeg_pts_offset_test;
class FFmpegDecoder : public FFmpeg, public Decoder
{
public:
class FFmpegDecoder : public FFmpeg, public Decoder
{
public:
- FFmpegDecoder (boost::shared_ptr<const F
FmpegContent>, boost::shared_ptr<Log> log
, bool fast);
+ FFmpegDecoder (boost::shared_ptr<const F
ilm> film, boost::shared_ptr<const FFmpegContent>
, bool fast);
bool pass ();
bool pass ();
- void seek (ContentTime time, bool);
+ void seek (
dcpomatic::
ContentTime time, bool);
private:
friend struct ::ffmpeg_pts_offset_test;
private:
friend struct ::ffmpeg_pts_offset_test;
@@
-62,22
+62,21
@@
private:
void decode_audio_packet ();
void decode_subtitle_packet ();
void decode_audio_packet ();
void decode_subtitle_packet ();
- void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime from);
- void decode_ass_subtitle (std::string ass, ContentTime from);
+ void decode_bitmap_subtitle (AVSubtitleRect const * rect,
dcpomatic::
ContentTime from);
+ void decode_ass_subtitle (std::string ass,
dcpomatic::
ContentTime from);
void maybe_add_subtitle ();
boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const;
void maybe_add_subtitle ();
boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const;
- boost::shared_ptr<Log> _log;
-
std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;
boost::mutex _filter_graphs_mutex;
std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;
boost::mutex _filter_graphs_mutex;
- ContentTime _pts_offset;
- boost::optional<ContentTime> _current_subtitle_to;
+ dcpomatic::ContentTime _pts_offset;
+ boost::optional<dcpomatic::ContentTime> _current_subtitle_to;
+ /** true if we have a subtitle which has not had emit_stop called for it yet */
bool _have_current_subtitle;
boost::shared_ptr<Image> _black_image;
bool _have_current_subtitle;
boost::shared_ptr<Image> _black_image;
- std::vector<boost::optional<ContentTime> > _next_time;
+ std::vector<boost::optional<
dcpomatic::
ContentTime> > _next_time;
};
};