projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font handling for DCP subtitles.
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.h
diff --git
a/src/lib/dcp_examiner.h
b/src/lib/dcp_examiner.h
index fd643a754ff78cfa2caaa7bf80a332173810360f..ac43805977c98f75d5cc9eea1a0c6e94a8871c64 100644
(file)
--- a/
src/lib/dcp_examiner.h
+++ b/
src/lib/dcp_examiner.h
@@
-18,51
+18,55
@@
*/
*/
+
/** @file src/lib/dcp_examiner.h
* @brief DCPExaminer class.
*/
/** @file src/lib/dcp_examiner.h
* @brief DCPExaminer class.
*/
-#include "video_examiner.h"
+
#include "audio_examiner.h"
#include "audio_examiner.h"
-#include "dcp.h"
#include "dcp_text_track.h"
#include "dcpomatic_assert.h"
#include "dcp_text_track.h"
#include "dcpomatic_assert.h"
+#include "video_examiner.h"
#include <dcp/dcp_time.h>
#include <dcp/dcp_time.h>
+#include <dcp/rating.h>
+
class DCPContent;
class DCPContent;
-class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
+
+class DCPExaminer : public VideoExaminer, public AudioExaminer
{
public:
explicit DCPExaminer (std::shared_ptr<const DCPContent>, bool tolerant);
{
public:
explicit DCPExaminer (std::shared_ptr<const DCPContent>, bool tolerant);
- bool has_video () const {
+ bool has_video () const
override
{
return _has_video;
}
return _has_video;
}
- boost::optional<double> video_frame_rate () const {
+ boost::optional<double> video_frame_rate () const
override
{
return _video_frame_rate;
}
return _video_frame_rate;
}
- dcp::Size video_size () const {
+ dcp::Size video_size () const
override
{
DCPOMATIC_ASSERT (_has_video);
DCPOMATIC_ASSERT (_video_size);
return *_video_size;
}
DCPOMATIC_ASSERT (_has_video);
DCPOMATIC_ASSERT (_video_size);
return *_video_size;
}
- Frame video_length () const {
+ Frame video_length () const
override
{
return _video_length;
}
return _video_length;
}
- bool yuv () const {
+ bool yuv () const
override
{
return false;
}
return false;
}
- VideoRange range () const {
+ VideoRange range () const
override
{
return VideoRange::FULL;
}
return VideoRange::FULL;
}
- PixelQuanta pixel_quanta () const {
+ PixelQuanta pixel_quanta () const
override
{
return {};
}
return {};
}
@@
-78,19
+82,19
@@
public:
return _needs_assets;
}
return _needs_assets;
}
- bool has_audio () const {
+ bool has_audio () const
override
{
return _has_audio;
}
return _has_audio;
}
- int audio_channels () const {
+ int audio_channels () const
override
{
return _audio_channels.get_value_or (0);
}
return _audio_channels.get_value_or (0);
}
- Frame audio_length () const {
+ Frame audio_length () const
override
{
return _audio_length;
}
return _audio_length;
}
- int audio_frame_rate () const {
+ int audio_frame_rate () const
override
{
return _audio_frame_rate.get_value_or (48000);
}
return _audio_frame_rate.get_value_or (48000);
}
@@
-162,6
+166,11
@@
public:
return _atmos_edit_rate;
}
return _atmos_edit_rate;
}
+ /** @return fonts in each reel */
+ std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> fonts() const {
+ return _fonts;
+ }
+
private:
boost::optional<double> _video_frame_rate;
boost::optional<dcp::Size> _video_size;
private:
boost::optional<double> _video_frame_rate;
boost::optional<dcp::Size> _video_size;
@@
-194,4
+203,5
@@
private:
bool _has_atmos = false;
Frame _atmos_length = 0;
dcp::Fraction _atmos_edit_rate;
bool _has_atmos = false;
Frame _atmos_length = 0;
dcp::Fraction _atmos_edit_rate;
+ std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> _fonts;
};
};