class ASDCP::ATMOS::MXFReader::h__Reader : public ASDCP::h__ASDCPReader
{
- MXF::DCDataDescriptor* m_EssenceDescriptor;
+ MXF::PrivateDCDataDescriptor* m_EssenceDescriptor;
MXF::DolbyAtmosSubDescriptor* m_EssenceSubDescriptor;
KM_NO_COPY_CONSTRUCT(h__Reader);
ASDCP::ATMOS::MXFReader::h__Reader::MD_to_DCData_DDesc(ASDCP::DCData::DCDataDescriptor& DDesc)
{
ASDCP_TEST_NULL(m_EssenceDescriptor);
- MXF::DCDataDescriptor* DDescObj = m_EssenceDescriptor;
+ MXF::PrivateDCDataDescriptor* DDescObj = m_EssenceDescriptor;
DDesc.EditRate = DDescObj->SampleRate;
assert(DDescObj->ContainerDuration <= 0xFFFFFFFFL);
DDesc.ContainerDuration = static_cast<ui32_t>(DDescObj->ContainerDuration);
if ( KM_SUCCESS(result) )
{
InterchangeObject* iObj = 0;
- result = m_HeaderPart.GetMDObjectByType(OBJ_TYPE_ARGS(DolbyAtmosDCDataDescriptor), &iObj);
+ result = m_HeaderPart.GetMDObjectByType(OBJ_TYPE_ARGS(PrivateDCDataDescriptor), &iObj);
if ( KM_SUCCESS(result) )
{
- m_EssenceDescriptor = static_cast<MXF::DCDataDescriptor*>(iObj);
+ m_EssenceDescriptor = static_cast<MXF::PrivateDCDataDescriptor*>(iObj);
}
}
if ( m_EssenceDescriptor == 0 )
{
- DefaultLogSink().Error("DCDataDescriptor object not found.\n");
+ DefaultLogSink().Error("DCDataDescriptor object not found in Atmos file.\n");
result = RESULT_FORMAT;
}
// 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);
return RESULT_INIT;
assert(m_Dict);
- return ReadEKLVFrame(FrameNum, FrameBuf, m_Dict->ul(MDD_DolbyAtmosDCDataEssence), Ctx, HMAC);
+ return ReadEKLVFrame(FrameNum, FrameBuf, m_Dict->ul(MDD_PrivateDCDataEssence), Ctx, HMAC);
}
ASDCP::ATMOS::MXFReader::MXFReader()
{
- m_Reader = new h__Reader(DefaultSMPTEDict());
+ m_Reader = new h__Reader(AtmosSMPTEDict());
}
ASDCP::ATMOS::MXFWriter::h__Writer::DCData_DDesc_to_MD(ASDCP::DCData::DCDataDescriptor& DDesc)
{
ASDCP_TEST_NULL(m_EssenceDescriptor);
- MXF::DCDataDescriptor* DDescObj = static_cast<MXF::DCDataDescriptor *>(m_EssenceDescriptor);
+ MXF::PrivateDCDataDescriptor* DDescObj = static_cast<MXF::PrivateDCDataDescriptor *>(m_EssenceDescriptor);
DDescObj->SampleRate = DDesc.EditRate;
DDescObj->ContainerDuration = DDesc.ContainerDuration;
- DDescObj->DataEssenceCoding.Set(DDesc.DataEssenceCoding);
-
+ DDescObj->DataEssenceCoding.Set(DDesc.DataEssenceCoding);
return RESULT_OK;
}
if ( ASDCP_SUCCESS(result) )
{
m_HeaderSize = HeaderSize;
- m_EssenceDescriptor = new MXF::DCDataDescriptor(m_Dict);
+ m_EssenceDescriptor = new MXF::PrivateDCDataDescriptor(m_Dict);
m_EssenceSubDescriptor = new DolbyAtmosSubDescriptor(m_Dict);
SubDescriptorList_t subDescriptors;
subDescriptors.push_back(m_EssenceSubDescriptor);
&& 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);
if ( ASDCP_SUCCESS(result) )
{
- memcpy(m_EssenceUL, m_Dict->ul(MDD_DolbyAtmosDCDataEssence), SMPTE_UL_LENGTH);
+ memcpy(m_EssenceUL, m_Dict->ul(MDD_PrivateDCDataEssence), SMPTE_UL_LENGTH);
m_EssenceUL[SMPTE_UL_LENGTH-1] = 1; // first (and only) essence container
result = m_State.Goto_READY();
}
{
ui32_t TCFrameRate = m_DDesc.EditRate.Numerator;
- result = WriteASDCPHeader(packageLabel, UL(m_Dict->ul(MDD_DolbyAtmosDCDataWrappingFrame)),
+ result = WriteASDCPHeader(packageLabel, UL(m_Dict->ul(MDD_PrivateDCDataWrappingFrame)),
defLabel, UL(m_EssenceUL), UL(m_Dict->ul(MDD_DataDataDef)),
m_DDesc.EditRate, TCFrameRate);
}
ui64_t StreamOffset = m_StreamOffset;
if ( ASDCP_SUCCESS(result) )
- result = WriteEKLVPacket(FrameBuf, m_EssenceUL, Ctx, HMAC);
+ result = WriteEKLVPacket(FrameBuf, m_EssenceUL, MXF_BER_LENGTH, Ctx, HMAC);
if ( ASDCP_SUCCESS(result) )
{
return RESULT_FORMAT;
}
- m_Writer = new h__Writer(DefaultSMPTEDict());
+ m_Writer = new h__Writer(AtmosSMPTEDict());
m_Writer->m_Info = Info;
Result_t result = m_Writer->OpenWrite(filename, HeaderSize, ADesc);