projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested use of Frame for video/audio content lengths.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_examiner.h
diff --git
a/src/lib/ffmpeg_examiner.h
b/src/lib/ffmpeg_examiner.h
index 8c31eb2c4aedadae419e7c5e41b83841f848c93b..d6149446ae0984e26719b542d1d4fba66890edec 100644
(file)
--- a/
src/lib/ffmpeg_examiner.h
+++ b/
src/lib/ffmpeg_examiner.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2015
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,9
+17,9
@@
*/
*/
-#include <boost/optional.hpp>
#include "ffmpeg.h"
#include "video_examiner.h"
#include "ffmpeg.h"
#include "video_examiner.h"
+#include <boost/optional.hpp>
class FFmpegAudioStream;
class FFmpegSubtitleStream;
class FFmpegAudioStream;
class FFmpegSubtitleStream;
@@
-27,11
+27,12
@@
class FFmpegSubtitleStream;
class FFmpegExaminer : public FFmpeg, public VideoExaminer
{
public:
class FFmpegExaminer : public FFmpeg, public VideoExaminer
{
public:
- FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
+ FFmpegExaminer (boost::shared_ptr<const FFmpegContent>
, boost::shared_ptr<Job> job = boost::shared_ptr<Job> ()
);
-
float
video_frame_rate () const;
+
boost::optional<float>
video_frame_rate () const;
dcp::Size video_size () const;
dcp::Size video_size () const;
- ContentTime video_length () const;
+ Frame 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;
@@
-54,8
+55,15
@@
private:
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::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<ContentTime> _first_video;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
boost::optional<ContentTime> _first_video;
+ /** Video length, either obtained from the header or derived by running
+ * through the whole file.
+ */
+ Frame _video_length;
+ bool _need_video_length;
+
+ boost::optional<ContentTime> _last_subtitle_start;
};
};