projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split Options into encode / decode.
[dcpomatic.git]
/
src
/
lib
/
options.h
diff --git
a/src/lib/options.h
b/src/lib/options.h
index 65c7b9ebc802bed72a5cc6de493076fd4e2bdb51..4457969f3399254b89f77be38b3d308ee1c54ce9 100644
(file)
--- a/
src/lib/options.h
+++ b/
src/lib/options.h
@@
-27,23
+27,19
@@
#include <boost/optional.hpp>
#include "util.h"
#include <boost/optional.hpp>
#include "util.h"
-/** @class Options
- * @brief
Options for a trans
coding operation.
+/** @class
Encode
Options
+ * @brief
EncodeOptions for an en
coding operation.
*
* These are settings which may be different, in different circumstances, for
*
* These are settings which may be different, in different circumstances, for
- * the same film; ie they are options for a particular
transcode
operation.
+ * the same film; ie they are options for a particular operation.
*/
*/
-class Options
+class
Encode
Options
{
public:
{
public:
- Options (std::string f, std::string e, std::string m)
+
Encode
Options (std::string f, std::string e, std::string m)
: padding (0)
: padding (0)
- , apply_crop (true)
- , decode_video_skip (0)
- , decode_audio (true)
- , decode_subtitles (false)
- , decoder_alignment (true)
+ , video_skip (0)
, _frame_out_path (f)
, _frame_out_extension (e)
, _multichannel_audio_out_path (m)
, _frame_out_path (f)
, _frame_out_extension (e)
, _multichannel_audio_out_path (m)
@@
-95,23
+91,17
@@
public:
}
Size out_size; ///< size of output images
}
Size out_size; ///< size of output images
- float ratio; ///< ratio of the wanted output image (not considering padding)
int padding; ///< number of pixels of padding (in terms of the output size) each side of the image
int padding; ///< number of pixels of padding (in terms of the output size) each side of the image
- bool apply_crop; ///< true to apply cropping
/** Range of video frames to decode */
/** Range of video frames to decode */
- boost::optional<std::pair<SourceFrame, SourceFrame> > video_
decode_
range;
+ boost::optional<std::pair<SourceFrame, SourceFrame> > video_range;
/** Range of audio frames to decode */
/** Range of audio frames to decode */
- boost::optional<std::pair<int64_t, int64_t> > audio_
decode_
range;
+ boost::optional<std::pair<int64_t, int64_t> > audio_range;
/** Skip frames such that we don't decode any frame where (index % decode_video_skip) != 0; e.g.
* 1 for every frame, 2 for every other frame, etc.
*/
/** Skip frames such that we don't decode any frame where (index % decode_video_skip) != 0; e.g.
* 1 for every frame, 2 for every other frame, etc.
*/
- SourceFrame decode_video_skip;
- bool decode_audio; ///< true to decode audio, otherwise false
- bool decode_subtitles;
-
- bool decoder_alignment;
+ SourceFrame video_skip;
private:
/** Path of the directory to write video frames to */
private:
/** Path of the directory to write video frames to */
@@
-121,3
+111,18
@@
private:
/** Path of the directory to write audio files to */
std::string _multichannel_audio_out_path;
};
/** Path of the directory to write audio files to */
std::string _multichannel_audio_out_path;
};
+
+
+class DecodeOptions
+{
+public:
+ DecodeOptions ()
+ : decode_audio (true)
+ , decode_subtitles (false)
+ , video_sync (true)
+ {}
+
+ bool decode_audio;
+ bool decode_subtitles;
+ bool video_sync;
+};