Rework AVTInput, disable EDI

1 files changed, 65 insertions, 57 deletions

diff --git a/src/AVTInput.h b/src/AVTInput.h
index 8638fc3..ffa632f 100644
--- a/src/AVTInput.h
+++ b/src/AVTInput.h
@@ -1,5 +1,6 @@
 /* ------------------------------------------------------------------
  * Copyright (C) 2017 AVT GmbH - Fabien Vercasson
+ * Copyright (C) 2019 Matthias P. Braendli
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
  * and limitations under the License.
  * -------------------------------------------------------------------
  */
- 
- 
+
+
 /*! \section AVT Input
  *
  * This input comunicate with AVT encoder
@@ -27,89 +28,105 @@
  *
  */
 
-#ifndef _AVT_INPUT_H_
-#define _AVT_INPUT_H_
+#pragma once
 
-#include <stdint.h>
-#include <stdio.h>
+#include "UdpSocket.h"
+#include "OrderedQueue.h"
+#include <cstdint>
+#include <cstdio>
 #include <string>
 #include <queue>
 #include <vector>
 
-class UdpSocket;
-class UdpPacket;
-class AVTEDIInput;
-class OrderedQueue;
+#define DEF_BR  64
+
+// The enum values folown the AVT messages definitions.
+enum {
+    AVT_Mono            = 0,
+    AVT_Mono_SBR,
+    AVT_Stereo,
+    AVT_Stereo_SBR,
+    AVT_Stereo_SBR_PS
+};
+
+enum {
+    AVT_MonoMode_LR2    = 0,
+    AVT_MonoMode_L,
+    AVT_MonoMode_R
+};
+
+enum {
+  AVT_DAC_32            = 0,
+  AVT_DAC_48
+};
+
 
 class AVTInput
 {
     public:
         AVTInput(const std::string& input_uri, const std::string& output_uri, uint32_t pad_port,
                 size_t jitterBufferSize = 40);
-        ~AVTInput();
 
         /*! Open the file and prepare the wav decoder.
          *
          * \return nonzero on error
          */
         int prepare(void);
-                
+
         /*! Inform class and remove encoder about the bitrate and audio mode
-         * 
+         *
          * \return nonzero on error
          */
         int setDabPlusParameters(int bitrate, int channels, int sample_rate, bool sbr, bool ps);
 
         /*! Read incomming frames from the encoder, reorder and reassemble then into DAB+ superframes
-         *! Give the next reassembled audio frame (120ms for DAB+) 
-         * 
+         *! Give the next reassembled audio frame (120ms for DAB+)
+         *
          * \return the size of the frame or 0 if none are available yet
          */
         ssize_t getNextFrame(std::vector<uint8_t> &buf);
-        
+
         /*! Store a new PAD frame.
          *! Frames are sent to the encoder on request
          */
         void pushPADFrame(const uint8_t* buf, size_t size);
-        
+
         /* \return true if PAD Frame queue is full */
         bool padQueueFull();
-        
+
 
     private:
         std::string _input_uri;
         std::string _output_uri;
         uint32_t _pad_port;
         size_t _jitterBufferSize;
-        
-        UdpSocket*      _input_socket;
-        UdpPacket*      _input_packet;
-        UdpSocket*      _output_socket;
-        UdpPacket*      _output_packet;
-        UdpSocket*      _input_pad_socket;
-        UdpPacket*      _input_pad_packet;
-        AVTEDIInput*    _ediInput;
-        OrderedQueue*   _ordered;
-        std::queue< std::vector<uint8_t>* > _padFrameQueue;
-
-        int32_t _subChannelIndex;
-        int32_t _bitRate;
-        int32_t _audioMode;
-        int32_t _monoMode;
-        int32_t _dac;
-        size_t _dab24msFrameSize;
-        uint32_t _dummyFrameNumber;
-        bool _frameAlligned;
-        uint8_t* _currentFrame;
-        size_t _currentFrameSize;
-        int32_t _nbFrames;
-        uint8_t* _nextFrameIndex;
+
+        UdpSocket       _input_socket;
+        UdpSocket       _output_socket;
+        UdpPacket       _output_packet;
+        UdpSocket       _input_pad_socket;
+        UdpPacket       _input_pad_packet;
+        OrderedQueue    _ordered;
+        std::queue<std::vector<uint8_t> > _padFrameQueue;
+
+        int32_t _subChannelIndex = DEF_BR/8;
+        int32_t _bitRate = DEF_BR * 1000;
+        int32_t _audioMode = AVT_Mono;
+        int32_t _monoMode = AVT_MonoMode_LR2;
+        int32_t _dac = AVT_DAC_48;
+        size_t _dab24msFrameSize = DEF_BR*3;
+        uint32_t _dummyFrameNumber = 0;
+        bool _frameAligned = false;
+        std::vector<uint8_t> _currentFrame;
+        size_t _currentFrameSize = 0;
+        int32_t _nbFrames = 0;
+        uint8_t* _nextFrameIndex = 0;
 
         bool _parseURI(const char* uri, std::string& address, long& port);
         int _openSocketSrv(UdpSocket* socket, const char* uri);
-        int _openSocketCli(UdpSocket* socket, UdpPacket* packet, const char* uri);
-        
-        void _sendCtrlMessage(UdpSocket* socket, UdpPacket* packet);
+        int _openSocketCli();
+
+        void _sendCtrlMessage();
         void _sendPADFrame(UdpPacket* packet = NULL);
         void _interpretMessage(const uint8_t* data, size_t size, UdpPacket* packet = NULL);
         bool _checkMessage();
@@ -120,17 +137,10 @@ class AVTInput
          * \return the number of bytes read.
          */
         ssize_t _read(uint8_t* buf, size_t length, bool onlyOnePacket=false);
-        
-        /*! Push new data to edi decoder
-         * \return false is data is not EDI
-         */
-        bool _ediPushData(uint8_t* buf, size_t length);
-        
-        size_t _ediPopFrame(std::vector<uint8_t>& data, int32_t& frameNumber);
-        
+
         /*! Test Bytes 1,2,3 for STI detection */
         bool _isSTI(const uint8_t* buf);
-        
+
         /*! Find and extract the DAB frame from UDP/RTP/STI received frame
          * \param   frameNumber will contain the frameNumber
          * \param   dataSize will contain the actual DAB frame size
@@ -147,15 +157,13 @@ class AVTInput
 
         /*! Output info about received frames*/
         enum _frameType {
-            _typeEDI,
             _typeSTI,
             _typeSTIRTP,
             _typeCantExtract
         };
         _frameType _lastInfoFrameType;
-        size_t _lastInfoSize;
-        size_t _infoNbFrame;
+        size_t _lastInfoSize = 0;
+        size_t _infoNbFrame = 0;
         void _info(_frameType type, size_t size);
 };
 
-#endif // _AVT_INPUT_H_