projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
ffmpeg.h
diff --git
a/src/lib/ffmpeg.h
b/src/lib/ffmpeg.h
index 9795b2229769468414fb8562278eed148dca55a5..a9823007bd290928841ac05b0f868cd029976ae2 100644
(file)
--- a/
src/lib/ffmpeg.h
+++ b/
src/lib/ffmpeg.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2016
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,10
+23,12
@@
#include "file_group.h"
#include "ffmpeg_subtitle_period.h"
#include "file_group.h"
#include "ffmpeg_subtitle_period.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
extern "C" {
#include <libavcodec/avcodec.h>
}
extern "C" {
#include <libavcodec/avcodec.h>
}
-#include <boost/shared_ptr.hpp>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/thread/mutex.hpp>
struct AVFormatContext;
#include <boost/thread/mutex.hpp>
struct AVFormatContext;
@@
-39,10
+42,10
@@
class Log;
class FFmpeg
{
public:
class FFmpeg
{
public:
-
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;
}
@@
-52,15
+55,13
@@
public:
protected:
AVCodecContext* video_codec_context () const;
AVCodecContext* subtitle_codec_context () const;
protected:
AVCodecContext* video_codec_context () const;
AVCodecContext* subtitle_codec_context () const;
- ContentTime pts_offset (
- std::vector<
boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<
ContentTime> first_video, double video_frame_rate
+
dcpomatic::
ContentTime pts_offset (
+ std::vector<
std::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<dcpomatic::
ContentTime> first_video, double video_frame_rate
) const;
static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub);
) const;
static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub);
- static std::string subtitle_id (AVSubtitle const & sub);
- static bool subtitle_is_image (AVSubtitle const & sub);
-
boost
::shared_ptr<const FFmpegContent> _ffmpeg_content;
+
std
::shared_ptr<const FFmpegContent> _ffmpeg_content;
uint8_t* _avio_buffer;
int _avio_buffer_size;
uint8_t* _avio_buffer;
int _avio_buffer_size;
@@
-72,7
+73,7
@@
protected:
AVFrame* _frame;
/** Index of video stream within AVFormatContext */
AVFrame* _frame;
/** Index of video stream within AVFormatContext */
-
int
_video_stream;
+
boost::optional<int>
_video_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 would appear (though not completely verified) that one must have
a mutex around calls to avcodec_open* and avcodec_close... and here
@@
-85,7
+86,7
@@
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;
};
#endif
};
#endif