diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-11-09 15:25:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-11-09 15:25:36 +0000 |
| commit | 162963e503f6e0ed364dfef0d941ad02cac1c884 (patch) | |
| tree | 3daa38b4db3c7ac075d3b012974c6e1479a3f141 /src | |
| parent | 666314c323d28542fd37dce85df7906ea7781101 (diff) | |
| parent | 213c9f82941955d53d8490012fb08140f80bf6e9 (diff) | |
Merge branch 'cth' of ssh://git.carlh.net/home/carl/git/asdcplib-cth into cth
Diffstat (limited to 'src')
| -rwxr-xr-x | src/AS_DCP_JP2K.cpp | 3 | ||||
| -rw-r--r-- | src/KM_fileio.cpp | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp index 945911e..edb5687 100755 --- a/src/AS_DCP_JP2K.cpp +++ b/src/AS_DCP_JP2K.cpp @@ -1354,6 +1354,8 @@ ASDCP::JP2K::MXFSWriter::OpenWrite(const std::string& filename, const WriterInfo else m_Writer = new h__SWriter(DefaultInteropDict()); +#if 0 + /* This check has been removed so that DCP-o-matic can use any edit rate it wants */ if ( PDesc.EditRate != ASDCP::EditRate_24 && PDesc.EditRate != ASDCP::EditRate_25 && PDesc.EditRate != ASDCP::EditRate_30 @@ -1364,6 +1366,7 @@ ASDCP::JP2K::MXFSWriter::OpenWrite(const std::string& filename, const WriterInfo DefaultLogSink().Error("Stereoscopic wrapping requires 24, 25, 30, 48, 50 or 60 fps input streams.\n"); return RESULT_FORMAT; } +#endif if ( PDesc.StoredWidth > 2048 ) DefaultLogSink().Warn("Wrapping non-standard 4K stereoscopic content. I hope you know what you are doing!\n"); diff --git a/src/KM_fileio.cpp b/src/KM_fileio.cpp index b95ac34..2704183 100644 --- a/src/KM_fileio.cpp +++ b/src/KM_fileio.cpp @@ -32,7 +32,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <asdcp/KM_fileio.h> #include <KM_log.h> #include <fcntl.h> -#include <sstream> #include <iomanip> #include <assert.h> @@ -780,13 +779,13 @@ Kumu::FileWriter::StopHashing() unsigned char digest[MD5_DIGEST_LENGTH]; MD5_Final (digest, &m_MD5Context); - std::stringstream s; + char hex[MD5_DIGEST_LENGTH * 2 + 1]; for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) { - s << std::hex << std::setfill('0') << std::setw(2) << ((int) digest[i]); + sprintf(hex + i * 2, "%02x", digest[i]); } - return s.str (); + return hex; } |