Merge master.

[dcpomatic.git] / src / lib / ffmpeg_examiner.h

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 4912d899a85f7a70015fa83c72fe61743cb6aab2..8c31eb2c4aedadae419e7c5e41b83841f848c93b 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -30,8 +30,8 @@ public:
        FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
        
        float video_frame_rate () const;
-       libdcp::Size video_size () const;
-       VideoContent::Frame video_length () const;
+       dcp::Size video_size () const;
+       ContentTime video_length () const;
 
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
                return _subtitle_streams;
@@ -41,15 +41,21 @@ public:
                return _audio_streams;
        }
 
-       boost::optional<double> first_video () const {
+       boost::optional<ContentTime> first_video () const {
                return _first_video;
        }
        
 private:
+       void video_packet (AVCodecContext *);
+       void audio_packet (AVCodecContext *, boost::shared_ptr<FFmpegAudioStream>);
+       void subtitle_packet (AVCodecContext *, boost::shared_ptr<FFmpegSubtitleStream>);
+       
        std::string stream_name (AVStream* s) const;
-       boost::optional<double> frame_time (int) const;
+       std::string audio_stream_name (AVStream* s) const;
+       std::string subtitle_stream_name (AVStream* s) const;
+       boost::optional<ContentTime> frame_time (AVStream* s) const;
        
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
        std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
-       boost::optional<double> _first_video;
+       boost::optional<ContentTime> _first_video;
 };