diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-03-16 21:05:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-03-21 20:25:17 +0100 |
| commit | 511c089e1442ce66ec985d4e70782f9e188b1fd2 (patch) | |
| tree | 3af1f62023c2c7b12bd3f3d123bb9d6a5b3e5dae | |
| parent | 59670db83c13807eda5b63704c0fac90aebe68e4 (diff) | |
Remove edit rate checks so that DCP-o-matic can use any edit rate it wants.
| -rwxr-xr-x | src/AS_DCP_JP2K.cpp | 3 | ||||
| -rwxr-xr-x | src/AS_DCP_PCM.cpp | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp index 8856e67..87961c3 100755 --- a/src/AS_DCP_JP2K.cpp +++ b/src/AS_DCP_JP2K.cpp @@ -1522,6 +1522,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 @@ -1532,6 +1534,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/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp index fb11e19..f971693 100755 --- a/src/AS_DCP_PCM.cpp +++ b/src/AS_DCP_PCM.cpp @@ -290,6 +290,8 @@ ASDCP::PCM::MXFReader::h__Reader::OpenRead(const std::string& filename) return RESULT_FORMAT; } +#if 0 + /* This check has been removed so that DCP-o-matic can use any edit rate it wants */ // check for sample/frame rate sanity if ( ASDCP_SUCCESS(result) && m_ADesc.EditRate != EditRate_24 @@ -326,6 +328,7 @@ ASDCP::PCM::MXFReader::h__Reader::OpenRead(const std::string& filename) return RESULT_FORMAT; } } +#endif // TODO: test file for sane CBR index BytesPerEditUnit @@ -569,6 +572,8 @@ ASDCP::PCM::MXFWriter::h__Writer::SetSourceStream(const AudioDescriptor& ADesc) if ( ! m_State.Test_INIT() ) return RESULT_STATE; +#if 0 + /* This check has been removed so that DCP-o-matic can use any edit rate it wants */ if ( ADesc.EditRate != EditRate_24 && ADesc.EditRate != EditRate_25 && ADesc.EditRate != EditRate_30 @@ -591,6 +596,7 @@ ASDCP::PCM::MXFWriter::h__Writer::SetSourceStream(const AudioDescriptor& ADesc) ADesc.EditRate.Numerator, ADesc.EditRate.Denominator); return RESULT_RAW_FORMAT; } +#endif if ( ADesc.AudioSamplingRate != SampleRate_48k && ADesc.AudioSamplingRate != SampleRate_96k ) { |