1 files changed, 50 insertions, 4 deletions

diff --git a/src/input/inputs.h b/src/input/inputs.h
index bfb1fb6..83cdbf2 100644
--- a/src/input/inputs.h
+++ b/src/input/inputs.h
@@ -2,7 +2,7 @@
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Her Majesty the Queen in
    Right of Canada (Communications Research Center Canada)
 
-   Copyright (C) 2016
+   Copyright (C) 2019
    Matthias P. Braendli, matthias.braendli@mpb.li
 
     http://www.opendigitalradio.org
@@ -35,17 +35,63 @@
 
 namespace Inputs {
 
+enum class BufferManagement {
+    // Use a buffer in the input that doesn't consider timestamps
+    Prebuffering,
+
+    // Buffer incoming data until a given timestamp is reached
+    Timestamped,
+};
+
+
 /* New input object base */
 class InputBase {
     public:
-        virtual int open(const std::string& name) = 0;
-        virtual int readFrame(uint8_t* buffer, size_t size) = 0;
+        /* Throws runtime_error or invalid_argument on failure */
+        virtual void open(const std::string& name) = 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 is in UNIX epoch, utco is the TAI-UTC offset, tsta is in the format used by ETI.
+         *
+         * 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, std::time_t seconds, int utco, uint32_t tsta) = 0;
+
+        /* Returns the effectively used bitrate, or throws invalid_argument on invalid bitrate */
         virtual int setBitrate(int bitrate) = 0;
-        virtual int close() = 0;
+        virtual void close() = 0;
 
         virtual ~InputBase() {}
+
+        void setTistDelay(const std::chrono::milliseconds& ms) { m_tist_delay = ms; }
+        void setBufferManagement(BufferManagement bm) { m_bufferManagement = bm; }
+        BufferManagement getBufferManagement() const { return m_bufferManagement; }
+
     protected:
         InputBase() {}
+
+        std::atomic<BufferManagement> m_bufferManagement = ATOMIC_VAR_INIT(BufferManagement::Prebuffering);
+        std::chrono::milliseconds m_tist_delay;
 };
 
 };