EDI input: add new buffer management

1 files changed, 26 insertions, 1 deletions

diff --git a/src/input/inputs.h b/src/input/inputs.h
index 9a396e0..b4bb00b 100644
--- a/src/input/inputs.h
+++ b/src/input/inputs.h
@@ -41,7 +41,32 @@ class InputBase {
         /* Throws runtime_error or invalid_argument on failure */
         virtual void open(const std::string& name) = 0;
 
-        virtual int readFrame(uint8_t* buffer, size_t size) = 0;
+        /* read a frame from the input. Buffer management is either not necessary
+         * (e.g. File input) or done with pre-buffering (network-based inputs).
+         *
+         * This ignores timestamps. All inputs support this.
+         *
+         * Returns number of data bytes written to the buffer. May clear the buffer
+         * if no data bytes available, in which case it will return 0.
+         *
+         * Returns negative on error.
+         */
+        virtual size_t readFrame(uint8_t *buffer, size_t size) = 0;
+
+        /* read a frame from the input, taking into account timestamp. The timestamp of the data
+         * returned is not more recent than the timestamp specified in seconds and tsta.
+         *
+         * seconds and tsta are in the format used by EDI.
+         *
+         * Returns number of data bytes written to the buffer. May clear the buffer
+         * if no data bytes available, in which case it will return 0.
+         *
+         * Returns negative on error.
+         *
+         * Calling this function on inputs that do not support timestamps returns 0. This allows
+         * changing the buffer management at runtime without risking an crash due to an exception.
+         */
+        virtual size_t readFrame(uint8_t *buffer, size_t size, uint32_t seconds, uint32_t tsta) = 0;
 
         /* Returns the effectively used bitrate, or throws invalid_argument on invalid bitrate */
         virtual int setBitrate(int bitrate) = 0;