summaryrefslogtreecommitdiff
path: root/src/AS_DCP_PCM.cpp
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-11-23 23:26:20 +0100
committerCarl Hetherington <cth@carlh.net>2020-12-26 21:40:45 +0100
commit57516bc7a6f9e95d08df44a9c463ffcf1c4fa181 (patch)
tree0f9764a7014673ae3429146f220e7174122b48a8 /src/AS_DCP_PCM.cpp
parent38680fca98b21cd68d2fbe9a99b7d3e945417791 (diff)
Remove edit rate checks so that DCP-o-matic can use any edit rate it wants.
Diffstat (limited to 'src/AS_DCP_PCM.cpp')
-rwxr-xr-xsrc/AS_DCP_PCM.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp
index 5a3fd1e..a92295f 100755
--- a/src/AS_DCP_PCM.cpp
+++ b/src/AS_DCP_PCM.cpp
@@ -286,6 +286,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
@@ -322,6 +324,7 @@ ASDCP::PCM::MXFReader::h__Reader::OpenRead(const std::string& filename)
return RESULT_FORMAT;
}
}
+#endif
// TODO: test file for sane CBR index BytesPerEditUnit
@@ -565,6 +568,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
@@ -587,6 +592,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 )
{