projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Warning fixes.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.h
diff --git
a/src/lib/ffmpeg_decoder.h
b/src/lib/ffmpeg_decoder.h
index 73edcccb43ec562162825f4e82b3331d9abceaa6..9f85c2dca8e5e2d9fc66045cd694dab07c12fb90 100644
(file)
--- a/
src/lib/ffmpeg_decoder.h
+++ b/
src/lib/ffmpeg_decoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-29,7
+29,6
@@
#include <boost/thread/mutex.hpp>
extern "C" {
#include <libavcodec/avcodec.h>
#include <boost/thread/mutex.hpp>
extern "C" {
#include <libavcodec/avcodec.h>
-#include <libpostproc/postprocess.h>
}
#include "util.h"
#include "decoder.h"
}
#include "util.h"
#include "decoder.h"
@@
-38,7
+37,8
@@
extern "C" {
#include "subtitle_decoder.h"
#include "ffmpeg.h"
#include "subtitle_decoder.h"
#include "ffmpeg.h"
-class Film;
+class Log;
+class FilterGraph;
class ffmpeg_pts_offset_test;
/** @class FFmpegDecoder
class ffmpeg_pts_offset_test;
/** @class FFmpegDecoder
@@
-47,23
+47,14
@@
class ffmpeg_pts_offset_test;
class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
{
public:
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, bool);
- bool done () const;
+ FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
private:
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);
+ friend struct ::ffmpeg_pts_offset_test;
- void setup_subtitle ();
+ void seek (ContentTime time, bool);
+ bool pass ();
+ void flush ();
AVSampleFormat audio_sample_format () const;
int bytes_per_audio_sample () const;
AVSampleFormat audio_sample_format () const;
int bytes_per_audio_sample () const;
@@
-75,16
+66,12
@@
private:
void maybe_add_subtitle ();
boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
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
+ std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+
+ boost::shared_ptr<Log> _log;
std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
boost::mutex _filter_graphs_mutex;
std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
boost::mutex _filter_graphs_mutex;
- bool _decode_video;
- bool _decode_audio;
-
- double _video_pts_offset;
- double _audio_pts_offset;
- bool _just_sought;
+ ContentTime _pts_offset;
};
};