projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give a slightly better error whn trying to add a KDM using add-file (#1035).
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.h
diff --git
a/src/lib/ffmpeg_decoder.h
b/src/lib/ffmpeg_decoder.h
index 0334a30e203f4064d8ef4d0ea788eb38d0a2ef2a..bd7ba98b84fe0f74edd8e50ca195a9873de2ba4b 100644
(file)
--- a/
src/lib/ffmpeg_decoder.h
+++ b/
src/lib/ffmpeg_decoder.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-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/>.
*/
*/
@@
-23,55
+24,55
@@
#include "util.h"
#include "decoder.h"
#include "util.h"
#include "decoder.h"
-#include "video_decoder.h"
-#include "audio_decoder.h"
-#include "subtitle_decoder.h"
#include "ffmpeg.h"
extern "C" {
#include <libavcodec/avcodec.h>
}
#include <boost/shared_ptr.hpp>
#include "ffmpeg.h"
extern "C" {
#include <libavcodec/avcodec.h>
}
#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
#include <boost/thread/mutex.hpp>
#include <stdint.h>
#include <boost/thread/mutex.hpp>
#include <stdint.h>
-#include <vector>
-#include <string>
class Log;
class Log;
-class FilterGraph;
+class VideoFilterGraph;
+class FFmpegAudioStream;
+class AudioBuffers;
struct ffmpeg_pts_offset_test;
/** @class FFmpegDecoder
* @brief A decoder using FFmpeg to decode content.
*/
struct ffmpeg_pts_offset_test;
/** @class FFmpegDecoder
* @brief A decoder using FFmpeg to decode content.
*/
-class FFmpegDecoder : public
VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
+class FFmpegDecoder : public
FFmpeg, public Decoder
{
public:
FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
{
public:
FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
+ bool pass ();
+ void seek (ContentTime time, bool);
+
private:
friend struct ::ffmpeg_pts_offset_test;
private:
friend struct ::ffmpeg_pts_offset_test;
- void seek (ContentTime time, bool);
- bool pass ();
void flush ();
void flush ();
- AVSampleFormat audio_sample_format () const;
- int bytes_per_audio_sample () const;
+ AVSampleFormat audio_sample_format (
boost::shared_ptr<FFmpegAudioStream> stream
) const;
+ int bytes_per_audio_sample (
boost::shared_ptr<FFmpegAudioStream> stream
) const;
bool decode_video_packet ();
void decode_audio_packet ();
void decode_subtitle_packet ();
bool decode_video_packet ();
void decode_audio_packet ();
void decode_subtitle_packet ();
+ void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime from);
+ void decode_ass_subtitle (std::string ass, ContentTime from);
+
void maybe_add_subtitle ();
void maybe_add_subtitle ();
- boost::shared_ptr<AudioBuffers> deinterleave_audio (
uint8_t** data, int size)
;
+ boost::shared_ptr<AudioBuffers> deinterleave_audio (
boost::shared_ptr<FFmpegAudioStream> stream) const
;
- std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
-
boost::shared_ptr<Log> _log;
boost::shared_ptr<Log> _log;
-
- std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
+
+ std::list<boost::shared_ptr<
Video
FilterGraph> > _filter_graphs;
boost::mutex _filter_graphs_mutex;
ContentTime _pts_offset;
boost::mutex _filter_graphs_mutex;
ContentTime _pts_offset;
+ boost::optional<ContentTime> _current_subtitle_to;
+ bool _have_current_subtitle;
};
};