diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2020-03-25 15:40:43 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2020-03-25 15:40:43 +0100 |
| commit | b5d9aace919134c4f340f237d1de04b266552448 (patch) | |
| tree | 947bb14421d6c90dbb4b9c70f940d4c87cecef4a | |
| parent | 925ecf59c1275d6302f914f4c6be2a4a042432d5 (diff) | |
| download | dabmux-b5d9aace919134c4f340f237d1de04b266552448.tar.gz dabmux-b5d9aace919134c4f340f237d1de04b266552448.tar.bz2 dabmux-b5d9aace919134c4f340f237d1de04b266552448.zip | |
Rename ZMQ_ENCODER_XYZ constants
| -rw-r--r-- | src/input/Zmq.cpp | 4 | ||||
| -rw-r--r-- | src/input/Zmq.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/input/Zmq.cpp b/src/input/Zmq.cpp index 603f514..305653b 100644 --- a/src/input/Zmq.cpp +++ b/src/input/Zmq.cpp @@ -369,7 +369,7 @@ int ZmqMPEG::readFromSocket(size_t framesize) if ( msg.size() >= sizeof(zmq_frame_header_t) and msg.size() == ZMQ_FRAME_SIZE(frame) and frame->version == 1 and - frame->encoder == ZMQ_ENCODER_TOOLAME) { + frame->encoder == ZMQ_ENCODER_MPEG_L2) { datalen = frame->datasize; data = ZMQ_FRAME_DATA(frame); @@ -439,7 +439,7 @@ int ZmqAAC::readFromSocket(size_t framesize) if ( msg.size() >= sizeof(zmq_frame_header_t) and msg.size() == ZMQ_FRAME_SIZE(frame) and frame->version == 1 and - frame->encoder == ZMQ_ENCODER_FDK) { + frame->encoder == ZMQ_ENCODER_AACPLUS) { datalen = frame->datasize; data = ZMQ_FRAME_DATA(frame); diff --git a/src/input/Zmq.h b/src/input/Zmq.h index f4992f1..c101da0 100644 --- a/src/input/Zmq.h +++ b/src/input/Zmq.h @@ -119,8 +119,8 @@ struct dab_input_zmq_config_t std::string curve_encoder_keyfile; }; -#define ZMQ_ENCODER_FDK 1 -#define ZMQ_ENCODER_TOOLAME 2 +#define ZMQ_ENCODER_AACPLUS 1 +#define ZMQ_ENCODER_MPEG_L2 2 /* This defines the on-wire representation of a ZMQ message header. * |