diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-11-23 23:26:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-11-23 23:26:20 +0100 |
| commit | f12f84424744e2a7338ffd32f73178120f1f1a86 (patch) | |
| tree | baf8749207e7b53e8ab18d77b5853b882a17e1eb /src/AS_DCP_PCM.cpp | |
| parent | cebc32be327d880336517671a6377e6872822ca2 (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-x | src/AS_DCP_PCM.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp index 1ca197c..d74a07c 100755 --- a/src/AS_DCP_PCM.cpp +++ b/src/AS_DCP_PCM.cpp @@ -285,6 +285,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 @@ -318,6 +320,7 @@ ASDCP::PCM::MXFReader::h__Reader::OpenRead(const std::string& filename) return RESULT_FORMAT; } } +#endif // TODO: test file for sane CBR index BytesPerEditUnit @@ -561,6 +564,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 @@ -580,6 +585,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 ) { |