Re-implement previous {Read,Write}Frame API

1 files changed, 26 insertions, 2 deletions

diff --git a/src/AS_02_IAB.h b/src/AS_02_IAB.h
index 710a322..d33c749 100644
--- a/src/AS_02_IAB.h
+++ b/src/AS_02_IAB.h
@@ -116,7 +116,21 @@ namespace AS_02 {
        * Writes a single frame.
        * 
        * Must be preceded by a succesful OpenWrite() call followed by zero or more WriteFrame() calls
+       *
+       *
+       * @param frame Pointer to a complete IA Frame
+       * @param sz Size in bytes of the IA Frame
+       * @return RESULT_OK indicates that the frame is written and additional frames can be written, 
+       * otherwise the reader is reset and the file is left is an undermined state.
+       */
+      Result_t WriteFrame(const ui8_t* frame, ui32_t sz);
+
+      /**
+       * Writes a single frame.
        * 
+       * Must be preceded by a succesful OpenWrite() call followed by zero or more WriteFrame() calls
+       *
+       *
        * @param frame a complete IA Frame
        * @return RESULT_OK indicates that the frame is written and additional frames can be written, 
        * otherwise the reader is reset and the file is left is an undermined state.
@@ -153,8 +167,8 @@ namespace AS_02 {
 
       ASDCP::mem_ptr<h__Reader> m_Reader;
 
-      i64_t m_CurrentFrameIndex;
-      std::vector<ui8_t> m_CurrentFrameBuffer;
+      ASDCP::FrameBuffer m_FrameBuffer;
+
       ReaderState_t m_State;
         
       const Kumu::IFileReaderFactory& m_FileReaderFactory;
@@ -236,6 +250,16 @@ namespace AS_02 {
        * @return RESULT_OK indicates that more frames are ready to be read,
        * otherwise the file is closed and the reader reset
        */
+      Result_t ReadFrame(ui32_t frame_number, Frame& frame);
+
+      /**
+       * Reads an IA Frame.
+       *
+       * @param frame_number Index of the frame to be read. Must be in the range [0, GetFrameCount()).
+       * @param frame Frame data. Must not be modified. Remains valid until the next call to ReadFrame().
+       * @return RESULT_OK indicates that more frames are ready to be read,
+       * otherwise the file is closed and the reader reset
+       */
       Result_t ReadFrame(ui32_t frame_number, ASDCP::FrameBuffer& frame);
 
       /** Reads a Generic Stream Partition payload. Returns RESULT_INIT if the file is