fix AS-02 audio unwrapping behavior

3 files changed, 32 insertions, 9 deletions

diff --git a/src/AS_02.h b/src/AS_02.h
index ff6b692..e534dd4 100644
--- a/src/AS_02.h
+++ b/src/AS_02.h
@@ -118,6 +118,14 @@ namespace AS_02
       return CalcSampleSize(d) * CalcSamplesPerFrame(d, edit_rate);
     }
 
+    // Returns number of frames for data described by ADesc, given a duration in samples and an edit rate
+    inline ui32_t CalcFramesFromDurationInSamples(const ui32_t durationInSamples, const ASDCP::MXF::WaveAudioDescriptor& d, const ASDCP::Rational& edit_rate)
+    {
+      return static_cast<ui32_t>(static_cast<ui64_t>(durationInSamples) *
+				 static_cast<ui64_t>(d.AudioSamplingRate.Denominator * edit_rate.Numerator) /
+				 static_cast<ui64_t>(d.AudioSamplingRate.Numerator * edit_rate.Denominator));
+    }
+
   } // namespace MXF
 
   //---------------------------------------------------------------------------------
diff --git a/src/AS_02_PCM.cpp b/src/AS_02_PCM.cpp
index 2a63aa3..512bcdb 100644
--- a/src/AS_02_PCM.cpp
+++ b/src/AS_02_PCM.cpp
@@ -144,6 +144,8 @@ ASDCP::Result_t
 AS_02::PCM::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, ASDCP::PCM::FrameBuffer& FrameBuf,
 					    ASDCP::AESDecContext* Ctx, ASDCP::HMACContext* HMAC)
 {
+  ASDCP::MXF::WaveAudioDescriptor* wave_descriptor = 0;
+
   if ( ! m_File.IsOpen() )
     {
       return RESULT_INIT;
@@ -156,7 +158,21 @@ AS_02::PCM::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, ASDCP::PCM::FrameBu
 
   assert(m_ClipEssenceBegin);
   Result_t result = RESULT_OK;
-  ui64_t position = m_ClipEssenceBegin + ( FrameNum * m_SamplesPerFrame );
+
+  if( KM_SUCCESS(result) )
+    {
+      if ( KM_SUCCESS(m_HeaderPart.GetMDObjectByType(OBJ_TYPE_ARGS(WaveAudioDescriptor),
+						     reinterpret_cast<InterchangeObject**>(&wave_descriptor))) )
+	{
+	  if ( wave_descriptor == 0 )
+	    {
+	      DefaultLogSink().Error("WaveAudioDescriptor object not found.\n");
+	      return RESULT_AS02_FORMAT;
+	    }
+	}
+    }
+
+  ui64_t position = m_ClipEssenceBegin + ( FrameNum * m_SamplesPerFrame * wave_descriptor->ChannelCount * wave_descriptor->BlockAlign );
 
   if ( m_File.Tell() != position )
     {
@@ -165,12 +181,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_SamplesPerFrame * wave_descriptor->ChannelCount * wave_descriptor->BlockAlign);
     }
 
   if ( KM_SUCCESS(result) )
     {
-      FrameBuf.Size(m_SamplesPerFrame);
+      FrameBuf.Size(m_SamplesPerFrame * wave_descriptor->ChannelCount * wave_descriptor->BlockAlign);
     }
 
   return result;
@@ -394,8 +410,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();
@@ -407,8 +421,6 @@ AS_02::PCM::MXFWriter::h__Writer::SetSourceStream(const ASDCP::Rational& edit_ra
       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)),
 			       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);
@@ -475,7 +487,6 @@ AS_02::PCM::MXFWriter::h__Writer::Finalize()
 
   if ( KM_SUCCESS(result) )
     {
-      fprintf(stderr, "m_FramesWritten=%d, m_SamplesPerFrame=%d\n", m_FramesWritten, m_SamplesPerFrame);
       m_FramesWritten = m_FramesWritten * m_SamplesPerFrame;
       WriteAS02Footer();
     }
diff --git a/src/as-02-unwrap.cpp b/src/as-02-unwrap.cpp
index 42d4820..b85781d 100755
--- a/src/as-02-unwrap.cpp
+++ b/src/as-02-unwrap.cpp
@@ -453,6 +453,7 @@ read_PCM_file(CommandOptions& Options)
 	}
 
       FrameBuffer.Capacity(AS_02::MXF::CalcFrameBufferSize(*wave_descriptor, Options.edit_rate));
+      last_frame = AS_02::MXF::CalcFramesFromDurationInSamples(last_frame, *wave_descriptor, Options.edit_rate);
 
       if ( Options.verbose_flag )
 	{
@@ -522,7 +523,10 @@ read_PCM_file(CommandOptions& Options)
       if ( ASDCP_SUCCESS(result) )
 	{
 	  if ( Options.verbose_flag )
-	    FrameBuffer.Dump(stderr, Options.fb_dump_size);
+	    {
+	      FrameBuffer.FrameNumber(i);
+	      FrameBuffer.Dump(stderr, Options.fb_dump_size);
+	    }
 
 	  result = OutWave.WriteFrame(FrameBuffer);
 	}