From 8df764af13e71062f24f60c08a1dc3e3c0d2e371 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Wed, 25 Mar 2020 15:13:43 +0100 Subject: Add --identifer option to specify content of EDI ODRv TAG --- src/Outputs.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/Outputs.h') diff --git a/src/Outputs.h b/src/Outputs.h index 0f1f34f..3a302b1 100644 --- a/src/Outputs.h +++ b/src/Outputs.h @@ -1,6 +1,6 @@ /* ------------------------------------------------------------------ * Copyright (C) 2011 Martin Storsjo - * Copyright (C) 2019 Matthias P. Braendli + * Copyright (C) 2020 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. @@ -133,6 +133,8 @@ class EDI: public Base { EDI& operator=(const EDI&) = delete; virtual ~EDI() override; + void set_odr_version_tag(const std::string& odr_version_tag); + void add_udp_destination(const std::string& host, unsigned int port); void add_tcp_destination(const std::string& host, unsigned int port); @@ -143,6 +145,8 @@ class EDI: public Base { virtual bool write_frame(const uint8_t *buf, size_t len) override; private: + std::string m_odr_version_tag; + edi::configuration_t m_edi_conf; std::shared_ptr m_edi_sender; -- cgit v1.2.3 From c6a73c219dbfdfe639372d9922f4eb512f06fa2f Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Wed, 25 Mar 2020 15:40:54 +0100 Subject: Rename ZMQ_ENCODER_XYZ constants --- src/Outputs.cpp | 4 ++-- src/Outputs.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Outputs.h') diff --git a/src/Outputs.cpp b/src/Outputs.cpp index 01156ce..27ab365 100644 --- a/src/Outputs.cpp +++ b/src/Outputs.cpp @@ -108,10 +108,10 @@ bool ZMQ::write_frame(const uint8_t *buf, size_t len) try { switch (m_encoder) { case encoder_selection_t::fdk_dabplus: - zmq_frame_header->encoder = ZMQ_ENCODER_FDK; + zmq_frame_header->encoder = ZMQ_ENCODER_AACPLUS; break; case encoder_selection_t::toolame_dab: - zmq_frame_header->encoder = ZMQ_ENCODER_TOOLAME; + zmq_frame_header->encoder = ZMQ_ENCODER_MPEG_L2; break; } diff --git a/src/Outputs.h b/src/Outputs.h index 3a302b1..1211841 100644 --- a/src/Outputs.h +++ b/src/Outputs.h @@ -91,8 +91,8 @@ struct zmq_frame_header_t /* Data follows this header */ } __attribute__ ((packed)); -#define ZMQ_ENCODER_FDK 1 -#define ZMQ_ENCODER_TOOLAME 2 +#define ZMQ_ENCODER_AACPLUS 1 +#define ZMQ_ENCODER_MPEG_L2 2 #define ZMQ_HEADER_SIZE sizeof(struct zmq_frame_header_t) -- cgit v1.2.3