diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-16 11:38:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-16 11:38:35 +0100 |
| commit | a8ae455886f36c19257129f34b172051bbe120bf (patch) | |
| tree | c3b5f9d66b660b440acdfa8cceebca816281cd19 /asdcplib/src | |
| parent | 2f0e6ee9d883abbbc31aca0d1cc80e89eb9b0af2 (diff) | |
Hand-merge changes from master (110dc70..979739e)
Diffstat (limited to 'asdcplib/src')
| -rwxr-xr-x | asdcplib/src/AS_DCP_PCM.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/asdcplib/src/AS_DCP_PCM.cpp b/asdcplib/src/AS_DCP_PCM.cpp index 8639cb0f..385d9035 100755 --- a/asdcplib/src/AS_DCP_PCM.cpp +++ b/asdcplib/src/AS_DCP_PCM.cpp @@ -232,6 +232,10 @@ ASDCP::PCM::MXFReader::h__Reader::OpenRead(const char* filename) } } + /* This check has been removed so that DCP-o-matic can use any edit rate + it wants. + */ +#if 0 // check for sample/frame rate sanity if ( ASDCP_SUCCESS(result) && m_ADesc.EditRate != EditRate_24 @@ -260,6 +264,7 @@ ASDCP::PCM::MXFReader::h__Reader::OpenRead(const char* filename) return RESULT_FORMAT; } } +#endif if( ASDCP_SUCCESS(result) ) result = InitMXFIndex(); @@ -483,6 +488,10 @@ 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 anye dit rate + it wants. + */ if ( ADesc.EditRate != EditRate_24 && ADesc.EditRate != EditRate_25 && ADesc.EditRate != EditRate_30 @@ -498,6 +507,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 ) { |