diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-13 11:01:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-13 11:01:10 +0100 |
| commit | c719feb3cc4a5627827f8576a9b34756f701d59d (patch) | |
| tree | cd3d016956e5da693fdd048440d532cd6b3fe2d5 /src/lib/ffmpeg_content.h | |
| parent | 4981bba0d5103dc92dba5d5f79d5296dd2078402 (diff) | |
Various fixes to PTS mangling.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
| -rw-r--r-- | src/lib/ffmpeg_content.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index 69b459fb6..dba06990b 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -26,6 +26,7 @@ #include "subtitle_content.h" class Filter; +class ffmpeg_pts_offset_test; class FFmpegAudioStream { @@ -48,6 +49,11 @@ public: int channels; AudioMapping mapping; boost::optional<double> first_audio; + +private: + friend class ffmpeg_pts_offset_test; + /* Constructor for tests */ + FFmpegAudioStream () {} }; extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b); @@ -138,17 +144,19 @@ public: void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>); void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>); - boost::optional<Time> first_video () const { + boost::optional<double> first_video () const { boost::mutex::scoped_lock lm (_mutex); return _first_video; } private: + friend class ffmpeg_pts_offset_test; + std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams; boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream; std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams; boost::shared_ptr<FFmpegAudioStream> _audio_stream; - boost::optional<Time> _first_video; + boost::optional<double> _first_video; /** Video filters that should be used when generating DCPs */ std::vector<Filter const *> _filters; }; |