projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in log message.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg.h
diff --git
a/src/lib/ffmpeg.h
b/src/lib/ffmpeg.h
index e6399c076655742f4438bb87676dad87f8e06781..25d26e8136ad5a5d5b7cb28ee4012e1a87a8e228 100644
(file)
--- a/
src/lib/ffmpeg.h
+++ b/
src/lib/ffmpeg.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,35
+18,39
@@
*/
*/
+
#ifndef DCPOMATIC_FFMPEG_H
#define DCPOMATIC_FFMPEG_H
#ifndef DCPOMATIC_FFMPEG_H
#define DCPOMATIC_FFMPEG_H
+
#include "file_group.h"
#include "ffmpeg_subtitle_period.h"
#include "file_group.h"
#include "ffmpeg_subtitle_period.h"
-#include
"warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
extern "C" {
#include <libavcodec/avcodec.h>
}
extern "C" {
#include <libavcodec/avcodec.h>
}
-DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
#include <boost/thread/mutex.hpp>
#include <boost/thread/mutex.hpp>
+
struct AVFormatContext;
struct AVFrame;
struct AVFormatContext;
struct AVFrame;
+struct AVStream;
struct AVIOContext;
class FFmpegContent;
class FFmpegAudioStream;
class Log;
struct AVIOContext;
class FFmpegContent;
class FFmpegAudioStream;
class Log;
+
class FFmpeg
{
public:
class FFmpeg
{
public:
- explicit FFmpeg (
boost
::shared_ptr<const FFmpegContent>);
+ explicit FFmpeg (
std
::shared_ptr<const FFmpegContent>);
virtual ~FFmpeg ();
virtual ~FFmpeg ();
-
boost
::shared_ptr<const FFmpegContent> ffmpeg_content () const {
+
std
::shared_ptr<const FFmpegContent> ffmpeg_content () const {
return _ffmpeg_content;
}
return _ffmpeg_content;
}
@@
-57,25
+61,28
@@
protected:
AVCodecContext* video_codec_context () const;
AVCodecContext* subtitle_codec_context () const;
dcpomatic::ContentTime pts_offset (
AVCodecContext* video_codec_context () const;
AVCodecContext* subtitle_codec_context () const;
dcpomatic::ContentTime pts_offset (
- std::vector<
boost::shared_ptr<FFmpegAudioStream>
> audio_streams, boost::optional<dcpomatic::ContentTime> first_video, double video_frame_rate
+ std::vector<
std::shared_ptr<FFmpegAudioStream>
> audio_streams, boost::optional<dcpomatic::ContentTime> first_video, double video_frame_rate
) const;
) const;
- static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub);
+ static FFmpegSubtitlePeriod subtitle_period (AV
Packet const* packet, AVStream const* stream, AV
Subtitle const & sub);
-
boost
::shared_ptr<const FFmpegContent> _ffmpeg_content;
+
std
::shared_ptr<const FFmpegContent> _ffmpeg_content;
- uint8_t* _avio_buffer;
- int _avio_buffer_size;
- AVIOContext* _avio_context;
+ uint8_t* _avio_buffer
= nullptr
;
+ int _avio_buffer_size
= 4096
;
+ AVIOContext* _avio_context
= nullptr
;
FileGroup _file_group;
FileGroup _file_group;
- AVFormatContext* _format_context;
- AVPacket _packet;
- AVFrame* _frame;
+ AVFormatContext* _format_context = nullptr;
+ std::vector<AVCodecContext*> _codec_context;
+ /** AVFrame used for decoding video */
+ AVFrame* _video_frame = nullptr;
/** Index of video stream within AVFormatContext */
boost::optional<int> _video_stream;
/** Index of video stream within AVFormatContext */
boost::optional<int> _video_stream;
+ AVFrame* audio_frame (std::shared_ptr<const FFmpegAudioStream> stream);
+
/* It would appear (though not completely verified) that one must have
a mutex around calls to avcodec_open* and avcodec_close... and here
it is.
/* It would appear (though not completely verified) that one must have
a mutex around calls to avcodec_open* and avcodec_close... and here
it is.
@@
-87,7
+94,11
@@
private:
void setup_decoders ();
static void ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl);
void setup_decoders ();
static void ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl);
- static boost::weak_ptr<Log> _ffmpeg_log;
+ static std::weak_ptr<Log> _ffmpeg_log;
+
+ /** AVFrames used for decoding audio streams; accessed with audio_frame() */
+ std::map<std::shared_ptr<const FFmpegAudioStream>, AVFrame*> _audio_frame;
};
};
+
#endif
#endif