#include "decoder.h"
#include "video_decoder.h"
#include "audio_decoder.h"
+#include "subtitle_decoder.h"
#include "ffmpeg.h"
class Film;
/** @class FFmpegDecoder
* @brief A decoder using FFmpeg to decode content.
*/
-class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public FFmpeg
+class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
{
public:
FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
~FFmpegDecoder ();
void pass ();
- void seek (VideoContent::Frame);
- void seek_back ();
+ void seek (VideoContent::Frame, bool);
bool done () const;
private:
friend class ::ffmpeg_pts_offset_test;
- /* No copy construction */
- FFmpegDecoder (FFmpegDecoder const &);
- FFmpegDecoder& operator= (FFmpegDecoder const &);
-
static double compute_pts_offset (double, double, float);
void setup_subtitle ();
AVSampleFormat audio_sample_format () const;
int bytes_per_audio_sample () const;
- void do_seek (VideoContent::Frame, bool, bool);
bool decode_video_packet ();
void decode_audio_packet ();
+ void decode_subtitle_packet ();
void maybe_add_subtitle ();
boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
- AVCodec* _subtitle_codec; ///< may be 0 if there is no subtitle
+ AVCodec* _subtitle_codec; ///< may be 0 if there is no subtitle
std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
boost::mutex _filter_graphs_mutex;
bool _decode_video;
bool _decode_audio;
- double _pts_offset;
+ double _video_pts_offset;
+ double _audio_pts_offset;
bool _just_sought;
};