diff options
| author | jhurst <jhurst@cinecert.com> | 2010-02-04 17:58:18 +0000 |
|---|---|---|
| committer | jhurst <> | 2010-02-04 17:58:18 +0000 |
| commit | 3198199840fb69e99acae9ca044481d378296e8c (patch) | |
| tree | 00aa8c8743c72fc63620fa805e2d135b713e6b19 | |
| parent | 08f80037d81b77f2a33fd5278e4ecffc68e26e88 (diff) | |
more rates!
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | src/AS_DCP_PCM.cpp | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e03e013..a06e40a 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,7 @@ AC_PREREQ([2.59]) # For example, if asdcplib version 1.0.0 were modified to accomodate changes # in file format, and if no changes were made to AS_DCP.h, the new version would be # 1.0.1. If changes were also required in AS_DCP.h, the new version would be 1.1.1. -AC_INIT([asdcplib], [1.5.32], [asdcplib@cinecert.com]) +AC_INIT([asdcplib], [1.5.33], [asdcplib@cinecert.com]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([src/KM_error.h]) diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp index b24706f..073a809 100755 --- a/src/AS_DCP_PCM.cpp +++ b/src/AS_DCP_PCM.cpp @@ -226,7 +226,11 @@ ASDCP::PCM::MXFReader::h__Reader::OpenRead(const char* filename) // check for sample/frame rate sanity if ( ASDCP_SUCCESS(result) && m_ADesc.SampleRate != EditRate_24 + && m_ADesc.SampleRate != EditRate_25 + && m_ADesc.SampleRate != EditRate_30 && m_ADesc.SampleRate != EditRate_48 + && m_ADesc.SampleRate != EditRate_50 + && m_ADesc.SampleRate != EditRate_60 && m_ADesc.SampleRate != EditRate_23_98 ) { DefaultLogSink().Error("PCM file SampleRate is not 24/1, 48/1 or 24000/1001: %08x/%08x\n", // lu @@ -426,7 +430,11 @@ ASDCP::PCM::MXFWriter::h__Writer::SetSourceStream(const AudioDescriptor& ADesc) return RESULT_STATE; if ( ADesc.SampleRate != EditRate_24 + && ADesc.SampleRate != EditRate_25 + && ADesc.SampleRate != EditRate_30 && ADesc.SampleRate != EditRate_48 + && ADesc.SampleRate != EditRate_50 + && ADesc.SampleRate != EditRate_60 && ADesc.SampleRate != EditRate_23_98 ) { DefaultLogSink().Error("AudioDescriptor.SampleRate is not 24/1, 48/1 or 24000/1001: %d/%d\n", |