diff options
| author | jhurst <jhurst@cinecert.com> | 2008-03-12 06:55:03 +0000 |
|---|---|---|
| committer | jhurst <> | 2008-03-12 06:55:03 +0000 |
| commit | ff0838d01bd6c75b5e28a6f2d25d549ba7ca6388 (patch) | |
| tree | b17ff11212063036205c90fd7ea429c89f2b67ba /src | |
| parent | 6a5f65b2430d72c593a5ba5aa82c374848ae26a8 (diff) | |
fixed AvgBps in PCM files
Diffstat (limited to 'src')
| -rwxr-xr-x | src/AS_DCP.h | 2 | ||||
| -rwxr-xr-x | src/AS_DCP_PCM.cpp | 6 | ||||
| -rwxr-xr-x | src/PCMParserList.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/AS_DCP.h b/src/AS_DCP.h index 1647f1e..e03557a 100755 --- a/src/AS_DCP.h +++ b/src/AS_DCP.h @@ -156,7 +156,7 @@ namespace ASDCP { // 1.0.1. If changes were also required in AS_DCP.h, the new version would be 1.1.1. const ui32_t VERSION_MAJOR = 1; const ui32_t VERSION_APIMINOR = 3; - const ui32_t VERSION_IMPMINOR = 18; + const ui32_t VERSION_IMPMINOR = 19; const char* Version(); // UUIDs are passed around as strings of UUIDlen bytes diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp index e32445b..5e03d1d 100755 --- a/src/AS_DCP_PCM.cpp +++ b/src/AS_DCP_PCM.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2004-2006, John Hurst +Copyright (c) 2004-2008, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -370,9 +370,9 @@ ASDCP::PCM::MXFWriter::h__Writer::SetSourceStream(const AudioDescriptor& ADesc) return RESULT_RAW_FORMAT; } - if ( ADesc.AudioSamplingRate != SampleRate_48k ) + if ( ADesc.AudioSamplingRate != SampleRate_48k && ADesc.AudioSamplingRate != SampleRate_96k ) { - DefaultLogSink().Error("AudioDescriptor.AudioSamplingRate is not 48000/1: %d/%d\n", + DefaultLogSink().Error("AudioDescriptor.AudioSamplingRate is not 48000/1 or 96000/1: %d/%d\n", ADesc.AudioSamplingRate.Numerator, ADesc.AudioSamplingRate.Denominator); return RESULT_RAW_FORMAT; } diff --git a/src/PCMParserList.cpp b/src/PCMParserList.cpp index 2679162..8d80752 100755 --- a/src/PCMParserList.cpp +++ b/src/PCMParserList.cpp @@ -125,7 +125,6 @@ ASDCP::PCMParserList::OpenRead(ui32_t argc, const char** argv, Rational& Picture else m_ADesc.BlockAlign += I->ADesc.BlockAlign; - // result = I->CmpADesc(m_ADesc); m_ChannelCount += I->ADesc.ChannelCount; } @@ -138,7 +137,8 @@ ASDCP::PCMParserList::OpenRead(ui32_t argc, const char** argv, Rational& Picture } m_ADesc.ChannelCount = m_ChannelCount; - + m_ADesc.AvgBps = m_ADesc.AvgBps * m_ChannelCount; + if ( ASDCP_FAILURE(result) ) clear(); |