Merge pull request #18 from wruppelx/master

[asdcplib.git] / src / PCM_Parser.cpp

diff --git a/src/PCM_Parser.cpp b/src/PCM_Parser.cpp
index 30e5d2884ece6122322b732d03a04284bfa88509..072c2356a96c00163fd718aac3917b0227c5e381 100755 (executable)
--- a/src/PCM_Parser.cpp
+++ b/src/PCM_Parser.cpp
@@ -73,6 +73,7 @@ public:
   void     Close();
   void     Reset();
   Result_t ReadFrame(FrameBuffer&);
+  Result_t Seek(ui32_t frame_number);
 };
 
 
@@ -128,22 +129,22 @@ ASDCP::PCM::WAVParser::h__WAVParser::OpenRead(const std::string& filename, const
              m_ADesc.ChannelFormat = PCM::CF_NONE;
              Reset();
            }
-      else
-        {
-          SimpleRF64Header RF64Header;
-          m_FileReader.Seek(0);
-          result = RF64Header.ReadFromFile(m_FileReader, &m_DataStart);
-
-          if ( ASDCP_SUCCESS(result) )
-            {
-                RF64Header.FillADesc(m_ADesc, PictureRate);
-                m_FrameBufferSize = ASDCP::PCM::CalcFrameBufferSize(m_ADesc);
-                m_DataLength = RF64Header.data_len;
-                m_ADesc.ContainerDuration = m_DataLength / m_FrameBufferSize;
-                m_ADesc.ChannelFormat = PCM::CF_NONE;
-                Reset();
-            }
-        }
+         else
+           {
+             SimpleRF64Header RF64Header;
+             m_FileReader.Seek(0);
+             result = RF64Header.ReadFromFile(m_FileReader, &m_DataStart);
+
+             if ( ASDCP_SUCCESS(result) )
+               {
+                 RF64Header.FillADesc(m_ADesc, PictureRate);
+                 m_FrameBufferSize = ASDCP::PCM::CalcFrameBufferSize(m_ADesc);
+                 m_DataLength = RF64Header.data_len;
+                 m_ADesc.ContainerDuration = m_DataLength / m_FrameBufferSize;
+                 m_ADesc.ChannelFormat = PCM::CF_NONE;
+                 Reset();
+               }
+           }
        }
     }
 
@@ -156,8 +157,10 @@ ASDCP::PCM::WAVParser::h__WAVParser::ReadFrame(FrameBuffer& FB)
 {
   FB.Size(0);
 
-  if ( m_EOF || m_ReadCount >= m_DataLength )
-    return RESULT_ENDOFFILE;
+  if ( m_EOF )
+    {
+      return RESULT_ENDOFFILE;
+    }
 
   if ( FB.Capacity() < m_FrameBufferSize )
     {
@@ -174,7 +177,9 @@ ASDCP::PCM::WAVParser::h__WAVParser::ReadFrame(FrameBuffer& FB)
       m_EOF = true;
 
       if ( read_count > 0 )
-       result = RESULT_OK;
+       {
+         result = RESULT_OK;
+       }
     }
 
   if ( ASDCP_SUCCESS(result) )
@@ -182,11 +187,24 @@ ASDCP::PCM::WAVParser::h__WAVParser::ReadFrame(FrameBuffer& FB)
       m_ReadCount += read_count;
       FB.Size(read_count);
       FB.FrameNumber(m_FramesRead++);
+
+      if ( read_count < FB.Capacity() )
+       {
+         memset(FB.Data() + FB.Size(), 0, FB.Capacity() - FB.Size());
+       }
     }
 
   return result;
 }
 
+//
+ASDCP::Result_t ASDCP::PCM::WAVParser::h__WAVParser::Seek(ui32_t frame_number)
+{
+  m_FramesRead = frame_number - 1;
+  m_ReadCount = 0;
+  return m_FileReader.Seek(m_DataStart + m_FrameBufferSize * frame_number);
+}
+
 
 //------------------------------------------------------------------------------------------
 
@@ -245,6 +263,13 @@ ASDCP::PCM::WAVParser::FillAudioDescriptor(AudioDescriptor& ADesc) const
   return RESULT_OK;
 }
 
+ASDCP::Result_t ASDCP::PCM::WAVParser::Seek(ui32_t frame_number) const
+{
+  if ( m_Parser.empty() )
+    return RESULT_INIT;
+
+  return m_Parser->Seek(frame_number);;
+}
 
 //
 // end PCM_Parser.cpp