diff options
| author | jhurst <jhurst@cinecert.com> | 2008-01-24 20:27:40 +0000 |
|---|---|---|
| committer | jhurst <> | 2008-01-24 20:27:40 +0000 |
| commit | 02d857e091a14b3310240ab6e07728e3d80913ab (patch) | |
| tree | e195355d1fba854407a2aa02a938253676dde4ed | |
| parent | b8fa41ca2227a7ebc7885c23c6c6b828f1761333 (diff) | |
tweaks - AbgBps, stereo image UL
| -rw-r--r-- | src/MDD.cpp | 4 | ||||
| -rwxr-xr-x | src/Wav.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/MDD.cpp b/src/MDD.cpp index a88fa81..c90a3ee 100644 --- a/src/MDD.cpp +++ b/src/MDD.cpp @@ -840,8 +840,8 @@ static const ASDCP::MDDEntry s_MDD_Table[] = { { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x02, // 268 0x01, 0x07, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00 }, {0x61, 0x02}, false, "DMSegment_TrackIDList" }, - { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x7f, 0x01, 0x01, // 269 - 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x71, 0x00 }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x0c, // 269 + 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x63, 0x00 }, {0}, false, "StereoscopicPictureSubDescriptor" }, { {0}, {0}, false, 0 } diff --git a/src/Wav.cpp b/src/Wav.cpp index c3d0a2b..2cfd73f 100755 --- a/src/Wav.cpp +++ b/src/Wav.cpp @@ -44,8 +44,8 @@ ASDCP::Wav::SimpleWaveHeader::SimpleWaveHeader(ASDCP::PCM::AudioDescriptor& ADes nchannels = ADesc.ChannelCount; bitspersample = ADesc.QuantizationBits; samplespersec = (ui32_t)ceil(ADesc.AudioSamplingRate.Quotient()); - avgbps = samplespersec * nchannels * ((bitspersample + 7) / 8); - blockalign = nchannels * ((bitspersample + 7) / 8); + blockalign = nchannels * (bitspersample / 8); + avgbps = samplespersec * blockalign; cbsize = 0; data_len = ASDCP::PCM::CalcFrameBufferSize(ADesc) * ADesc.ContainerDuration; } @@ -265,7 +265,7 @@ ASDCP::AIFF::SimpleAIFFHeader::FillADesc(ASDCP::PCM::AudioDescriptor& ADesc, ASD ADesc.AudioSamplingRate = extended_to_Rat(sampleRate); ADesc.QuantizationBits = sampleSize; ADesc.BlockAlign = sampleSize / 8; - ADesc.AvgBps = ADesc.BlockAlign * (ui32_t)ceil(ADesc.AudioSamplingRate.Quotient()); + ADesc.AvgBps = ADesc.BlockAlign * ADesc.AudioSamplingRate.Quotient(); ui32_t FrameBufferSize = ASDCP::PCM::CalcFrameBufferSize(ADesc); ADesc.ContainerDuration = data_len / FrameBufferSize; } |