projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix strange behaviour of player export frame dialog (#2493).
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.h
diff --git
a/src/lib/ffmpeg_decoder.h
b/src/lib/ffmpeg_decoder.h
index b4b0faa3bee5bdd44eb91cdc2657ffce87289b1b..bd4b74f88395ddfbb9461ffbcfbd515632fac017 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 "video_filter_graph_set.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.
*/
@@
-52,9
+57,12
@@
public:
private:
friend struct ::ffmpeg_pts_offset_test;
private:
friend struct ::ffmpeg_pts_offset_test;
- bool flush ();
+ enum class FlushResult {
+ DONE,
+ AGAIN
+ };
-
static std::shared_ptr<AudioBuffers> deinterleave_audio (AVFrame* frame
);
+
FlushResult 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 (std::shared_ptr<FFmpegAudioStream> stream) const;
int bytes_per_audio_sample (std::shared_ptr<FFmpegAudioStream> stream) const;
@@
-68,13
+76,15
@@
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;
- boost::mutex _filter_graphs_mutex;
+ FlushResult flush_codecs();
+ FlushResult flush_fill();
+
+ VideoFilterGraphSet _filter_graphs;
dcpomatic::ContentTime _pts_offset;
boost::optional<dcpomatic::ContentTime> _current_subtitle_to;
dcpomatic::ContentTime _pts_offset;
boost::optional<dcpomatic::ContentTime> _current_subtitle_to;
@@
-84,4
+94,12
@@
private:
std::shared_ptr<Image> _black_image;
std::map<std::shared_ptr<FFmpegAudioStream>, boost::optional<dcpomatic::ContentTime>> _next_time;
std::shared_ptr<Image> _black_image;
std::map<std::shared_ptr<FFmpegAudioStream>, boost::optional<dcpomatic::ContentTime>> _next_time;
+
+ enum class FlushState {
+ CODECS,
+ AUDIO_DECODER,
+ FILL,
+ };
+
+ FlushState _flush_state = FlushState::CODECS;
};
};