projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix confusion with AUDIO_STREAMS property.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.h
diff --git
a/src/lib/ffmpeg_content.h
b/src/lib/ffmpeg_content.h
index da8152c0d92816de44a576f718a15f9f94c5db24..04523b117a49b51784e8ddc3c5cfb2286bc4cf33 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;
@@
-34,14
+34,13
@@
class Filter;
class FFmpegSubtitleStream;
class FFmpegAudioStream;
struct ffmpeg_pts_offset_test;
class FFmpegSubtitleStream;
class FFmpegAudioStream;
struct ffmpeg_pts_offset_test;
+struct audio_sampling_rate_test;
class FFmpegContentProperty : public VideoContentProperty
{
public:
static int const SUBTITLE_STREAMS;
static int const SUBTITLE_STREAM;
class FFmpegContentProperty : public VideoContentProperty
{
public:
static int const SUBTITLE_STREAMS;
static int const SUBTITLE_STREAM;
- static int const AUDIO_STREAMS;
- static int const AUDIO_STREAM;
static int const FILTERS;
};
static int const FILTERS;
};
@@
-59,19
+58,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 */
/* AudioContent */
- int audio_channels () const;
- ContentTime audio_length () const;
- int audio_frame_rate () const;
- AudioMapping audio_mapping () const;
- void set_audio_mapping (AudioMapping);
- boost::filesystem::path audio_analysis_path () const;
+ std::vector<AudioStreamPtr> audio_streams () const;
/* SubtitleContent */
bool has_subtitles () const;
/* SubtitleContent */
bool has_subtitles () const;
@@
-88,15
+84,10
@@
public:
return _subtitle_stream;
}
return _subtitle_stream;
}
- std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
+ std::vector<boost::shared_ptr<FFmpegAudioStream> >
ffmpeg_
audio_streams () const {
boost::mutex::scoped_lock lm (_mutex);
return _audio_streams;
}
boost::mutex::scoped_lock lm (_mutex);
return _audio_streams;
}
-
- boost::shared_ptr<FFmpegAudioStream> audio_stream () const {
- boost::mutex::scoped_lock lm (_mutex);
- return _audio_stream;
- }
std::vector<Filter const *> filters () const {
boost::mutex::scoped_lock lm (_mutex);
std::vector<Filter const *> filters () const {
boost::mutex::scoped_lock lm (_mutex);
@@
-104,7
+95,6
@@
public:
}
void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
}
void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
- void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
boost::optional<ContentTime> first_video () const {
boost::mutex::scoped_lock lm (_mutex);
boost::optional<ContentTime> first_video () const {
boost::mutex::scoped_lock lm (_mutex);
@@
-115,11
+105,11
@@
public:
private:
friend struct ffmpeg_pts_offset_test;
private:
friend struct ffmpeg_pts_offset_test;
+ friend struct audio_sampling_rate_test;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
- boost::shared_ptr<FFmpegAudioStream> _audio_stream;
boost::optional<ContentTime> _first_video;
/** Video filters that should be used when generating DCPs */
std::vector<Filter const *> _filters;
boost::optional<ContentTime> _first_video;
/** Video filters that should be used when generating DCPs */
std::vector<Filter const *> _filters;