X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2FAS_02_PCM.cpp;h=9a6a98cf937567ca7aa306afbe23ff8fc9465831;hb=620722efa3a2df7857074e36abd751826a61d0e0;hp=2a63aa3b9243e5cc66277f24097c7cb0d4f8e8a0;hpb=638de490cccf18a3ca388b037f4d66d64872a2bd;p=asdcplib.git diff --git a/src/AS_02_PCM.cpp b/src/AS_02_PCM.cpp index 2a63aa3..9a6a98c 100644 --- a/src/AS_02_PCM.cpp +++ b/src/AS_02_PCM.cpp @@ -49,6 +49,7 @@ class AS_02::PCM::MXFReader::h__Reader : public AS_02::h__AS02Reader { ui64_t m_ClipEssenceBegin; ui64_t m_SamplesPerFrame; + ui32_t m_BytesPerFrame; ui32_t m_ContainerDuration; ASDCP_NO_COPY_CONSTRUCT(h__Reader); @@ -56,7 +57,7 @@ class AS_02::PCM::MXFReader::h__Reader : public AS_02::h__AS02Reader public: h__Reader(const Dictionary& d) : AS_02::h__AS02Reader(d), m_ClipEssenceBegin(0), - m_SamplesPerFrame(0), m_ContainerDuration(0) {} + m_SamplesPerFrame(0), m_BytesPerFrame(0), m_ContainerDuration(0) {} virtual ~h__Reader() {} ASDCP::Result_t OpenRead(const std::string&, const ASDCP::Rational& edit_rate); @@ -75,17 +76,20 @@ AS_02::PCM::MXFReader::h__Reader::OpenRead(const std::string& filename, const AS if( KM_SUCCESS(result) ) { - if ( KM_SUCCESS(m_HeaderPart.GetMDObjectByType(OBJ_TYPE_ARGS(WaveAudioDescriptor), - reinterpret_cast(&wave_descriptor))) ) + InterchangeObject* tmp_obj = 0; + + if ( KM_SUCCESS(m_HeaderPart.GetMDObjectByType(OBJ_TYPE_ARGS(WaveAudioDescriptor), &tmp_obj)) ) { - if ( wave_descriptor == 0 ) - { - DefaultLogSink().Error("WaveAudioDescriptor object not found.\n"); - return RESULT_AS02_FORMAT; - } + wave_descriptor = dynamic_cast(tmp_obj); } } + if ( wave_descriptor == 0 ) + { + DefaultLogSink().Error("WaveAudioDescriptor object not found.\n"); + result = RESULT_AS02_FORMAT; + } + if ( KM_SUCCESS(result) ) result = m_IndexAccess.Lookup(0, tmp_entry); @@ -131,8 +135,9 @@ AS_02::PCM::MXFReader::h__Reader::OpenRead(const std::string& filename, const AS m_ClipEssenceBegin = m_File.Tell(); m_SamplesPerFrame = AS_02::MXF::CalcSamplesPerFrame(*wave_descriptor, edit_rate); - m_ContainerDuration = static_cast(8ULL * reader.Length() / - (m_SamplesPerFrame * wave_descriptor->ChannelCount * wave_descriptor->QuantizationBits)); + m_BytesPerFrame = AS_02::MXF::CalcFrameBufferSize(*wave_descriptor, edit_rate); + m_ContainerDuration = static_cast(reader.Length() / ( m_SamplesPerFrame * AS_02::MXF::CalcSampleSize(*wave_descriptor))); + } } @@ -155,8 +160,8 @@ AS_02::PCM::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, ASDCP::PCM::FrameBu } assert(m_ClipEssenceBegin); + ui64_t position = m_ClipEssenceBegin + ( FrameNum * m_BytesPerFrame ); Result_t result = RESULT_OK; - ui64_t position = m_ClipEssenceBegin + ( FrameNum * m_SamplesPerFrame ); if ( m_File.Tell() != position ) { @@ -165,12 +170,12 @@ AS_02::PCM::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, ASDCP::PCM::FrameBu if ( KM_SUCCESS(result) ) { - result = m_File.Read(FrameBuf.Data(), m_SamplesPerFrame); + result = m_File.Read(FrameBuf.Data(), m_BytesPerFrame); } if ( KM_SUCCESS(result) ) { - FrameBuf.Size(m_SamplesPerFrame); + FrameBuf.Size(m_BytesPerFrame); } return result; @@ -306,7 +311,7 @@ AS_02::PCM::MXFReader::DumpIndex(FILE* stream) const //------------------------------------------------------------------------------------------ // -class AS_02::PCM::MXFWriter::h__Writer : public AS_02::h__AS02Writer +class AS_02::PCM::MXFWriter::h__Writer : public AS_02::h__AS02WriterClip { ASDCP_NO_COPY_CONSTRUCT(h__Writer); h__Writer(); @@ -317,7 +322,7 @@ public: ui32_t m_BytesPerFrame; ui32_t m_SamplesPerFrame; - h__Writer(const Dictionary& d) : AS_02::h__AS02Writer(d), m_WaveAudioDescriptor(0), m_BytesPerFrame(0), m_SamplesPerFrame(0) + h__Writer(const Dictionary& d) : AS_02::h__AS02WriterClip(d), m_WaveAudioDescriptor(0), m_BytesPerFrame(0), m_SamplesPerFrame(0) { memset(m_EssenceUL, 0, SMPTE_UL_LENGTH); } @@ -339,15 +344,15 @@ AS_02::PCM::MXFWriter::h__Writer::OpenWrite(const std::string& filename, ASDCP:: { assert(essence_descriptor); - if ( essence_descriptor->GetUL() != UL(m_Dict->ul(MDD_WaveAudioDescriptor)) ) + m_WaveAudioDescriptor = dynamic_cast(essence_descriptor); + + if ( m_WaveAudioDescriptor == 0 ) { DefaultLogSink().Error("Essence descriptor is not a WaveAudioDescriptor.\n"); essence_descriptor->Dump(); return RESULT_AS02_FORMAT; } - m_WaveAudioDescriptor = reinterpret_cast(essence_descriptor); - if ( ! m_State.Test_BEGIN() ) { return RESULT_STATE; @@ -394,8 +399,6 @@ AS_02::PCM::MXFWriter::h__Writer::SetSourceStream(const ASDCP::Rational& edit_ra return RESULT_STATE; } - fprintf(stderr, "edit_rate=%d/%d\n", edit_rate.Numerator, edit_rate.Denominator); - memcpy(m_EssenceUL, m_Dict->ul(MDD_WAVEssenceClip), SMPTE_UL_LENGTH); m_EssenceUL[15] = 1; // set the stream identifier Result_t result = m_State.Goto_READY(); @@ -406,12 +409,16 @@ AS_02::PCM::MXFWriter::h__Writer::SetSourceStream(const ASDCP::Rational& edit_ra m_BytesPerFrame = AS_02::MXF::CalcFrameBufferSize(*m_WaveAudioDescriptor, edit_rate); m_SamplesPerFrame = AS_02::MXF::CalcSamplesPerFrame(*m_WaveAudioDescriptor, edit_rate); m_WaveAudioDescriptor->ContainerDuration = 0; - - fprintf(stderr, "m_BytesPerFrame=%d, m_SamplesPerFrame=%d\n", m_BytesPerFrame, m_SamplesPerFrame); - - result = WriteAS02Header(PCM_PACKAGE_LABEL, UL(m_Dict->ul(MDD_WAVWrapping)), + assert(m_BytesPerFrame); + result = WriteAS02Header(PCM_PACKAGE_LABEL, UL(m_Dict->ul(MDD_WAVWrappingClip)), SOUND_DEF_LABEL, UL(m_EssenceUL), UL(m_Dict->ul(MDD_SoundDataDef)), - m_EssenceDescriptor->SampleRate, derive_timecode_rate_from_edit_rate(edit_rate), m_BytesPerFrame); + m_EssenceDescriptor->SampleRate, derive_timecode_rate_from_edit_rate(edit_rate)); + + if ( KM_SUCCESS(result) ) + { + this->m_IndexWriter.SetEditRate(m_WaveAudioDescriptor->AudioSamplingRate, + AS_02::MXF::CalcSampleSize(*m_WaveAudioDescriptor)); + } } return result; @@ -455,7 +462,7 @@ AS_02::PCM::MXFWriter::h__Writer::WriteFrame(const FrameBuffer& frame_buf, AESEn if ( KM_SUCCESS(result) ) { - m_FramesWritten++; + m_FramesWritten += m_SamplesPerFrame; } return result; @@ -471,12 +478,11 @@ AS_02::PCM::MXFWriter::h__Writer::Finalize() m_State.Goto_FINAL(); - Result_t result = FinalizeClip(m_BytesPerFrame); + Result_t result = FinalizeClip(AS_02::MXF::CalcSampleSize(*m_WaveAudioDescriptor)); if ( KM_SUCCESS(result) ) { - fprintf(stderr, "m_FramesWritten=%d, m_SamplesPerFrame=%d\n", m_FramesWritten, m_SamplesPerFrame); - m_FramesWritten = m_FramesWritten * m_SamplesPerFrame; + m_IndexWriter.m_Duration = m_FramesWritten; WriteAS02Footer(); } @@ -527,7 +533,6 @@ AS_02::PCM::MXFWriter::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