From 8fd602770d89acb171dbd878d8737ead85aa35d3 Mon Sep 17 00:00:00 2001 From: jhurst Date: Tue, 22 Nov 2016 17:58:19 +0000 Subject: o Added optional Generic Partition to IMF Aux Data prototype, used to carry global metadata o Added support for 192, 200 and 240 fps images, includes 96, 100 and 120 fpe stereo o Fixed raw essence detector for IMF Aux Data files o Added missing MCA properties to MCALabelSubDescriptor (contributed by Ruppel) o New MXF data type: LineMapPair o Added default 0,0 VideoLineMap value when wrapping CDCI with as-02-wrap o Added VideoLineMap property to GenericPictureEssenceDescriptor o Added timed text unwrap support to as-02-unwrap (contributed by Ruppel) --- src/AS_DCP_DCData.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'src/AS_DCP_DCData.cpp') diff --git a/src/AS_DCP_DCData.cpp b/src/AS_DCP_DCData.cpp index 208e852..818af2c 100644 --- a/src/AS_DCP_DCData.cpp +++ b/src/AS_DCP_DCData.cpp @@ -157,15 +157,18 @@ ASDCP::DCData::MXFReader::h__Reader::OpenRead(const std::string& filename) // check for sample/frame rate sanity if ( ASDCP_SUCCESS(result) - && m_DDesc.EditRate != EditRate_24 - && m_DDesc.EditRate != EditRate_25 - && m_DDesc.EditRate != EditRate_30 - && m_DDesc.EditRate != EditRate_48 - && m_DDesc.EditRate != EditRate_50 - && m_DDesc.EditRate != EditRate_60 - && m_DDesc.EditRate != EditRate_96 - && m_DDesc.EditRate != EditRate_100 - && m_DDesc.EditRate != EditRate_120 ) + && m_DDesc.EditRate != EditRate_24 + && m_DDesc.EditRate != EditRate_25 + && m_DDesc.EditRate != EditRate_30 + && m_DDesc.EditRate != EditRate_48 + && m_DDesc.EditRate != EditRate_50 + && m_DDesc.EditRate != EditRate_60 + && m_DDesc.EditRate != EditRate_96 + && m_DDesc.EditRate != EditRate_100 + && m_DDesc.EditRate != EditRate_120 + && m_DDesc.EditRate != EditRate_192 + && m_DDesc.EditRate != EditRate_200 + && m_DDesc.EditRate != EditRate_240 ) { DefaultLogSink().Error("DC Data file EditRate is not a supported value: %d/%d\n", // lu m_DDesc.EditRate.Numerator, m_DDesc.EditRate.Denominator); @@ -444,7 +447,10 @@ ASDCP::DCData::MXFWriter::h__Writer::SetSourceStream(DCDataDescriptor const& DDe && DDesc.EditRate != EditRate_60 && DDesc.EditRate != EditRate_96 && DDesc.EditRate != EditRate_100 - && DDesc.EditRate != EditRate_120 ) + && DDesc.EditRate != EditRate_120 + && DDesc.EditRate != EditRate_192 + && DDesc.EditRate != EditRate_200 + && DDesc.EditRate != EditRate_240 ) { DefaultLogSink().Error("DCDataDescriptor.EditRate is not a supported value: %d/%d\n", DDesc.EditRate.Numerator, DDesc.EditRate.Denominator); -- cgit v1.2.3