projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FFmpegContent does not need audio_length().
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.h
diff --git
a/src/lib/ffmpeg_content.h
b/src/lib/ffmpeg_content.h
index 67839794b97945496f4158f7379349794273fa66..6d27c66ca6b42cf5773518a3068a0113f6955de4 100644
(file)
--- a/
src/lib/ffmpeg_content.h
+++ b/
src/lib/ffmpeg_content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-20,12
+20,12
@@
#ifndef DCPOMATIC_FFMPEG_CONTENT_H
#define DCPOMATIC_FFMPEG_CONTENT_H
#ifndef DCPOMATIC_FFMPEG_CONTENT_H
#define DCPOMATIC_FFMPEG_CONTENT_H
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
#include "video_content.h"
#include "audio_content.h"
#include "subtitle_content.h"
#include "audio_mapping.h"
#include "video_content.h"
#include "audio_content.h"
#include "subtitle_content.h"
#include "audio_mapping.h"
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/lexical_cast.hpp>
struct AVFormatContext;
struct AVStream;
struct AVFormatContext;
struct AVStream;
@@
-33,7
+33,7
@@
struct AVStream;
class Filter;
class FFmpegSubtitleStream;
class FFmpegAudioStream;
class Filter;
class FFmpegSubtitleStream;
class FFmpegAudioStream;
-
class
ffmpeg_pts_offset_test;
+
struct
ffmpeg_pts_offset_test;
class FFmpegContentProperty : public VideoContentProperty
{
class FFmpegContentProperty : public VideoContentProperty
{
@@
-59,15
+59,16
@@
public:
void examine (boost::shared_ptr<Job>);
std::string summary () const;
std::string technical_summary () const;
void examine (boost::shared_ptr<Job>);
std::string summary () const;
std::string technical_summary () const;
- std::string information () const;
void as_xml (xmlpp::Node *) const;
DCPTime full_length () const;
std::string identifier () const;
void as_xml (xmlpp::Node *) const;
DCPTime full_length () const;
std::string identifier () const;
+
+ /* VideoContent */
+ void set_default_colour_conversion ();
/* AudioContent */
int audio_channels () const;
/* AudioContent */
int audio_channels () const;
- ContentTime audio_length () const;
int audio_frame_rate () const;
AudioMapping audio_mapping () const;
void set_audio_mapping (AudioMapping);
int audio_frame_rate () const;
AudioMapping audio_mapping () const;
void set_audio_mapping (AudioMapping);
@@
-114,7
+115,7
@@
public:
std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
private:
std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
private:
- friend
class
ffmpeg_pts_offset_test;
+ friend
struct
ffmpeg_pts_offset_test;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;