projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move get_reel_assets() out of Player, as it doesn't need to be there.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.h
diff --git
a/src/lib/ffmpeg_decoder.h
b/src/lib/ffmpeg_decoder.h
index 29e0d22e6339d6bc957c8f9a9552805c468bdd16..ce2476fb03b5bf6e1903ffe0de43c6cc33394b8e 100644
(file)
--- a/
src/lib/ffmpeg_decoder.h
+++ b/
src/lib/ffmpeg_decoder.h
@@
-18,26
+18,31
@@
*/
*/
+
/** @file src/ffmpeg_decoder.h
* @brief A decoder using FFmpeg to decode content.
*/
/** @file src/ffmpeg_decoder.h
* @brief A decoder using FFmpeg to decode content.
*/
-#include "util.h"
+
+#include "bitmap_text.h"
#include "decoder.h"
#include "ffmpeg.h"
#include "decoder.h"
#include "ffmpeg.h"
+#include "util.h"
extern "C" {
#include <libavcodec/avcodec.h>
}
#include <boost/thread/mutex.hpp>
#include <stdint.h>
extern "C" {
#include <libavcodec/avcodec.h>
}
#include <boost/thread/mutex.hpp>
#include <stdint.h>
-class Log;
-class VideoFilterGraph;
-class FFmpegAudioStream;
+
class AudioBuffers;
class AudioBuffers;
+class FFmpegAudioStream;
class Image;
class Image;
+class Log;
+class VideoFilterGraph;
struct ffmpeg_pts_offset_test;
struct ffmpeg_pts_offset_test;
+
/** @class FFmpegDecoder
* @brief A decoder using FFmpeg to decode content.
*/
/** @class FFmpegDecoder
* @brief A decoder using FFmpeg to decode content.
*/
@@
-68,12
+73,12
@@
private:
void decode_and_process_audio_packet (AVPacket* packet);
void decode_and_process_subtitle_packet (AVPacket* packet);
void decode_and_process_audio_packet (AVPacket* packet);
void decode_and_process_subtitle_packet (AVPacket* packet);
-
void process_bitmap_subtitle (AVSubtitleRect const * rect, dcpomatic::ContentTime from
);
+
BitmapText process_bitmap_subtitle (AVSubtitleRect const * rect
);
void process_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
void maybe_add_subtitle ();
void process_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
void maybe_add_subtitle ();
- std::list<std::shared_ptr<VideoFilterGraph>
> _filter_graphs;
+ std::list<std::shared_ptr<VideoFilterGraph>> _filter_graphs;
boost::mutex _filter_graphs_mutex;
dcpomatic::ContentTime _pts_offset;
boost::mutex _filter_graphs_mutex;
dcpomatic::ContentTime _pts_offset;