projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better logging to help with #2701.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_file_encoder.h
diff --git
a/src/lib/ffmpeg_file_encoder.h
b/src/lib/ffmpeg_file_encoder.h
index 08fc4778b4d6bb7fe2f45f3e99a5104b91b1fef3..78840d6a82ef9091de6f5b2baca8c1754dd7feea 100644
(file)
--- a/
src/lib/ffmpeg_file_encoder.h
+++ b/
src/lib/ffmpeg_file_encoder.h
@@
-18,23
+18,39
@@
*/
*/
+
#ifndef DCPOMATIC_FFMPEG_FILE_ENCODER_H
#define DCPOMATIC_FFMPEG_FILE_ENCODER_H
#ifndef DCPOMATIC_FFMPEG_FILE_ENCODER_H
#define DCPOMATIC_FFMPEG_FILE_ENCODER_H
+
+#include "audio_mapping.h"
+#include "dcpomatic_time.h"
#include "encoder.h"
#include "event_history.h"
#include "encoder.h"
#include "event_history.h"
-#include "
audio_mapping
.h"
+#include "
image_store
.h"
#include "log.h"
#include <dcp/key.h>
#include "log.h"
#include <dcp/key.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
}
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
}
+LIBDCP_ENABLE_WARNINGS
class ExportAudioStream;
class ExportAudioStream;
+enum class ExportFormat
+{
+ PRORES_4444,
+ PRORES_HQ,
+ H264_AAC,
+ SUBTITLES_DCP
+};
+
+
class FFmpegFileEncoder
{
public:
class FFmpegFileEncoder
{
public:
@@
-51,8
+67,8
@@
public:
~FFmpegFileEncoder ();
~FFmpegFileEncoder ();
- void video (
boost
::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
- void audio (
boost
::shared_ptr<AudioBuffers>);
+ void video (
std
::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
+ void audio (
std
::shared_ptr<AudioBuffers>);
void subtitle (PlayerText, dcpomatic::DCPTimePeriod);
void flush ();
void subtitle (PlayerText, dcpomatic::DCPTimePeriod);
void flush ();
@@
-65,18
+81,15
@@
private:
void audio_frame (int size);
void audio_frame (int size);
- static void buffer_free(void* opaque, uint8_t* data);
- void buffer_free2(uint8_t* data);
-
- AVCodec* _video_codec;
- AVCodecContext* _video_codec_context;
- std::vector<boost::shared_ptr<ExportAudioStream> > _audio_streams;
+ AVCodec const * _video_codec = nullptr;
+ AVCodecContext* _video_codec_context = nullptr;
+ std::vector<std::shared_ptr<ExportAudioStream>> _audio_streams;
bool _audio_stream_per_channel;
bool _audio_stream_per_channel;
- AVFormatContext* _format_context;
- AVStream* _video_stream;
+ AVFormatContext* _format_context
= nullptr
;
+ AVStream* _video_stream
= nullptr
;
AVPixelFormat _pixel_format;
AVSampleFormat _sample_format;
AVPixelFormat _pixel_format;
AVSampleFormat _sample_format;
- AVDictionary* _video_options;
+ AVDictionary* _video_options
= nullptr
;
std::string _video_codec_name;
std::string _audio_codec_name;
int _audio_channels;
std::string _video_codec_name;
std::string _audio_codec_name;
int _audio_channels;
@@
-86,15
+99,11
@@
private:
int _video_frame_rate;
int _audio_frame_rate;
int _video_frame_rate;
int _audio_frame_rate;
- int64_t _audio_frames;
+ int64_t _audio_frames
= 0
;
-
boost
::shared_ptr<AudioBuffers> _pending_audio;
+
std
::shared_ptr<AudioBuffers> _pending_audio;
- /** Store of shared_ptr<Image> to keep them alive whilst raw pointers into
- their data have been passed to FFmpeg.
- */
- std::map<uint8_t*, boost::shared_ptr<const Image> > _pending_images;
- boost::mutex _pending_images_mutex;
+ ImageStore _pending_images;
static int _video_stream_index;
static int _audio_stream_index_base;
static int _video_stream_index;
static int _audio_stream_index_base;