diff options
| author | jhurst <jhurst@cinecert.com> | 2016-12-01 20:12:38 +0000 |
|---|---|---|
| committer | jhurst <> | 2016-12-01 20:12:38 +0000 |
| commit | c87b3d28b21c927561606cc65a25b47aebc69355 (patch) | |
| tree | cc54031828cc2f244291ed49ea0c21efcb9416d5 /src/AS_02_JP2K.cpp | |
| parent | 8fd602770d89acb171dbd878d8737ead85aa35d3 (diff) | |
o Cleared up MXFGCP1FrameWrappedPictureElement / MXFGCP1FrameWrappedPictureElement
ambiguity. PHDR continues to use MXFGCP1FrameWrappedPictureElement.
MXFGCI1FrameWrappedPictureElement is supported for interlace.
o Added prototype PIDM dynamic metadata wrapping, config with --enable-phdr
Diffstat (limited to 'src/AS_02_JP2K.cpp')
| -rw-r--r-- | src/AS_02_JP2K.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/AS_02_JP2K.cpp b/src/AS_02_JP2K.cpp index b553da3..ffb40a9 100644 --- a/src/AS_02_JP2K.cpp +++ b/src/AS_02_JP2K.cpp @@ -350,7 +350,18 @@ AS_02::JP2K::MXFWriter::h__Writer::SetSourceStream(const std::string& label, con if ( KM_SUCCESS(result) ) { - result = WriteAS02Header(label, UL(m_Dict->ul(MDD_JPEG_2000WrappingFrame)), + UL wrapping_label = UL(m_Dict->ul(MDD_MXFGCP1FrameWrappedPictureElement)); + + CDCIEssenceDescriptor *cdci_descriptor = dynamic_cast<CDCIEssenceDescriptor*>(m_EssenceDescriptor); + if ( cdci_descriptor ) + { + if ( cdci_descriptor->FrameLayout ) // 0 == progressive, 1 == interlace + { + wrapping_label = UL(m_Dict->ul(MDD_MXFGCI1FrameWrappedPictureElement)); + } + } + + result = WriteAS02Header(label, wrapping_label, PICT_DEF_LABEL, UL(m_EssenceUL), UL(m_Dict->ul(MDD_PictureDataDef)), edit_rate, derive_timecode_rate_from_edit_rate(edit_rate)); |