projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid unnecessary re-writes of video assets if they are staying the same (#1638).
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_examiner.h
diff --git
a/src/lib/ffmpeg_examiner.h
b/src/lib/ffmpeg_examiner.h
index d2e6e1a0a1da1dbd17e9778d2058a8edb389d0d4..9ffb8421b0ec91c826701b37751d685413c8740b 100644
(file)
--- a/
src/lib/ffmpeg_examiner.h
+++ b/
src/lib/ffmpeg_examiner.h
@@
-53,6
+53,8
@@
public:
return _first_video;
}
return _first_video;
}
+ VideoRange range () const;
+
AVColorRange color_range () const {
return video_codec_context()->color_range;
}
AVColorRange color_range () const {
return video_codec_context()->color_range;
}
@@
-75,6
+77,12
@@
public:
return _rotation;
}
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>);
private:
void video_packet (AVCodecContext *);
void audio_packet (AVCodecContext *, boost::shared_ptr<FFmpegAudioStream>);
@@
-94,6
+102,10
@@
private:
boost::optional<double> _rotation;
boost::optional<double> _rotation;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ boost::optional<std::string> _id;
+#endif
+
struct SubtitleStart
{
SubtitleStart (std::string id_, bool image_, dcpomatic::ContentTime time_)
struct SubtitleStart
{
SubtitleStart (std::string id_, bool image_, dcpomatic::ContentTime time_)