projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into content-rework-take5
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.h
diff --git
a/src/lib/ffmpeg_decoder.h
b/src/lib/ffmpeg_decoder.h
index a0900d89f8a9a413e9cb7d3f009c439ddcfc5adc..71ecf79065384aa1d7c14e23e9915af2971798e3 100644
(file)
--- a/
src/lib/ffmpeg_decoder.h
+++ b/
src/lib/ffmpeg_decoder.h
@@
-57,7
+57,7
@@
class Log;
class FFmpegDecoder : public VideoDecoder, public AudioDecoder
{
public:
class FFmpegDecoder : public VideoDecoder, public AudioDecoder
{
public:
- FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<
FFmpegContent>, DecodeOptions
);
+ FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<
const FFmpegContent>, bool video, bool audio, bool subtitles, bool video_sync
);
~FFmpegDecoder ();
float frames_per_second () const;
~FFmpegDecoder ();
float frames_per_second () const;
@@
-105,7
+105,7
@@
private:
std::string stream_name (AVStream* s) const;
std::string stream_name (AVStream* s) const;
- boost::shared_ptr<FFmpegContent> _ffmpeg_content;
+ boost::shared_ptr<
const
FFmpegContent> _ffmpeg_content;
AVFormatContext* _format_context;
int _video_stream;
AVFormatContext* _format_context;
int _video_stream;
@@
-129,4
+129,9
@@
private:
std::vector<FFmpegSubtitleStream> _subtitle_streams;
std::vector<FFmpegAudioStream> _audio_streams;
std::vector<FFmpegSubtitleStream> _subtitle_streams;
std::vector<FFmpegAudioStream> _audio_streams;
+
+ bool _decode_video;
+ bool _decode_audio;
+ bool _decode_subtitles;
+ bool _video_sync;
};
};