projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove all use of stringstream in an attempt to fix
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.cc
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index 7416630c13799a47dd5ebeba7a90d4d9ad95c78d..9f8cb78a60dce3596778facad10f15b8c1642f20 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-32,7
+32,6
@@
#include "log.h"
#include "exceptions.h"
#include "frame_rate_change.h"
#include "log.h"
#include "exceptions.h"
#include "frame_rate_change.h"
-#include "safe_stringstream.h"
#include "raw_convert.h"
#include "subtitle_content.h"
#include <libcxml/cxml.h>
#include "raw_convert.h"
#include "subtitle_content.h"
#include <libcxml/cxml.h>
@@
-388,29
+387,27
@@
FFmpegContent::set_filters (vector<Filter const *> const & filters)
string
FFmpegContent::identifier () const
{
string
FFmpegContent::identifier () const
{
- SafeStringStream s;
-
- s << Content::identifier();
+ string s = Content::identifier();
if (video) {
if (video) {
- s
<< "_" <<
video->identifier();
+ s
+= "_" +
video->identifier();
}
if (subtitle) {
}
if (subtitle) {
- s
<< "_" <<
subtitle->identifier();
+ s
+= "_" +
subtitle->identifier();
}
boost::mutex::scoped_lock lm (_mutex);
if (_subtitle_stream) {
}
boost::mutex::scoped_lock lm (_mutex);
if (_subtitle_stream) {
- s
<< "_" <<
_subtitle_stream->identifier ();
+ s
+= "_" +
_subtitle_stream->identifier ();
}
for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
}
for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
- s
<< "_" <<
(*i)->id ();
+ s
+= "_" +
(*i)->id ();
}
}
- return s
.str ()
;
+ return s;
}
list<ContentTimePeriod>
}
list<ContentTimePeriod>
@@
-543,10
+540,11
@@
FFmpegContent::add_properties (list<UserProperty>& p) const
_("BT2020 for a 10-bit system"),
_("BT2020 for a 12-bit system"),
_("SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"),
_("BT2020 for a 10-bit system"),
_("BT2020 for a 12-bit system"),
_("SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"),
- _("SMPTE ST 428-1")
+ _("SMPTE ST 428-1"),
+ _("ARIB STD-B67 ('Hybrid log-gamma')")
};
};
- DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 1
8
);
+ DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 1
9
);
p.push_back (UserProperty (UserProperty::VIDEO, _("Colour transfer characteristic"), transfers[_color_trc]));
char const * spaces[] = {
p.push_back (UserProperty (UserProperty::VIDEO, _("Colour transfer characteristic"), transfers[_color_trc]));
char const * spaces[] = {