diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-25 01:07:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-25 01:07:35 +0100 |
| commit | 996b0c06e23bcb6b300d7b8799df94993692e07d (patch) | |
| tree | 615ff0c372dac97321489e3cb7f316cb4cb9eeec /src/lib/ffmpeg_content.h | |
| parent | 4f03da3aa12525cb8389ddefee629f5d0b2ac0aa (diff) | |
| parent | 907735ee6ca162583c7c9d20f5603a6db83a149f (diff) | |
Merge master and multifarious hackery.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
| -rw-r--r-- | src/lib/ffmpeg_content.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index d5b986996..8f5c773ee 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -26,6 +26,8 @@ #include "video_content.h" #include "audio_content.h" +class Filter; + class FFmpegAudioStream { public: @@ -75,6 +77,7 @@ public: static int const SUBTITLE_STREAM; static int const AUDIO_STREAMS; static int const AUDIO_STREAM; + static int const FILTERS; }; class FFmpegContent : public VideoContent, public AudioContent @@ -101,6 +104,8 @@ public: int content_audio_frame_rate () const; int output_audio_frame_rate () const; AudioMapping audio_mapping () const; + + void set_filters (std::vector<Filter const *> const &); std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const { boost::mutex::scoped_lock lm (_mutex); @@ -122,6 +127,11 @@ public: return _audio_stream; } + std::vector<Filter const *> filters () const { + boost::mutex::scoped_lock lm (_mutex); + return _filters; + } + void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>); void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>); @@ -130,6 +140,8 @@ private: boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream; std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams; boost::shared_ptr<FFmpegAudioStream> _audio_stream; + /** Video filters that should be used when generating DCPs */ + std::vector<Filter const *> _filters; }; #endif |