/*
-Copyright (c) 2004-2006, John Hurst
+Copyright (c) 2004-2016, John Hurst
All rights reserved.
Redistribution and use in source and binary forms, with or without
#include "AS_DCP_internal.h"
#include <map>
+#include <iostream>
+#include <iomanip>
//------------------------------------------------------------------------------------------
//
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;
ADescObj->AvgBps = ADesc.AvgBps;
ADescObj->LinkedTrackID = ADesc.LinkedTrackID;
ADescObj->ContainerDuration = ADesc.ContainerDuration;
+
+ ADescObj->ChannelAssignment.get().Reset();
+
+ switch ( ADesc.ChannelFormat )
+ {
+ case PCM::CF_CFG_1:
+ ADescObj->ChannelAssignment = DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_1_5p1).ul;
+ break;
+
+ case PCM::CF_CFG_2:
+ ADescObj->ChannelAssignment = DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_2_6p1).ul;
+ break;
+
+ case PCM::CF_CFG_3:
+ 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;
+
+ case PCM::CF_CFG_6:
+ ADescObj->ChannelAssignment = DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_MCA).ul;
+ break;
+ }
+
return RESULT_OK;
}
//
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;
ADesc.BlockAlign = ADescObj->BlockAlign;
ADesc.AvgBps = ADescObj->AvgBps;
ADesc.LinkedTrackID = ADescObj->LinkedTrackID;
- ADesc.ContainerDuration = ADescObj->ContainerDuration;
+ assert(ADescObj->ContainerDuration <= 0xFFFFFFFFL);
+ ADesc.ContainerDuration = (ui32_t) ADescObj->ContainerDuration;
+
+ ADesc.ChannelFormat = PCM::CF_NONE;
+
+ if ( ! ADescObj->ChannelAssignment.empty() )
+ {
+ if ( ADescObj->ChannelAssignment == DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_1_5p1).ul )
+ ADesc.ChannelFormat = PCM::CF_CFG_1;
+
+ else if ( ADescObj->ChannelAssignment == DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_2_6p1).ul )
+ ADesc.ChannelFormat = PCM::CF_CFG_2;
+
+ 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;
+
+ else if ( ADescObj->ChannelAssignment == DefaultSMPTEDict().Type(MDD_DCAudioChannelCfg_MCA).ul )
+ ADesc.ChannelFormat = PCM::CF_CFG_6;
+ }
+
return RESULT_OK;
}
+//
+std::ostream&
+ASDCP::PCM::operator << (std::ostream& strm, const AudioDescriptor& ADesc)
+{
+ 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;
+ strm << " QuantizationBits: " << (unsigned) ADesc.QuantizationBits << std::endl;
+ strm << " BlockAlign: " << (unsigned) ADesc.BlockAlign << std::endl;
+ strm << " AvgBps: " << (unsigned) ADesc.AvgBps << std::endl;
+ strm << " LinkedTrackID: " << (unsigned) ADesc.LinkedTrackID << std::endl;
+ strm << " ContainerDuration: " << (unsigned) ADesc.ContainerDuration << std::endl;
+ strm << " ChannelFormat: ";
+ switch (ADesc.ChannelFormat)
+ {
+ case CF_NONE:
+ default:
+ strm << "No Channel Format";
+ break;
+
+ case CF_CFG_1:
+ strm << "Config 1 (5.1 with optional HI/VI)";
+ break;
+
+ case CF_CFG_2:
+ strm << "Config 2 (5.1 + center surround with optional HI/VI)";
+ break;
+
+ case CF_CFG_3:
+ strm << "Config 3 (7.1 with optional HI/VI)";
+ break;
+
+ case CF_CFG_4:
+ strm << "Config 4";
+ break;
+
+ case CF_CFG_5:
+ strm << "Config 5 (7.1 DS with optional HI/VI)";
+ break;
+
+ case CF_CFG_6:
+ strm << "Config 6 (ST 377-4 MCA)";
+ break;
+ }
+ strm << std::endl;
+
+ return strm;
+}
+
+//
void
ASDCP::PCM::AudioDescriptorDump(const AudioDescriptor& ADesc, FILE* stream)
{
stream = stderr;
fprintf(stream, "\
- SampleRate: %lu/%lu\n\
- AudioSamplingRate: %lu/%lu\n\
- Locked: %lu\n\
- ChannelCount: %lu\n\
- QuantizationBits: %lu\n\
- BlockAlign: %lu\n\
- AvgBps: %lu\n\
- LinkedTrackID: %lu\n\
- ContainerDuration: %lu\n",
- ADesc.SampleRate.Numerator ,ADesc.SampleRate.Denominator,
- ADesc.AudioSamplingRate.Numerator ,ADesc.AudioSamplingRate.Denominator,
+ EditRate: %d/%d\n\
+ AudioSamplingRate: %d/%d\n\
+ Locked: %u\n\
+ ChannelCount: %u\n\
+ QuantizationBits: %u\n\
+ BlockAlign: %u\n\
+ AvgBps: %u\n\
+ LinkedTrackID: %u\n\
+ ContainerDuration: %u\n\
+ ChannelFormat: %u\n",
+ ADesc.EditRate.Numerator, ADesc.EditRate.Denominator,
+ ADesc.AudioSamplingRate.Numerator, ADesc.AudioSamplingRate.Denominator,
ADesc.Locked,
ADesc.ChannelCount,
ADesc.QuantizationBits,
ADesc.BlockAlign,
ADesc.AvgBps,
ADesc.LinkedTrackID,
- ADesc.ContainerDuration
+ ADesc.ContainerDuration,
+ ADesc.ChannelFormat
);
}
//------------------------------------------------------------------------------------------
-class ASDCP::PCM::MXFReader::h__Reader : public ASDCP::h__Reader
+class ASDCP::PCM::MXFReader::h__Reader : public ASDCP::h__ASDCPReader
{
ASDCP_NO_COPY_CONSTRUCT(h__Reader);
+ h__Reader();
public:
AudioDescriptor m_ADesc;
- h__Reader() {}
- ~h__Reader() {}
- Result_t OpenRead(const char*);
+ h__Reader(const Dictionary& d) : ASDCP::h__ASDCPReader(d) {}
+ virtual ~h__Reader() {}
+ Result_t OpenRead(const std::string&);
Result_t ReadFrame(ui32_t, FrameBuffer&, AESDecContext*, HMACContext*);
};
//
//
ASDCP::Result_t
-ASDCP::PCM::MXFReader::h__Reader::OpenRead(const char* filename)
+ASDCP::PCM::MXFReader::h__Reader::OpenRead(const std::string& filename)
{
Result_t result = OpenMXFRead(filename);
if( ASDCP_SUCCESS(result) )
{
- InterchangeObject* Object;
+ InterchangeObject* Object = 0
+;
if ( ASDCP_SUCCESS(m_HeaderPart.GetMDObjectByType(OBJ_TYPE_ARGS(WaveAudioDescriptor), &Object)) )
{
- assert(Object);
+ if ( Object == 0 )
+ {
+ DefaultLogSink().Error("WaveAudioDescriptor object not found.\n");
+ return RESULT_FORMAT;
+ }
+
result = MD_to_PCM_ADesc((MXF::WaveAudioDescriptor*)Object, m_ADesc);
}
}
+ if ( m_ADesc.ContainerDuration == 0 )
+ {
+ DefaultLogSink().Error("ContainerDuration unset.\n");
+ return RESULT_FORMAT;
+ }
+
// check for sample/frame rate sanity
- if ( m_ADesc.SampleRate != EditRate_24
- && m_ADesc.SampleRate != EditRate_48
- && m_ADesc.SampleRate != EditRate_23_98 )
+ if ( ASDCP_SUCCESS(result)
+ && 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_192
+ && m_ADesc.EditRate != EditRate_200
+ && m_ADesc.EditRate != EditRate_240
+ && m_ADesc.EditRate != EditRate_16
+ && m_ADesc.EditRate != EditRate_18
+ && m_ADesc.EditRate != EditRate_20
+ && m_ADesc.EditRate != EditRate_22
+ && 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 || m_ADesc.EditRate == SampleRate_96k )
{
- 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
{
+ DefaultLogSink().Error("PCM EditRate not in expected value range.\n");
// or we just drop the hammer
return RESULT_FORMAT;
}
}
- if( ASDCP_SUCCESS(result) )
- result = InitMXFIndex();
-
- if( ASDCP_SUCCESS(result) )
- result = InitInfo();
-
// TODO: test file for sane CBR index BytesPerEditUnit
return result;
if ( ! m_File.IsOpen() )
return RESULT_INIT;
- return ReadEKLVPacket(FrameNum, FrameBuf, Dict::ul(MDD_WAVEssence), Ctx, HMAC);
+ if ( (FrameNum+1) > m_ADesc.ContainerDuration )
+ {
+ return RESULT_RANGE;
+ }
+
+ assert(m_Dict);
+ return ReadEKLVFrame(FrameNum, FrameBuf, m_Dict->ul(MDD_WAVEssence), Ctx, HMAC);
}
//------------------------------------------------------------------------------------------
if ( stream == 0 )
stream = stderr;
- fprintf(stream, "Frame: %06lu, %7lu bytes\n",
+ fprintf(stream, "Frame: %06u, %7u bytes\n",
m_FrameNumber, m_Size);
if ( dump_len )
- hexdump(m_Data, dump_len, stream);
+ Kumu::hexdump(m_Data, dump_len, stream);
}
//------------------------------------------------------------------------------------------
ASDCP::PCM::MXFReader::MXFReader()
{
- m_Reader = new h__Reader;
+ m_Reader = new h__Reader(DefaultCompositeDict());
}
m_Reader->Close();
}
+// Warning: direct manipulation of MXF structures can interfere
+// with the normal operation of the wrapper. Caveat emptor!
+//
+ASDCP::MXF::OP1aHeader&
+ASDCP::PCM::MXFReader::OP1aHeader()
+{
+ if ( m_Reader.empty() )
+ {
+ assert(g_OP1aHeader);
+ return *g_OP1aHeader;
+ }
+
+ 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_IndexAccess;
+}
+
+// Warning: direct manipulation of MXF structures can interfere
+// with the normal operation of the wrapper. Caveat emptor!
+//
+ASDCP::MXF::RIP&
+ASDCP::PCM::MXFReader::RIP()
+{
+ if ( m_Reader.empty() )
+ {
+ assert(g_RIP);
+ return *g_RIP;
+ }
+
+ return m_Reader->m_RIP;
+}
+
// Open the file for reading. The file must exist. Returns error if the
// operation cannot be completed.
ASDCP::Result_t
-ASDCP::PCM::MXFReader::OpenRead(const char* filename) const
+ASDCP::PCM::MXFReader::OpenRead(const std::string& filename) const
{
return m_Reader->OpenRead(filename);
}
}
+ASDCP::Result_t
+ASDCP::PCM::MXFReader::LocateFrame(ui32_t FrameNum, Kumu::fpos_t& streamOffset, i8_t& temporalOffset, i8_t& keyFrameOffset) const
+{
+ return m_Reader->LocateFrame(FrameNum, streamOffset, temporalOffset, keyFrameOffset);
+}
+
// Fill the struct with the values from the file's header.
// Returns RESULT_INIT if the file is not open.
ASDCP::Result_t
ASDCP::PCM::MXFReader::DumpIndex(FILE* stream) const
{
if ( m_Reader->m_File.IsOpen() )
- m_Reader->m_FooterPart.Dump(stream);
+ m_Reader->m_IndexAccess.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;
}
//------------------------------------------------------------------------------------------
//
-class ASDCP::PCM::MXFWriter::h__Writer : public ASDCP::h__Writer
+class ASDCP::PCM::MXFWriter::h__Writer : public ASDCP::h__ASDCPWriter
{
+ ASDCP_NO_COPY_CONSTRUCT(h__Writer);
+ h__Writer();
+
public:
AudioDescriptor m_ADesc;
byte_t m_EssenceUL[SMPTE_UL_LENGTH];
-
-
- ASDCP_NO_COPY_CONSTRUCT(h__Writer);
- h__Writer(){
+ h__Writer(const Dictionary& d) : ASDCP::h__ASDCPWriter(d) {
memset(m_EssenceUL, 0, SMPTE_UL_LENGTH);
}
- ~h__Writer(){}
+ virtual ~h__Writer(){}
- Result_t OpenWrite(const char*, ui32_t HeaderSize);
+ Result_t OpenWrite(const std::string&, ui32_t HeaderSize);
Result_t SetSourceStream(const AudioDescriptor&);
Result_t WriteFrame(const FrameBuffer&, AESEncContext* = 0, HMACContext* = 0);
Result_t Finalize();
// Open the file for writing. The file must not exist. Returns error if
// the operation cannot be completed.
ASDCP::Result_t
-ASDCP::PCM::MXFWriter::h__Writer::OpenWrite(const char* filename, ui32_t HeaderSize)
+ASDCP::PCM::MXFWriter::h__Writer::OpenWrite(const std::string& filename, ui32_t HeaderSize)
{
if ( ! m_State.Test_BEGIN() )
return RESULT_STATE;
if ( ASDCP_SUCCESS(result) )
{
m_HeaderSize = HeaderSize;
- m_EssenceDescriptor = new WaveAudioDescriptor;
+ m_EssenceDescriptor = new WaveAudioDescriptor(m_Dict);
result = m_State.Goto_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_192
+ && ADesc.EditRate != EditRate_200
+ && ADesc.EditRate != EditRate_240
+ && ADesc.EditRate != EditRate_16
+ && ADesc.EditRate != EditRate_18
+ && ADesc.EditRate != EditRate_20
+ && ADesc.EditRate != EditRate_22
+ && ADesc.EditRate != EditRate_23_98 )
{
- DefaultLogSink().Error("AudioDescriptor.SampleRate is not 24/1, 48/1 or 24000/1001: %lu/%lu\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;
}
- if ( ADesc.AudioSamplingRate != SampleRate_48k )
+ if ( ADesc.AudioSamplingRate != SampleRate_48k && ADesc.AudioSamplingRate != SampleRate_96k )
{
- DefaultLogSink().Error("AudioDescriptor.AudioSamplingRate is not 48000/1: %lu/%lu\n",
+ DefaultLogSink().Error("AudioDescriptor.AudioSamplingRate is not 48000/1 or 96000/1: %d/%d\n",
ADesc.AudioSamplingRate.Numerator, ADesc.AudioSamplingRate.Denominator);
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(Dict::ul(MDD_WAVWrapping)),
- SOUND_DEF_LABEL, UL(Dict::ul(MDD_SoundDataDef)),
- m_ADesc.SampleRate, 24 /* TCFrameRate */, calc_CBR_frame_size(m_Info, m_ADesc));
-
if ( ASDCP_SUCCESS(result) )
{
- memcpy(m_EssenceUL, 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) )
+ {
+ result = WriteASDCPHeader(PCM_PACKAGE_LABEL, UL(m_Dict->ul(MDD_WAVWrappingFrame)),
+ SOUND_DEF_LABEL, UL(m_EssenceUL), UL(m_Dict->ul(MDD_SoundDataDef)),
+ m_ADesc.EditRate, derive_timecode_rate_from_edit_rate(m_ADesc.EditRate),
+ calc_CBR_frame_size(m_Info, m_ADesc));
+ }
+
return result;
}
result = m_State.Goto_RUNNING(); // first time through
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) )
m_FramesWritten++;
m_State.Goto_FINAL();
- return WriteMXFFooter();
+ return WriteASDCPFooter();
}
{
}
+// Warning: direct manipulation of MXF structures can interfere
+// with the normal operation of the wrapper. Caveat emptor!
+//
+ASDCP::MXF::OP1aHeader&
+ASDCP::PCM::MXFWriter::OP1aHeader()
+{
+ if ( m_Writer.empty() )
+ {
+ assert(g_OP1aHeader);
+ return *g_OP1aHeader;
+ }
+
+ 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;
+}
+
+// Warning: direct manipulation of MXF structures can interfere
+// with the normal operation of the wrapper. Caveat emptor!
+//
+ASDCP::MXF::RIP&
+ASDCP::PCM::MXFWriter::RIP()
+{
+ if ( m_Writer.empty() )
+ {
+ assert(g_RIP);
+ return *g_RIP;
+ }
+
+ return m_Writer->m_RIP;
+}
// Open the file for writing. The file must not exist. Returns error if
// the operation cannot be completed.
ASDCP::Result_t
-ASDCP::PCM::MXFWriter::OpenWrite(const char* filename, const WriterInfo& Info,
+ASDCP::PCM::MXFWriter::OpenWrite(const std::string& filename, const WriterInfo& Info,
const AudioDescriptor& ADesc, ui32_t HeaderSize)
{
- m_Writer = new h__Writer;
+ if ( Info.LabelSetType == LS_MXF_SMPTE )
+ m_Writer = new h__Writer(DefaultSMPTEDict());
+ else
+ m_Writer = new h__Writer(DefaultInteropDict());
+
+ m_Writer->m_Info = Info;
Result_t result = m_Writer->OpenWrite(filename, HeaderSize);
if ( ASDCP_SUCCESS(result) )
- {
- m_Writer->m_Info = Info;
- result = m_Writer->SetSourceStream(ADesc);
- }
+ result = m_Writer->SetSourceStream(ADesc);
if ( ASDCP_FAILURE(result) )
m_Writer.release();
projects / asdcplib.git / blobdiff