/*
-Copyright (c) 2004-2005, John Hurst
+Copyright (c) 2004-2008, John Hurst
All rights reserved.
Redistribution and use in source and binary forms, with or without
*/
#include "AS_DCP_internal.h"
-#include "MDD.h"
-#include <stdio.h>
-#include <stdarg.h>
#include <map>
+#include <iostream>
+#include <iomanip>
//------------------------------------------------------------------------------------------
+static std::string PCM_PACKAGE_LABEL = "File Package: SMPTE 382M frame wrapping of wave audio";
+static std::string SOUND_DEF_LABEL = "Sound Track";
+
+//
+Result_t
+PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, MXF::WaveAudioDescriptor* ADescObj)
+{
+ ASDCP_TEST_NULL(ADescObj);
+ ADescObj->SampleRate = ADesc.SampleRate;
+ ADescObj->AudioSamplingRate = ADesc.AudioSamplingRate;
+ ADescObj->Locked = ADesc.Locked;
+ ADescObj->ChannelCount = ADesc.ChannelCount;
+ ADescObj->QuantizationBits = ADesc.QuantizationBits;
+ ADescObj->BlockAlign = ADesc.BlockAlign;
+ ADescObj->AvgBps = ADesc.AvgBps;
+ ADescObj->LinkedTrackID = ADesc.LinkedTrackID;
+ ADescObj->ContainerDuration = ADesc.ContainerDuration;
+ return RESULT_OK;
+}
+
//
ASDCP::Result_t
-ASDCP::MD_to_PCM_ADesc(MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc)
+MD_to_PCM_ADesc(MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc)
{
ASDCP_TEST_NULL(ADescObj);
ADesc.SampleRate = ADescObj->SampleRate;
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;
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 << " 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;
+
+ 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",
+ SampleRate: %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",
ADesc.SampleRate.Numerator ,ADesc.SampleRate.Denominator,
ADesc.AudioSamplingRate.Numerator ,ADesc.AudioSamplingRate.Denominator,
ADesc.Locked,
if ( Info.EncryptedEssence )
{
CBR_frame_size =
- klv_key_size
- + klv_length_size
+ SMPTE_UL_LENGTH
+ + MXF_BER_LENGTH
+ klv_cryptinfo_size
+ calc_esv_length(ASDCP::PCM::CalcFrameBufferSize(ADesc), 0)
- + ( Info.UsesHMAC ? klv_intpack_size : (klv_length_size * 3) );
+ + ( Info.UsesHMAC ? klv_intpack_size : (MXF_BER_LENGTH * 3) );
}
else
{
- CBR_frame_size = ASDCP::PCM::CalcFrameBufferSize(ADesc) + klv_key_size + klv_length_size;
+ CBR_frame_size = ASDCP::PCM::CalcFrameBufferSize(ADesc) + SMPTE_UL_LENGTH + MXF_BER_LENGTH;
}
return CBR_frame_size;
}
// check for sample/frame rate sanity
- if ( m_ADesc.SampleRate != EditRate_24
+ if ( ASDCP_SUCCESS(result)
+ && m_ADesc.SampleRate != EditRate_24
&& m_ADesc.SampleRate != EditRate_48
&& m_ADesc.SampleRate != EditRate_23_98 )
{
result = InitMXFIndex();
if( ASDCP_SUCCESS(result) )
- result = InitInfo(m_Info);
+ result = InitInfo();
// TODO: test file for sane CBR index BytesPerEditUnit
if ( ! m_File.IsOpen() )
return RESULT_INIT;
- return ReadEKLVPacket(FrameNum, FrameBuf, WAVEssenceUL_Data, Ctx, HMAC);
+ return ReadEKLVFrame(FrameNum, FrameBuf, 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);
}
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------
-#if 0
//
class ASDCP::PCM::MXFWriter::h__Writer : public ASDCP::h__Writer
{
public:
AudioDescriptor m_ADesc;
+ byte_t m_EssenceUL[SMPTE_UL_LENGTH];
+
ASDCP_NO_COPY_CONSTRUCT(h__Writer);
- h__Writer(){}
+ h__Writer(){
+ memset(m_EssenceUL, 0, SMPTE_UL_LENGTH);
+ }
+
~h__Writer(){}
Result_t OpenWrite(const char*, ui32_t HeaderSize);
if ( ! m_State.Test_BEGIN() )
return RESULT_STATE;
- m_File = new MXFFile;
-
Result_t result = m_File.OpenWrite(filename);
if ( ASDCP_SUCCESS(result) )
{
- m_EssenceDescriptor = new MDObject("WaveAudioDescriptor");
+ m_HeaderSize = HeaderSize;
+ m_EssenceDescriptor = new WaveAudioDescriptor;
result = m_State.Goto_INIT();
}
&& ADesc.SampleRate != EditRate_48
&& ADesc.SampleRate != EditRate_23_98 )
{
- DefaultLogSink().Error("AudioDescriptor.SampleRate is not 24/1, 48/1 or 24000/1001: %lu/%lu\n",
+ DefaultLogSink().Error("AudioDescriptor.SampleRate is not 24/1, 48/1 or 24000/1001: %d/%d\n",
ADesc.SampleRate.Numerator, ADesc.SampleRate.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;
}
m_ADesc = ADesc;
- Result_t result = PCM_ADesc_to_MD(m_ADesc, *m_EssenceDescriptor);
+ Result_t result = PCM_ADesc_to_MD(m_ADesc, (WaveAudioDescriptor*)m_EssenceDescriptor);
if ( ASDCP_SUCCESS(result) )
- {
- result = WriteMXFHeader(ESS_PCM_24b_48k, m_ADesc.SampleRate,
- 24 /* TCFrameRate */, calc_CBR_frame_size(m_Info, m_ADesc));
- }
+ 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) )
- result = m_State.Goto_READY();
+ {
+ memcpy(m_EssenceUL, Dict::ul(MDD_WAVEssence), SMPTE_UL_LENGTH);
+ m_EssenceUL[SMPTE_UL_LENGTH-1] = 1; // first (and only) essence container
+ result = m_State.Goto_READY();
+ }
return result;
}
result = m_State.Goto_RUNNING(); // first time through
if ( ASDCP_SUCCESS(result) )
- result = WriteEKLVPacket(FrameBuf, WAVEssenceUL_Data, Ctx, HMAC);
+ result = WriteEKLVPacket(FrameBuf, m_EssenceUL, Ctx, HMAC);
if ( ASDCP_SUCCESS(result) )
m_FramesWritten++;
if ( ! m_State.Test_RUNNING() )
return RESULT_STATE;
- if ( ! m_File )
- return RESULT_INIT;
-
m_State.Goto_FINAL();
- return WriteMXFFooter(ESS_PCM_24b_48k);
+ return WriteMXFFooter();
}
const AudioDescriptor& ADesc, ui32_t HeaderSize)
{
m_Writer = new h__Writer;
+ 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();
return m_Writer->Finalize();
}
-#endif
-
//
// end AS_DCP_PCM.cpp
//
projects / asdcplib.git / blobdiff