projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply 80562fe5dce5fd625da583ca6f7c2833f9db8754 from master (remove default scale...
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_examiner.h
diff --git
a/src/lib/ffmpeg_examiner.h
b/src/lib/ffmpeg_examiner.h
index 57b7775d4b84942c8aa065e891e8da230dcd5179..59c3299b26c7325313eb7f1b791821babc6ff73c 100644
(file)
--- a/
src/lib/ffmpeg_examiner.h
+++ b/
src/lib/ffmpeg_examiner.h
@@
-30,8
+30,9
@@
public:
FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
float video_frame_rate () const;
FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
float video_frame_rate () const;
- libdcp::Size video_size () const;
- ContentVideoFrame video_length () const;
+ dcp::Size video_size () const;
+ ContentTime video_length () const;
+ boost::optional<float> sample_aspect_ratio () 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
+42,21
@@
public:
return _audio_streams;
}
return _audio_streams;
}
- boost::optional<Time> first_video () const {
+ boost::optional<
Content
Time> 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<Time> 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<Time> _first_video;
+ std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
+ std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
+ boost::optional<
Content
Time> _first_video;
};
};