projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Emit no audio from DCPs if none is mapped
[dcpomatic.git]
/
src
/
lib
/
filter.h
diff --git
a/src/lib/filter.h
b/src/lib/filter.h
index 258e7499126f370b8fa617ed5c1e654c99b537d0..bcc40dad7c88fa162b63a893f9a804de4e50e1d1 100644
(file)
--- a/
src/lib/filter.h
+++ b/
src/lib/filter.h
@@
-1,44
+1,49
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2021
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/>.
*/
*/
+
/** @file src/filter.h
/** @file src/filter.h
- * @brief A class to describe one of FFmpeg's video or
post-processing
filters.
+ * @brief A class to describe one of FFmpeg's video or
audio
filters.
*/
*/
+
#ifndef DCPOMATIC_FILTER_H
#define DCPOMATIC_FILTER_H
#ifndef DCPOMATIC_FILTER_H
#define DCPOMATIC_FILTER_H
+
+#include <boost/optional.hpp>
#include <string>
#include <vector>
#include <string>
#include <vector>
-#include <boost/utility.hpp>
+
/** @class Filter
/** @class Filter
- * @brief A class to describe one of FFmpeg's video filters.
+ * @brief A class to describe one of FFmpeg's video
or audio
filters.
*
* We don't support FFmpeg's post-processing filters here as they cannot cope with greater than
* 8bpp. FFmpeg quantizes e.g. yuv422p10le down to yuv422p before running such filters, which
* we don't really want to do.
*/
*
* We don't support FFmpeg's post-processing filters here as they cannot cope with greater than
* 8bpp. FFmpeg quantizes e.g. yuv422p10le down to yuv422p before running such filters, which
* we don't really want to do.
*/
-class Filter
: public boost::noncopyable
+class Filter
{
public:
{
public:
- Filter
(std::string, std::string, std::string, std::
string);
+ Filter
(std::string id, std::string name, std::string category, std::string ffmpeg_
string);
/** @return our id */
std::string id () const {
/** @return our id */
std::string id () const {
@@
-50,19
+55,19
@@
public:
return _name;
}
return _name;
}
- /** @return string for a FFmpeg
video
filter descriptor */
- std::string
vf
() const {
- return _
vf
;
+ /** @return string for a FFmpeg filter descriptor */
+ std::string
ffmpeg
() const {
+ return _
ffmpeg
;
}
}
-
+
std::string category () const {
return _category;
}
std::string category () const {
return _category;
}
-
- static std::vector<Filter
const *
> all ();
- static
Filter const * from_id (std::string
);
+
+ static std::vector<Filter> all ();
+ static
boost::optional<Filter> from_id(std::string d
);
static void setup_filters ();
static void setup_filters ();
- static std::string ffmpeg_string
(std::vector<Filter const *> const &
);
+ static std::string ffmpeg_string
(std::vector<Filter> const& filters
);
private:
private:
@@
-71,12
+76,17
@@
private:
/** user-visible name */
std::string _name;
std::string _category;
/** user-visible name */
std::string _name;
std::string _category;
- /** string for a FFmpeg
video
filter descriptor */
- std::string _
vf
;
+ /** string for a FFmpeg filter descriptor */
+ std::string _
ffmpeg
;
/** all available filters */
/** all available filters */
- static std::vector<Filter const *> _filters;
- static void maybe_add (std::string, std::string, std::string, std::string);
+ static std::vector<Filter> _filters;
};
};
+
+bool operator==(Filter const& a, Filter const& b);
+bool operator!=(Filter const& a, Filter const& b);
+bool operator<(Filter const& a, Filter const& b);
+
+
#endif
#endif