projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split DCP panel up into general (at the top) then video/audio tabs.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg.h
diff --git
a/src/lib/ffmpeg.h
b/src/lib/ffmpeg.h
index d5f4db2916c67e45fb014bb676397579a1cb8ef4..8aaa54f84afab6973938e83eb138a60d6a2fa9c3 100644
(file)
--- a/
src/lib/ffmpeg.h
+++ b/
src/lib/ffmpeg.h
@@
-26,6
+26,7
@@
extern "C" {
#include <libavcodec/avcodec.h>
}
extern "C" {
#include <libavcodec/avcodec.h>
}
+#include "file_group.h"
struct AVFilterGraph;
struct AVCodecContext;
struct AVFilterGraph;
struct AVCodecContext;
@@
-35,29
+36,40
@@
struct AVFrame;
struct AVBufferContext;
struct AVCodec;
struct AVStream;
struct AVBufferContext;
struct AVCodec;
struct AVStream;
+struct AVIOContext;
class FFmpegContent;
class FFmpeg
{
public:
class FFmpegContent;
class FFmpeg
{
public:
- FFmpeg (boost::shared_ptr<const FFmpegContent>
, bool
);
+ FFmpeg (boost::shared_ptr<const FFmpegContent>);
virtual ~FFmpeg ();
boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
return _ffmpeg_content;
}
virtual ~FFmpeg ();
boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
return _ffmpeg_content;
}
+ int avio_read (uint8_t *, int);
+ int64_t avio_seek (int64_t, int);
+
protected:
AVCodecContext* video_codec_context () const;
AVCodecContext* audio_codec_context () const;
protected:
AVCodecContext* video_codec_context () const;
AVCodecContext* audio_codec_context () const;
+ AVCodecContext* subtitle_codec_context () const;
boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
+ uint8_t* _avio_buffer;
+ int _avio_buffer_size;
+ AVIOContext* _avio_context;
+ FileGroup _file_group;
+
AVFormatContext* _format_context;
AVPacket _packet;
AVFrame* _frame;
AVFormatContext* _format_context;
AVPacket _packet;
AVFrame* _frame;
+ /** Index of video stream within AVFormatContext */
int _video_stream;
/* It would appear (though not completely verified) that one must have
int _video_stream;
/* It would appear (though not completely verified) that one must have
@@
-67,9
+79,8
@@
protected:
static boost::mutex _mutex;
private:
static boost::mutex _mutex;
private:
- void setup_general (bool);
- void setup_video ();
- void setup_audio ();
+ void setup_general ();
+ void setup_decoders ();
};
#endif
};
#endif