projects
/
asdcplib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install additional header file.
[asdcplib.git]
/
src
/
AS_DCP_PCM.cpp
diff --git
a/src/AS_DCP_PCM.cpp
b/src/AS_DCP_PCM.cpp
index 19ea3bb26f7c399d85ea6beaf6084bd15b96727d..e32445ba2462bcdb3929747e912067558b2f033d 100755
(executable)
--- a/
src/AS_DCP_PCM.cpp
+++ b/
src/AS_DCP_PCM.cpp
@@
-67,7
+67,8
@@
MD_to_PCM_ADesc(MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc)
ADesc.BlockAlign = ADescObj->BlockAlign;
ADesc.AvgBps = ADescObj->AvgBps;
ADesc.LinkedTrackID = ADescObj->LinkedTrackID;
ADesc.BlockAlign = ADescObj->BlockAlign;
ADesc.AvgBps = ADescObj->AvgBps;
ADesc.LinkedTrackID = ADescObj->LinkedTrackID;
- ADesc.ContainerDuration = ADescObj->ContainerDuration;
+ assert(ADescObj->ContainerDuration <= 0xFFFFFFFFL);
+ ADesc.ContainerDuration = (ui32_t) ADescObj->ContainerDuration;
return RESULT_OK;
}
return RESULT_OK;
}
@@
-450,14
+451,12
@@
ASDCP::PCM::MXFWriter::OpenWrite(const char* filename, const WriterInfo& Info,
const AudioDescriptor& ADesc, ui32_t HeaderSize)
{
m_Writer = new h__Writer;
const AudioDescriptor& ADesc, ui32_t HeaderSize)
{
m_Writer = new h__Writer;
+ m_Writer->m_Info = Info;
Result_t result = m_Writer->OpenWrite(filename, HeaderSize);
if ( ASDCP_SUCCESS(result) )
Result_t result = m_Writer->OpenWrite(filename, HeaderSize);
if ( ASDCP_SUCCESS(result) )
- {
- m_Writer->m_Info = Info;
- result = m_Writer->SetSourceStream(ADesc);
- }
+ result = m_Writer->SetSourceStream(ADesc);
if ( ASDCP_FAILURE(result) )
m_Writer.release();
if ( ASDCP_FAILURE(result) )
m_Writer.release();