/*
-Copyright (c) 2004-2009, John Hurst
+Copyright (c) 2004-2012, John Hurst
All rights reserved.
Redistribution and use in source and binary forms, with or without
static std::string PCM_PACKAGE_LABEL = "File Package: SMPTE 382M frame wrapping of wave audio";
static std::string SOUND_DEF_LABEL = "Sound Track";
-static byte_t SNDFMT_CFG_1_UL[16] = { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0b,
- 0x04, 0x02, 0x02, 0x10, 0x03, 0x01, 0x01, 0x00 };
-
-static byte_t SNDFMT_CFG_2_UL[16] = { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0b,
- 0x04, 0x02, 0x02, 0x10, 0x03, 0x01, 0x02, 0x00 };
-
-static byte_t SNDFMT_CFG_3_UL[16] = { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0b,
- 0x04, 0x02, 0x02, 0x10, 0x03, 0x01, 0x03, 0x00 };
-
//
Result_t
-PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, MXF::WaveAudioDescriptor* ADescObj)
+ASDCP::PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, MXF::WaveAudioDescriptor* ADescObj)
{
ASDCP_TEST_NULL(ADescObj);
- ADescObj->SampleRate = ADesc.SampleRate;
+ ADescObj->SampleRate = ADesc.EditRate;
ADescObj->AudioSamplingRate = ADesc.AudioSamplingRate;
ADescObj->Locked = ADesc.Locked;
ADescObj->ChannelCount = ADesc.ChannelCount;
switch ( ADesc.ChannelFormat )
{
case PCM::CF_CFG_1:
- ADescObj->ChannelAssignment = UL(SNDFMT_CFG_1_UL);
+ ADescObj->ChannelAssignment = DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_1_5p1).ul;
break;
case PCM::CF_CFG_2:
- ADescObj->ChannelAssignment = UL(SNDFMT_CFG_2_UL);
+ ADescObj->ChannelAssignment = DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_2_6p1).ul;
break;
case PCM::CF_CFG_3:
- ADescObj->ChannelAssignment = UL(SNDFMT_CFG_3_UL);
+ ADescObj->ChannelAssignment = DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_3_7p1).ul;
+ break;
+
+ case PCM::CF_CFG_4:
+ ADescObj->ChannelAssignment = DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_4_WTF).ul;
+ break;
+
+ case PCM::CF_CFG_5:
+ ADescObj->ChannelAssignment = DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_5_7p1_DS).ul;
break;
}
//
ASDCP::Result_t
-MD_to_PCM_ADesc(MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc)
+ASDCP::MD_to_PCM_ADesc(MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc)
{
ASDCP_TEST_NULL(ADescObj);
- ADesc.SampleRate = ADescObj->SampleRate;
+ ADesc.EditRate = ADescObj->SampleRate;
ADesc.AudioSamplingRate = ADescObj->AudioSamplingRate;
ADesc.Locked = ADescObj->Locked;
ADesc.ChannelCount = ADescObj->ChannelCount;
if ( ADescObj->ChannelAssignment.HasValue() )
{
- if ( ADescObj->ChannelAssignment == UL(SNDFMT_CFG_1_UL) )
+ if ( ADescObj->ChannelAssignment == DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_1_5p1).ul )
ADesc.ChannelFormat = PCM::CF_CFG_1;
- else if ( ADescObj->ChannelAssignment == UL(SNDFMT_CFG_2_UL) )
+ else if ( ADescObj->ChannelAssignment == DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_2_6p1).ul )
ADesc.ChannelFormat = PCM::CF_CFG_2;
- else if ( ADescObj->ChannelAssignment == UL(SNDFMT_CFG_3_UL) )
+ else if ( ADescObj->ChannelAssignment == DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_3_7p1).ul )
ADesc.ChannelFormat = PCM::CF_CFG_3;
+
+ else if ( ADescObj->ChannelAssignment == DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_4_WTF).ul )
+ ADesc.ChannelFormat = PCM::CF_CFG_4;
+
+ else if ( ADescObj->ChannelAssignment == DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_5_7p1_DS).ul )
+ ADesc.ChannelFormat = PCM::CF_CFG_5;
}
return RESULT_OK;
std::ostream&
ASDCP::PCM::operator << (std::ostream& strm, const AudioDescriptor& ADesc)
{
- strm << " SampleRate: " << ADesc.SampleRate.Numerator << "/" << ADesc.SampleRate.Denominator << std::endl;
+ strm << " SampleRate: " << ADesc.EditRate.Numerator << "/" << ADesc.EditRate.Denominator << std::endl;
strm << " AudioSamplingRate: " << ADesc.AudioSamplingRate.Numerator << "/" << ADesc.AudioSamplingRate.Denominator << std::endl;
strm << " Locked: " << (unsigned) ADesc.Locked << std::endl;
strm << " ChannelCount: " << (unsigned) ADesc.ChannelCount << std::endl;
stream = stderr;
fprintf(stream, "\
- SampleRate: %d/%d\n\
+ EditRate: %d/%d\n\
AudioSamplingRate: %d/%d\n\
Locked: %u\n\
ChannelCount: %u\n\
AvgBps: %u\n\
LinkedTrackID: %u\n\
ContainerDuration: %u\n",
- ADesc.SampleRate.Numerator ,ADesc.SampleRate.Denominator,
- ADesc.AudioSamplingRate.Numerator ,ADesc.AudioSamplingRate.Denominator,
+ ADesc.EditRate.Numerator, ADesc.EditRate.Denominator,
+ ADesc.AudioSamplingRate.Numerator, ADesc.AudioSamplingRate.Denominator,
ADesc.Locked,
ADesc.ChannelCount,
ADesc.QuantizationBits,
// check for sample/frame rate sanity
if ( ASDCP_SUCCESS(result)
- && m_ADesc.SampleRate != EditRate_24
- && m_ADesc.SampleRate != EditRate_48
- && m_ADesc.SampleRate != EditRate_23_98 )
+ && m_ADesc.EditRate != EditRate_24
+ && m_ADesc.EditRate != EditRate_25
+ && m_ADesc.EditRate != EditRate_30
+ && m_ADesc.EditRate != EditRate_48
+ && m_ADesc.EditRate != EditRate_50
+ && m_ADesc.EditRate != EditRate_60
+ && m_ADesc.EditRate != EditRate_96
+ && m_ADesc.EditRate != EditRate_100
+ && m_ADesc.EditRate != EditRate_120
+ && m_ADesc.EditRate != EditRate_23_98 )
{
- DefaultLogSink().Error("PCM file SampleRate is not 24/1, 48/1 or 24000/1001: %08x/%08x\n", // lu
- m_ADesc.SampleRate.Numerator, m_ADesc.SampleRate.Denominator);
+ DefaultLogSink().Error("PCM file EditRate is not a supported value: %d/%d\n", // lu
+ m_ADesc.EditRate.Numerator, m_ADesc.EditRate.Denominator);
// oh, they gave us the audio sampling rate instead, assume 24/1
- if ( m_ADesc.SampleRate == SampleRate_48k )
+ if ( m_ADesc.EditRate == SampleRate_48k )
{
- DefaultLogSink().Warn("adjusting SampleRate to 24/1\n");
- m_ADesc.SampleRate.Numerator = 24;
- m_ADesc.SampleRate.Denominator = 1;
+ DefaultLogSink().Warn("adjusting EditRate to 24/1\n");
+ m_ADesc.EditRate = EditRate_24;
}
else
{
if ( ! m_File.IsOpen() )
return RESULT_INIT;
- return ReadEKLVFrame(FrameNum, FrameBuf, m_Dict.ul(MDD_WAVEssence), Ctx, HMAC);
+ assert(m_Dict);
+ return ReadEKLVFrame(FrameNum, FrameBuf, m_Dict->ul(MDD_WAVEssence), Ctx, HMAC);
}
//------------------------------------------------------------------------------------------
m_Reader->Close();
}
+// Warning: direct manipulation of MXF structures can interfere
+// with the normal operation of the wrapper. Caveat emptor!
+//
+ASDCP::MXF::OPAtomHeader&
+ASDCP::PCM::MXFReader::OPAtomHeader()
+{
+ if ( m_Reader.empty() )
+ {
+ assert(g_OPAtomHeader);
+ return *g_OPAtomHeader;
+ }
+
+ return m_Reader->m_HeaderPart;
+}
+
+// Warning: direct manipulation of MXF structures can interfere
+// with the normal operation of the wrapper. Caveat emptor!
+//
+ASDCP::MXF::OPAtomIndexFooter&
+ASDCP::PCM::MXFReader::OPAtomIndexFooter()
+{
+ if ( m_Reader.empty() )
+ {
+ assert(g_OPAtomIndexFooter);
+ return *g_OPAtomIndexFooter;
+ }
+
+ return m_Reader->m_FooterPart;
+}
+
// Open the file for reading. The file must exist. Returns error if the
// operation cannot be completed.
ASDCP::Result_t
m_Reader->m_FooterPart.Dump(stream);
}
+//
+ASDCP::Result_t
+ASDCP::PCM::MXFReader::Close() const
+{
+ if ( m_Reader && m_Reader->m_File.IsOpen() )
+ {
+ m_Reader->Close();
+ return RESULT_OK;
+ }
+
+ return RESULT_INIT;
+}
+
//------------------------------------------------------------------------------------------
if ( ! m_State.Test_INIT() )
return RESULT_STATE;
- if ( ADesc.SampleRate != EditRate_24
- && ADesc.SampleRate != EditRate_48
- && ADesc.SampleRate != EditRate_23_98 )
+ if ( ADesc.EditRate != EditRate_24
+ && ADesc.EditRate != EditRate_25
+ && ADesc.EditRate != EditRate_30
+ && ADesc.EditRate != EditRate_48
+ && ADesc.EditRate != EditRate_50
+ && ADesc.EditRate != EditRate_60
+ && ADesc.EditRate != EditRate_96
+ && ADesc.EditRate != EditRate_100
+ && ADesc.EditRate != EditRate_120
+ && ADesc.EditRate != EditRate_23_98 )
{
- DefaultLogSink().Error("AudioDescriptor.SampleRate is not 24/1, 48/1 or 24000/1001: %d/%d\n",
- ADesc.SampleRate.Numerator, ADesc.SampleRate.Denominator);
+ DefaultLogSink().Error("AudioDescriptor.EditRate is not a supported value: %d/%d\n",
+ ADesc.EditRate.Numerator, ADesc.EditRate.Denominator);
return RESULT_RAW_FORMAT;
}
return RESULT_RAW_FORMAT;
}
+ assert(m_Dict);
m_ADesc = ADesc;
+
Result_t result = PCM_ADesc_to_MD(m_ADesc, (WaveAudioDescriptor*)m_EssenceDescriptor);
- if ( ASDCP_SUCCESS(result) )
- result = WriteMXFHeader(PCM_PACKAGE_LABEL, UL(m_Dict.ul(MDD_WAVWrapping)),
- SOUND_DEF_LABEL, UL(m_Dict.ul(MDD_SoundDataDef)),
- m_ADesc.SampleRate, 24 /* TCFrameRate */, calc_CBR_frame_size(m_Info, m_ADesc));
-
if ( ASDCP_SUCCESS(result) )
{
- memcpy(m_EssenceUL, m_Dict.ul(MDD_WAVEssence), SMPTE_UL_LENGTH);
+ memcpy(m_EssenceUL, m_Dict->ul(MDD_WAVEssence), SMPTE_UL_LENGTH);
m_EssenceUL[SMPTE_UL_LENGTH-1] = 1; // first (and only) essence container
result = m_State.Goto_READY();
}
+ if ( ASDCP_SUCCESS(result) )
+ {
+ ui32_t TCFrameRate = ( m_ADesc.EditRate == EditRate_23_98 ) ? 24 : m_ADesc.EditRate.Numerator;
+
+ result = WriteMXFHeader(PCM_PACKAGE_LABEL, UL(m_Dict->ul(MDD_WAVWrapping)),
+ SOUND_DEF_LABEL, UL(m_EssenceUL), UL(m_Dict->ul(MDD_SoundDataDef)),
+ m_ADesc.EditRate, TCFrameRate, calc_CBR_frame_size(m_Info, m_ADesc));
+ }
+
return result;
}
{
}
+// Warning: direct manipulation of MXF structures can interfere
+// with the normal operation of the wrapper. Caveat emptor!
+//
+ASDCP::MXF::OPAtomHeader&
+ASDCP::PCM::MXFWriter::OPAtomHeader()
+{
+ if ( m_Writer.empty() )
+ {
+ assert(g_OPAtomHeader);
+ return *g_OPAtomHeader;
+ }
+
+ return m_Writer->m_HeaderPart;
+}
+
+// Warning: direct manipulation of MXF structures can interfere
+// with the normal operation of the wrapper. Caveat emptor!
+//
+ASDCP::MXF::OPAtomIndexFooter&
+ASDCP::PCM::MXFWriter::OPAtomIndexFooter()
+{
+ if ( m_Writer.empty() )
+ {
+ assert(g_OPAtomIndexFooter);
+ return *g_OPAtomIndexFooter;
+ }
+
+ return m_Writer->m_FooterPart;
+}
// Open the file for writing. The file must not exist. Returns error if
// the operation cannot be completed.
projects / asdcplib.git / blobdiff