From db7fa5c0ca1143b100edd42e06dec560a9c0e26e Mon Sep 17 00:00:00 2001 From: msheby Date: Tue, 25 Aug 2009 20:37:34 +0000 Subject: Add GetSecondsSinceEpoch for Waimea. --- src/PCMParserList.cpp | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'src/PCMParserList.cpp') diff --git a/src/PCMParserList.cpp b/src/PCMParserList.cpp index 919a76e..09bd44c 100755 --- a/src/PCMParserList.cpp +++ b/src/PCMParserList.cpp @@ -30,9 +30,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include +#include #include using namespace ASDCP; +using namespace Kumu; ASDCP::ParserInstance::ParserInstance() : m_p(0), m_SampleSize(0) @@ -121,10 +123,28 @@ ASDCP::PCMParserList::OpenRead(ui32_t argc, const char** argv, Rational& Picture if ( ASDCP_SUCCESS(result) ) { if ( i == 0 ) - m_ADesc = I->ADesc; - + { + m_ADesc = I->ADesc; + } else - m_ADesc.BlockAlign += I->ADesc.BlockAlign; + { + if ( I->ADesc.AudioSamplingRate != m_ADesc.AudioSamplingRate ) + { + DefaultLogSink().Error("AudioSamplingRate mismatch in PCM parser list."); + return RESULT_FORMAT; + } + + if ( I->ADesc.QuantizationBits != m_ADesc.QuantizationBits ) + { + DefaultLogSink().Error("QuantizationBits mismatch in PCM parser list."); + return RESULT_FORMAT; + } + + if ( I->ADesc.ContainerDuration < m_ADesc.ContainerDuration ) + m_ADesc.ContainerDuration = I->ADesc.ContainerDuration; + + m_ADesc.BlockAlign += I->ADesc.BlockAlign; + } m_ChannelCount += I->ADesc.ChannelCount; } -- cgit v1.2.3