/*
- Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
return _audio_streams;
}
- boost::optional<ContentTime> first_video () const {
+ boost::optional<dcpomatic::ContentTime> first_video () const {
return _first_video;
}
+ VideoRange range () const;
+
AVColorRange color_range () const {
return video_codec_context()->color_range;
}
return video_codec_context()->colorspace;
}
- int bits_per_pixel () const;
+ boost::optional<int> bits_per_pixel () const;
+
+ boost::optional<double> rotation () const {
+ return _rotation;
+ }
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ boost::optional<std::string> id () const {
+ return _id;
+ }
+#endif
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 audio_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;
- 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;
+ boost::optional<double> _rotation;
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ boost::optional<std::string> _id;
+#endif
+
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_)
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;