projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Formatting/C++11.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.h
diff --git
a/src/lib/ffmpeg_decoder.h
b/src/lib/ffmpeg_decoder.h
index 4bb09cf9d3b64986567abd0370b3f8bdb92fa401..e18d5e8eb34b650e39af633af79aa8da850227f4 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/>.
*/
*/
@@
-22,56
+23,63
@@
*/
#include "util.h"
*/
#include "util.h"
-#include "video_decoder.h"
-#include "audio_decoder.h"
-#include "subtitle_decoder.h"
+#include "decoder.h"
#include "ffmpeg.h"
extern "C" {
#include <libavcodec/avcodec.h>
}
#include "ffmpeg.h"
extern "C" {
#include <libavcodec/avcodec.h>
}
-#include <boost/shared_ptr.hpp>
#include <boost/thread/mutex.hpp>
#include <stdint.h>
class Log;
class VideoFilterGraph;
class FFmpegAudioStream;
#include <boost/thread/mutex.hpp>
#include <stdint.h>
class Log;
class VideoFilterGraph;
class FFmpegAudioStream;
+class AudioBuffers;
+class Image;
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:
{
public:
- FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>, bool fast);
+ FFmpegDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const FFmpegContent>, bool fast);
+
+ bool pass ();
+ void seek (dcpomatic::ContentTime time, bool);
private:
friend struct ::ffmpeg_pts_offset_test;
private:
friend struct ::ffmpeg_pts_offset_test;
- bool pass (PassReason, bool accurate);
- void seek (ContentTime time, bool);
- void flush ();
+ bool flush ();
+
+ AVSampleFormat audio_sample_format (std::shared_ptr<FFmpegAudioStream> stream) const;
+ int bytes_per_audio_sample (std::shared_ptr<FFmpegAudioStream> stream) const;
- AVSampleFormat audio_sample_format (boost::shared_ptr<FFmpegAudioStream> stream) const;
- int bytes_per_audio_sample (boost::shared_ptr<FFmpegAudioStream> stream) const;
+ std::shared_ptr<FFmpegAudioStream> audio_stream_from_index (int index) const;
+ std::pair<int, bool> decode_audio_packet (std::shared_ptr<FFmpegAudioStream> stream, AVPacket* packet);
+ void process_audio_frame (std::shared_ptr<FFmpegAudioStream> stream);
- bool decode_
video_packet (
);
- void decode_a
udio_packet (
);
- void decode_
subtitle_packet (
);
+ bool decode_
and_process_video_packet (AVPacket* packet
);
+ void decode_a
nd_process_audio_packet (AVPacket* packet
);
+ void decode_
and_process_subtitle_packet (AVPacket* packet
);
- void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period);
+ void process_bitmap_subtitle (AVSubtitleRect const * rect, dcpomatic::ContentTime from);
+ void process_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
void maybe_add_subtitle ();
void maybe_add_subtitle ();
-
boost::shared_ptr<AudioBuffers> deinterleave_audio (boost
::shared_ptr<FFmpegAudioStream> stream) const;
+
std::shared_ptr<AudioBuffers> deinterleave_audio (std
::shared_ptr<FFmpegAudioStream> stream) const;
- std::list<
ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const
;
-
std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const
;
+ std::list<
std::shared_ptr<VideoFilterGraph> > _filter_graphs
;
+
boost::mutex _filter_graphs_mutex
;
- boost::shared_ptr<Log> _log;
+ dcpomatic::ContentTime _pts_offset;
+ boost::optional<dcpomatic::ContentTime> _current_subtitle_to;
+ /** true if we have a subtitle which has not had emit_stop called for it yet */
+ bool _have_current_subtitle;
- std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;
- boost::mutex _filter_graphs_mutex;
+ std::shared_ptr<Image> _black_image;
-
ContentTime _pts_offset
;
+
std::map<std::shared_ptr<FFmpegAudioStream>, boost::optional<dcpomatic::ContentTime>> _next_time
;
};
};