#include <boost/optional.hpp>
#include "processor.h"
-#include "ffmpeg_compatibility.h"
-class Matcher : public Processor, public TimedVideoSink, public TimedAudioSink, public VideoSource, public AudioSource
+class Matcher : public Processor, public TimedAudioSink, public TimedVideoSink, public AudioSource, public VideoSource
{
public:
- Matcher (Log* log, int sample_rate, float frames_per_second);
- void process_video (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s, double t);
- void process_audio (boost::shared_ptr<AudioBuffers>, double t);
+ Matcher (boost::shared_ptr<Log> log, int sample_rate, float frames_per_second);
+ void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
+ void process_audio (boost::shared_ptr<const AudioBuffers>, double);
void process_end ();
private:
boost::optional<int> _channels;
struct VideoRecord {
- VideoRecord (boost::shared_ptr<Image> i, bool s, boost::shared_ptr<Subtitle> sub, double t)
+ VideoRecord (boost::shared_ptr<const Image> i, bool s, boost::shared_ptr<Subtitle> u, double t)
: image (i)
, same (s)
- , subtitle (sub)
+ , subtitle (u)
, time (t)
{}
-
- boost::shared_ptr<Image> image;
+
+ boost::shared_ptr<const Image> image;
bool same;
boost::shared_ptr<Subtitle> subtitle;
double time;
};
- std::list<VideoRecord> _pending_video;
-
struct AudioRecord {
- AudioRecord (boost::shared_ptr<AudioBuffers> a, double t)
+ AudioRecord (boost::shared_ptr<const AudioBuffers> a, double t)
: audio (a)
, time (t)
{}
- boost::shared_ptr<AudioBuffers> audio;
+ boost::shared_ptr<const AudioBuffers> audio;
double time;
};
+ std::list<VideoRecord> _pending_video;
std::list<AudioRecord> _pending_audio;
boost::optional<double> _first_input;
- boost::shared_ptr<Image> _last_image;
+ boost::shared_ptr<const Image> _last_image;
boost::shared_ptr<Subtitle> _last_subtitle;
+
+ bool _had_first_video;
+ bool _had_first_audio;
};