projects
/
asdcplib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
versioon roll
[asdcplib.git]
/
src
/
AS_DCP_JP2K.cpp
diff --git
a/src/AS_DCP_JP2K.cpp
b/src/AS_DCP_JP2K.cpp
index 86327c283fc52cae465c84c7c4fba06fb5532662..51cc0178745be7309ff03cc49f3ef125cef64492 100755
(executable)
--- a/
src/AS_DCP_JP2K.cpp
+++ b/
src/AS_DCP_JP2K.cpp
@@
-1,5
+1,5
@@
/*
/*
-Copyright (c) 2004-20
09
, John Hurst
+Copyright (c) 2004-20
10
, John Hurst
All rights reserved.
Redistribution and use in source and binary forms, with or without
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@
-834,11
+834,6
@@
lh__Writer::SetSourceStream(const PictureDescriptor& PDesc, const std::string& l
m_PDesc = PDesc;
Result_t result = JP2K_PDesc_to_MD(m_PDesc);
m_PDesc = PDesc;
Result_t result = JP2K_PDesc_to_MD(m_PDesc);
- if ( ASDCP_SUCCESS(result) )
- result = WriteMXFHeader(label, UL(m_Dict->ul(MDD_JPEG_2000Wrapping)),
- PICT_DEF_LABEL, UL(m_Dict->ul(MDD_PictureDataDef)),
- LocalEditRate, 24 /* TCFrameRate */);
-
if ( ASDCP_SUCCESS(result) )
{
memcpy(m_EssenceUL, m_Dict->ul(MDD_JPEG2000Essence), SMPTE_UL_LENGTH);
if ( ASDCP_SUCCESS(result) )
{
memcpy(m_EssenceUL, m_Dict->ul(MDD_JPEG2000Essence), SMPTE_UL_LENGTH);
@@
-846,6
+841,11
@@
lh__Writer::SetSourceStream(const PictureDescriptor& PDesc, const std::string& l
result = m_State.Goto_READY();
}
result = m_State.Goto_READY();
}
+ if ( ASDCP_SUCCESS(result) )
+ result = WriteMXFHeader(label, UL(m_Dict->ul(MDD_JPEG_2000Wrapping)),
+ PICT_DEF_LABEL, UL(m_EssenceUL), UL(m_Dict->ul(MDD_PictureDataDef)),
+ LocalEditRate, 24 /* TCFrameRate */);
+
return result;
}
return result;
}