projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix audio when it spans reel boundaries.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.h
diff --git
a/src/lib/ffmpeg_content.h
b/src/lib/ffmpeg_content.h
index da0eb48af70ed9c8ca2b61eb2ba7963535532b76..f6553df1c47e53c3b1b65be5ca9045691ffaca0d 100644
(file)
--- a/
src/lib/ffmpeg_content.h
+++ b/
src/lib/ffmpeg_content.h
@@
-1,26
+1,28
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
6
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.
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
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/>.
*/
#ifndef DCPOMATIC_FFMPEG_CONTENT_H
#define DCPOMATIC_FFMPEG_CONTENT_H
*/
#ifndef DCPOMATIC_FFMPEG_CONTENT_H
#define DCPOMATIC_FFMPEG_CONTENT_H
-#include "audio_content.h"
+#include "content.h"
+#include "audio_stream.h"
struct AVFormatContext;
struct AVStream;
struct AVFormatContext;
struct AVStream;
@@
-41,7
+43,7
@@
public:
static int const FILTERS;
};
static int const FILTERS;
};
-class FFmpegContent : public
Audio
Content
+class FFmpegContent : public Content
{
public:
FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
{
public:
FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@
-53,24
+55,16
@@
public:
}
void examine (boost::shared_ptr<Job>);
}
void examine (boost::shared_ptr<Job>);
+ void use_template (boost::shared_ptr<const Content> c);
std::string summary () const;
std::string technical_summary () const;
std::string summary () const;
std::string technical_summary () const;
- void as_xml (xmlpp::Node *) const;
+ void as_xml (xmlpp::Node *
, bool with_paths
) const;
DCPTime full_length () const;
std::string identifier () const;
DCPTime full_length () const;
std::string identifier () const;
- /* VideoContent */
void set_default_colour_conversion ();
void set_default_colour_conversion ();
- /* AudioContent */
- std::vector<AudioStreamPtr> audio_streams () const;
-
- /* SubtitleContent */
- bool has_text_subtitles () const;
- bool has_image_subtitles () const;
- double subtitle_video_frame_rate () 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 {
@@
-83,10
+77,7
@@
public:
return _subtitle_stream;
}
return _subtitle_stream;
}
- std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const {
- boost::mutex::scoped_lock lm (_mutex);
- return _audio_streams;
- }
+ std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const;
std::vector<Filter const *> filters () const {
boost::mutex::scoped_lock lm (_mutex);
std::vector<Filter const *> filters () const {
boost::mutex::scoped_lock lm (_mutex);
@@
-100,21
+91,16
@@
public:
return _first_video;
}
return _first_video;
}
- std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
- std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-
void signal_subtitle_stream_changed ();
void signal_subtitle_stream_changed ();
-pr
otected
:
+pr
ivate
:
void add_properties (std::list<UserProperty> &) const;
void add_properties (std::list<UserProperty> &) const;
-private:
friend struct ffmpeg_pts_offset_test;
friend struct audio_sampling_rate_test;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
friend struct ffmpeg_pts_offset_test;
friend struct audio_sampling_rate_test;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
- std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
boost::optional<ContentTime> _first_video;
/** Video filters that should be used when generating DCPs */
std::vector<Filter const *> _filters;
boost::optional<ContentTime> _first_video;
/** Video filters that should be used when generating DCPs */
std::vector<Filter const *> _filters;