projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Time types in dcpomatic namespace.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_examiner.h
diff --git
a/src/lib/ffmpeg_examiner.h
b/src/lib/ffmpeg_examiner.h
index c3dde84fe11b0bc46227e9949f4c8ccb4c4b6488..d2e6e1a0a1da1dbd17e9778d2058a8edb389d0d4 100644
(file)
--- a/
src/lib/ffmpeg_examiner.h
+++ b/
src/lib/ffmpeg_examiner.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
7
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-49,7
+49,7
@@
public:
return _audio_streams;
}
return _audio_streams;
}
- boost::optional<ContentTime> first_video () const {
+ boost::optional<
dcpomatic::
ContentTime> first_video () const {
return _first_video;
}
return _first_video;
}
@@
-69,29
+69,34
@@
public:
return video_codec_context()->colorspace;
}
return video_codec_context()->colorspace;
}
- int bits_per_pixel () const;
+ boost::optional<int> bits_per_pixel () const;
+
+ boost::optional<double> rotation () const {
+ return _rotation;
+ }
private:
void video_packet (AVCodecContext *);
void audio_packet (AVCodecContext *, boost::shared_ptr<FFmpegAudioStream>);
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 subtitle_stream_name (AVStream* s) const;
std::string stream_name (AVStream* s) const;
std::string subtitle_stream_name (AVStream* s) const;
- boost::optional<ContentTime> frame_time (AVStream* s) const;
+ boost::optional<
dcpomatic::
ContentTime> frame_time (AVStream* s) const;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
- boost::optional<ContentTime> _first_video;
+ boost::optional<
dcpomatic::
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;
/** Video length, either obtained from the header or derived by running
* through the whole file.
*/
Frame _video_length;
bool _need_video_length;
+ boost::optional<double> _rotation;
+
struct SubtitleStart
{
struct SubtitleStart
{
- SubtitleStart (std::string id_, bool image_, ContentTime time_)
+ SubtitleStart (std::string id_, bool image_,
dcpomatic::
ContentTime time_)
: id (id_)
, image (image_)
, time (time_)
: id (id_)
, image (image_)
, time (time_)
@@
-100,7
+105,7
@@
private:
std::string id;
/** true if it's an image subtitle, false for text */
bool image;
std::string id;
/** true if it's an image subtitle, false for text */
bool image;
- ContentTime time;
+
dcpomatic::
ContentTime time;
};
typedef std::map<boost::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart> > LastSubtitleMap;
};
typedef std::map<boost::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart> > LastSubtitleMap;