projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix destruction of Server; some test cleanups.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index f95d42661b1ed5d50442beed89c7238fa614f675..678cdf04eae219bbcd8218765ff0d11facab3725 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.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
@@
-33,53
+33,50
@@
#include <stdint.h>
extern "C" {
#include <libavutil/samplefmt.h>
#include <stdint.h>
extern "C" {
#include <libavutil/samplefmt.h>
-}
-#ifdef HAVE_SWRESAMPLE
-extern "C" {
#include <libswresample/swresample.h>
}
#include <libswresample/swresample.h>
}
-#endif
#include "util.h"
#include "util.h"
-#include "video_sink.h"
-#include "audio_sink.h"
+#include "config.h"
+#include "cross.h"
+#include "exceptions.h"
class Image;
class Image;
-class Subtitle;
class AudioBuffers;
class Film;
class ServerDescription;
class DCPVideoFrame;
class EncodedData;
class Writer;
class AudioBuffers;
class Film;
class ServerDescription;
class DCPVideoFrame;
class EncodedData;
class Writer;
+class Job;
+class ServerFinder;
+class PlayerVideoFrame;
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
*
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
*
- * Video is supplied to process_video as
YUV
frames, and audio
+ * Video is supplied to process_video as
RGB
frames, and audio
* is supplied as uncompressed PCM in blocks of various sizes.
*/
* is supplied as uncompressed PCM in blocks of various sizes.
*/
-class Encoder : public
VideoSink, public AudioSink
+class Encoder : public
boost::noncopyable, public ExceptionStore
{
public:
{
public:
- Encoder (boost::shared_ptr<
Film> f
);
+ Encoder (boost::shared_ptr<
const Film> f, boost::weak_ptr<Job>
);
virtual ~Encoder ();
/** Called to indicate that a processing run is about to begin */
virtual ~Encoder ();
/** Called to indicate that a processing run is about to begin */
- v
irtual v
oid process_begin ();
+ void process_begin ();
/** Call with a frame of video.
/** Call with a frame of video.
- * @param i Video frame image.
- * @param same true if i is the same as the last time we were called.
- * @param s A subtitle that should be on this frame, or 0.
+ * @param f Video frame.
*/
*/
- void process_video (boost::shared_ptr<
const Image> i, bool same, boost::shared_ptr<Subtitle> s
);
+ void process_video (boost::shared_ptr<
PlayerVideoFrame> f
);
/** Call with some audio data */
void process_audio (boost::shared_ptr<const AudioBuffers>);
/** Called when a processing run has finished */
/** Call with some audio data */
void process_audio (boost::shared_ptr<const AudioBuffers>);
/** Called when a processing run has finished */
- v
irtual v
oid process_end ();
+ void process_end ();
float current_encoding_rate () const;
int video_frames_out () const;
float current_encoding_rate () const;
int video_frames_out () const;
@@
-88,14
+85,17
@@
private:
void frame_done ();
void frame_done ();
- void encoder_thread (
ServerDescription *
);
+ void encoder_thread (
boost::optional<ServerDescription>
);
void terminate_threads ();
void terminate_threads ();
+ void add_worker_threads (ServerDescription);
+ void server_found (ServerDescription);
/** Film that we are encoding */
/** Film that we are encoding */
- boost::shared_ptr<Film> _film;
+ boost::shared_ptr<const Film> _film;
+ boost::weak_ptr<Job> _job;
/** Mutex for _time_history and _last_frame */
/** Mutex for _time_history and _last_frame */
- mutable boost::mutex _
history
_mutex;
+ mutable boost::mutex _
state
_mutex;
/** List of the times of completion of the last _history_size frames;
first is the most recently completed.
*/
/** List of the times of completion of the last _history_size frames;
first is the most recently completed.
*/
@@
-103,16
+103,9
@@
private:
/** Number of frames that we should keep history for */
static int const _history_size;
/** Number of frames that we should keep history for */
static int const _history_size;
- /** Number of video frames received so far */
- ContentVideoFrame _video_frames_in;
/** Number of video frames written for the DCP so far */
int _video_frames_out;
/** Number of video frames written for the DCP so far */
int _video_frames_out;
-#if HAVE_SWRESAMPLE
- SwrContext* _swr_context;
-#endif
-
- bool _have_a_real_frame;
bool _terminate;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
std::list<boost::thread *> _threads;
bool _terminate;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
std::list<boost::thread *> _threads;
@@
-120,6
+113,7
@@
private:
boost::condition _condition;
boost::shared_ptr<Writer> _writer;
boost::condition _condition;
boost::shared_ptr<Writer> _writer;
+ Waker _waker;
};
#endif
};
#endif