projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_examiner.h
diff --git
a/src/lib/ffmpeg_examiner.h
b/src/lib/ffmpeg_examiner.h
index ec84865ed7cce45fdcc40999e5bb4f197fb55ce2..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;
FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
float video_frame_rate () const;
-
lib
dcp::Size video_size () const;
-
VideoContent::Fra
me video_length () const;
+ dcp::Size video_size () const;
+
ContentTi
me video_length () const;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
return _subtitle_streams;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
return _subtitle_streams;
@@
-41,15
+41,21
@@
public:
return _audio_streams;
}
return _audio_streams;
}
- boost::optional<
doubl
e> first_video () const {
+ boost::optional<
ContentTim
e> first_video () const {
return _first_video;
}
private:
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;
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<
doubl
e> _first_video;
+ std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
+ std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
+ boost::optional<
ContentTim
e> _first_video;
};
};