projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.h
diff --git
a/src/lib/ffmpeg_content.h
b/src/lib/ffmpeg_content.h
index ba73c0f9b23cdf00d0812417fd1e70a0f11ef2d8..e4c4a8a52de35ef3cd2caf47f4a1c8a5c75829b3 100644
(file)
--- a/
src/lib/ffmpeg_content.h
+++ b/
src/lib/ffmpeg_content.h
@@
-37,26
+37,35
@@
class FFmpegStream
public:
FFmpegStream (std::string n, int i)
: name (n)
public:
FFmpegStream (std::string n, int i)
: name (n)
- , id (i)
- , _legacy_id (false)
+ , _id (i)
{}
{}
- FFmpegStream (boost::shared_ptr<const cxml::Node>
, int
);
+ FFmpegStream (boost::shared_ptr<const cxml::Node>);
void as_xml (xmlpp::Node *) const;
/** @param c An AVFormatContext.
void as_xml (xmlpp::Node *) const;
/** @param c An AVFormatContext.
- * @return Stream index within the AVFormatContext.
+ * @param index A stream index within the AVFormatContext.
+ * @return true if this FFmpegStream uses the given stream index.
*/
*/
-
int index (AVFormatContext const * c
) const;
+
bool uses_index (AVFormatContext const * c, int index
) const;
AVStream* stream (AVFormatContext const * c) const;
AVStream* stream (AVFormatContext const * c) const;
+ std::string technical_summary () const {
+ return "id " + boost::lexical_cast<std::string> (_id);
+ }
+
+ std::string identifier () const {
+ return boost::lexical_cast<std::string> (_id);
+ }
+
std::string name;
std::string name;
- int id;
+
+ friend bool operator== (FFmpegStream const & a, FFmpegStream const & b);
+ friend bool operator!= (FFmpegStream const & a, FFmpegStream const & b);
private:
private:
- /** If this is true, id is in fact the index */
- bool _legacy_id;
+ int _id;
};
class FFmpegAudioStream : public FFmpegStream
};
class FFmpegAudioStream : public FFmpegStream
@@
-78,7
+87,7
@@
public:
int frame_rate;
int channels;
AudioMapping mapping;
int frame_rate;
int channels;
AudioMapping mapping;
- boost::optional<
doubl
e> first_audio;
+ boost::optional<
ContentTim
e> first_audio;
private:
friend class ffmpeg_pts_offset_test;
private:
friend class ffmpeg_pts_offset_test;
@@
-86,13
+95,12
@@
private:
/* Constructor for tests */
FFmpegAudioStream ()
: FFmpegStream ("", 0)
/* Constructor for tests */
FFmpegAudioStream ()
: FFmpegStream ("", 0)
+ , frame_rate (0)
+ , channels (0)
, mapping (1)
{}
};
, mapping (1)
{}
};
-extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
-extern bool operator!= (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
-
class FFmpegSubtitleStream : public FFmpegStream
{
public:
class FFmpegSubtitleStream : public FFmpegStream
{
public:
@@
-100,14
+108,11
@@
public:
: FFmpegStream (n, i)
{}
: FFmpegStream (n, i)
{}
- FFmpegSubtitleStream (boost::shared_ptr<const cxml::Node>
, int
);
+ FFmpegSubtitleStream (boost::shared_ptr<const cxml::Node>);
void as_xml (xmlpp::Node *) const;
};
void as_xml (xmlpp::Node *) const;
};
-extern bool operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b);
-extern bool operator!= (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b);
-
class FFmpegContentProperty : public VideoContentProperty
{
public:
class FFmpegContentProperty : public VideoContentProperty
{
public:
@@
-122,7
+127,7
@@
class FFmpegContent : public VideoContent, public AudioContent, public SubtitleC
{
public:
FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
{
public:
FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
- FFmpegContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int version);
+ FFmpegContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int version
, std::list<std::string> &
);
FFmpegContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
boost::shared_ptr<FFmpegContent> shared_from_this () {
FFmpegContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
boost::shared_ptr<FFmpegContent> shared_from_this () {
@@
-140,11
+145,12
@@
public:
/* AudioContent */
int audio_channels () const;
/* AudioContent */
int audio_channels () const;
-
AudioContent::Fra
me audio_length () const;
+
ContentTi
me audio_length () const;
int content_audio_frame_rate () const;
int output_audio_frame_rate () const;
AudioMapping audio_mapping () const;
void set_audio_mapping (AudioMapping);
int content_audio_frame_rate () const;
int output_audio_frame_rate () const;
AudioMapping audio_mapping () const;
void set_audio_mapping (AudioMapping);
+ boost::filesystem::path audio_analysis_path () const;
void set_filters (std::vector<Filter const *> const &);
void set_filters (std::vector<Filter const *> const &);
@@
-176,7
+182,7
@@
public:
void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
- boost::optional<
doubl
e> first_video () const {
+ boost::optional<
ContentTim
e> first_video () const {
boost::mutex::scoped_lock lm (_mutex);
return _first_video;
}
boost::mutex::scoped_lock lm (_mutex);
return _first_video;
}
@@
-188,7
+194,7
@@
private:
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
boost::shared_ptr<FFmpegAudioStream> _audio_stream;
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
boost::shared_ptr<FFmpegAudioStream> _audio_stream;
- boost::optional<
doubl
e> _first_video;
+ boost::optional<
ContentTim
e> _first_video;
/** Video filters that should be used when generating DCPs */
std::vector<Filter const *> _filters;
};
/** Video filters that should be used when generating DCPs */
std::vector<Filter const *> _filters;
};