projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calcu...
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.h
diff --git
a/src/lib/ffmpeg_content.h
b/src/lib/ffmpeg_content.h
index 367c30103e77812927878d0f2f31062e995cc647..76ba43567d9961ea2c1798c3ebfe13fb27e9772b 100644
(file)
--- a/
src/lib/ffmpeg_content.h
+++ b/
src/lib/ffmpeg_content.h
@@
-20,12
+20,12
@@
#ifndef DCPOMATIC_FFMPEG_CONTENT_H
#define DCPOMATIC_FFMPEG_CONTENT_H
#ifndef DCPOMATIC_FFMPEG_CONTENT_H
#define DCPOMATIC_FFMPEG_CONTENT_H
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
#include "video_content.h"
#include "audio_content.h"
#include "subtitle_content.h"
#include "audio_mapping.h"
#include "video_content.h"
#include "audio_content.h"
#include "subtitle_content.h"
#include "audio_mapping.h"
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/lexical_cast.hpp>
struct AVFormatContext;
struct AVStream;
struct AVFormatContext;
struct AVStream;
@@
-33,7
+33,7
@@
struct AVStream;
class Filter;
class FFmpegSubtitleStream;
class FFmpegAudioStream;
class Filter;
class FFmpegSubtitleStream;
class FFmpegAudioStream;
-
class
ffmpeg_pts_offset_test;
+
struct
ffmpeg_pts_offset_test;
class FFmpegContentProperty : public VideoContentProperty
{
class FFmpegContentProperty : public VideoContentProperty
{
@@
-59,7
+59,6
@@
public:
void examine (boost::shared_ptr<Job>);
std::string summary () const;
std::string technical_summary () const;
void examine (boost::shared_ptr<Job>);
std::string summary () const;
std::string technical_summary () const;
- std::string information () const;
void as_xml (xmlpp::Node *) const;
DCPTime full_length () const;
void as_xml (xmlpp::Node *) const;
DCPTime full_length () const;
@@
-73,6
+72,9
@@
public:
void set_audio_mapping (AudioMapping);
boost::filesystem::path audio_analysis_path () const;
void set_audio_mapping (AudioMapping);
boost::filesystem::path audio_analysis_path () const;
+ /* SubtitleContent */
+ bool has_subtitles () const;
+
void set_filters (std::vector<Filter const *> const &);
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
void set_filters (std::vector<Filter const *> const &);
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
@@
-108,10
+110,10
@@
public:
return _first_video;
}
return _first_video;
}
-
bool has_subtitle_during (ContentTimePeriod
) const;
+
std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting
) const;
private:
private:
- friend
class
ffmpeg_pts_offset_test;
+ friend
struct
ffmpeg_pts_offset_test;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;