projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use $HOME rather than hard-coded user name.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_encoder.h
diff --git
a/src/lib/ffmpeg_encoder.h
b/src/lib/ffmpeg_encoder.h
index 710364b013840779d0fb80fdd204ca7d57960e75..2d5c6af8703cfd3f8331f40f4a6f7989df40ed21 100644
(file)
--- a/
src/lib/ffmpeg_encoder.h
+++ b/
src/lib/ffmpeg_encoder.h
@@
-21,12
+21,12
@@
#ifndef DCPOMATIC_FFMPEG_ENCODER_H
#define DCPOMATIC_FFMPEG_ENCODER_H
#ifndef DCPOMATIC_FFMPEG_ENCODER_H
#define DCPOMATIC_FFMPEG_ENCODER_H
+#include "audio_mapping.h"
+#include "butler.h"
#include "encoder.h"
#include "event_history.h"
#include "encoder.h"
#include "event_history.h"
-#include "audio_mapping.h"
#include "ffmpeg_file_encoder.h"
#include "ffmpeg_file_encoder.h"
-class Butler;
class FFmpegEncoder : public Encoder
{
class FFmpegEncoder : public Encoder
{
@@
-42,11
+42,11
@@
public:
int x264_crf
);
int x264_crf
);
- void go ();
+ void go ()
override
;
- boost::optional<float> current_rate () const;
- Frame frames_done () const;
- bool finishing () const {
+ boost::optional<float> current_rate () const
override
;
+ Frame frames_done () const
override
;
+ bool finishing () const
override
{
return false;
}
return false;
}
@@
-73,9
+73,12
@@
private:
void audio (std::shared_ptr<AudioBuffers>);
private:
void audio (std::shared_ptr<AudioBuffers>);
private:
- std::map<Eyes, std::shared_ptr<FFmpegFileEncoder>
> _encoders;
+ std::map<Eyes, std::shared_ptr<FFmpegFileEncoder>> _encoders;
};
};
+ AudioMapping stereo_map() const;
+ AudioMapping many_channel_map() const;
+
int _output_audio_channels;
mutable boost::mutex _mutex;
int _output_audio_channels;
mutable boost::mutex _mutex;
@@
-89,7
+92,7
@@
private:
bool _audio_stream_per_channel;
int _x264_crf;
bool _audio_stream_per_channel;
int _x264_crf;
-
std::shared_ptr<Butler>
_butler;
+
Butler
_butler;
};
#endif
};
#endif