Merge rework of inputs into 'next'

This breaks the non-blocking fifo inputs, as it seems nobody is
using them.

It restores some UDP functionality, not necessarily in the same way as
before.

1 files changed, 91 insertions, 0 deletions

diff --git a/src/input/File.h b/src/input/File.h
new file mode 100644
index 0000000..080d6b5
--- /dev/null
+++ b/src/input/File.h
@@ -0,0 +1,91 @@
+/*
+   Copyright (C) 2009 Her Majesty the Queen in Right of Canada (Communications
+   Research Center Canada)
+
+   Copyright (C) 2016 Matthias P. Braendli
+    http://www.opendigitalradio.org
+
+   */
+/*
+   This file is part of ODR-DabMux.
+
+   ODR-DabMux is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as
+   published by the Free Software Foundation, either version 3 of the
+   License, or (at your option) any later version.
+
+   ODR-DabMux is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#pragma once
+
+#include <vector>
+#include <array>
+#include <string>
+#include <stdint.h>
+#include "input/inputs.h"
+#include "ManagementServer.h"
+
+namespace Inputs {
+
+class FileBase : public InputBase {
+    public:
+        virtual int open(const std::string& name);
+        virtual int readFrame(uint8_t* buffer, size_t size) = 0;
+        virtual int setBitrate(int bitrate);
+        virtual int close();
+
+        /* Rewind the file
+         * Returns -1 on failure, 0 on success
+         */
+        virtual int rewind();
+    protected:
+        /* Read len bytes from the file into buf, and return
+         * the number of bytes read, or -1 in case of error.
+         */
+        virtual ssize_t readFromFile(uint8_t* buf, size_t len);
+
+        // We use unix open() instead of fopen() because
+        // we might want to do non-blocking I/O in the future
+        int m_fd = -1;
+};
+
+class MPEGFile : public FileBase {
+    public:
+        virtual int readFrame(uint8_t* buffer, size_t size);
+        virtual int setBitrate(int bitrate);
+
+    private:
+        bool m_parity = false;
+};
+
+class RawFile : public FileBase {
+    public:
+        virtual int readFrame(uint8_t* buffer, size_t size);
+};
+
+class PacketFile : public FileBase {
+    public:
+        PacketFile(bool enhancedPacketMode);
+        virtual int readFrame(uint8_t* buffer, size_t size);
+
+    protected:
+        std::array<uint8_t,96> m_packetData;
+        size_t m_packetLength;
+
+        /* Enhanced packet mode enables FEC for MSC packet mode
+         * as described in EN 300 401 Clause 5.3.5
+         */
+        bool m_enhancedPacketEnabled = false;
+        std::array<std::array<uint8_t, 204>,12> m_enhancedPacketData;
+        size_t m_enhancedPacketWaiting;
+        size_t m_enhancedPacketLength;
+};
+
+};