diff options
Diffstat (limited to 'src/odr-audioenc.cpp')
| -rw-r--r-- | src/odr-audioenc.cpp | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/src/odr-audioenc.cpp b/src/odr-audioenc.cpp index 45aacf2..aab76b2 100644 --- a/src/odr-audioenc.cpp +++ b/src/odr-audioenc.cpp @@ -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. @@ -83,7 +83,7 @@ extern "C" { #include <sys/ioctl.h> #include <fcntl.h> -#include "fdk-aac/aacenc_lib.h" +#include "aacenc_lib.h" extern "C" { #include "fec/fec.h" @@ -191,6 +191,7 @@ void usage(const char* name) " -B, --bandwidth=VALUE Set the AAC encoder bandwidth to VALUE [Hz].\n" " --decode=FILE Decode the AAC back to a wav file (loopback test).\n" " Output and PAD parameters:\n" + " --identifier=ID An identifier string that is sent in the ODRv EDI TAG. Max 32 characters length.\n" " -o, --output=URI Output ZMQ uri. (e.g. 'tcp://localhost:9000')\n" " -or- Output file uri. (e.g. 'file.dabp')\n" " -or- a single dash '-' to denote stdout\n" @@ -444,6 +445,7 @@ public: shared_ptr<Output::File> file_output; shared_ptr<Output::ZMQ> zmq_output; Output::EDI edi_output; + string identifier; bool tist_enabled = false; uint32_t tist_delay_ms = 0; @@ -625,6 +627,16 @@ int AudioEnc::run() if (not edi_output_uris.empty()) { edi_output.set_tist(tist_enabled, tist_delay_ms); + + stringstream ss; + ss << PACKAGE_NAME << " " << +#if defined(GITVERSION) + GITVERSION << +#else + PACKAGE_VERSION << +#endif + " " << identifier; + edi_output.set_odr_version_tag(ss.str()); } if (padlen != 0) { @@ -1342,6 +1354,7 @@ int main(int argc, char *argv[]) {"decode", required_argument, 0, 6 }, {"format", required_argument, 0, 'f'}, {"gst-uri", required_argument, 0, 'G'}, + {"identifier", required_argument, 0, 7 }, {"input", required_argument, 0, 'i'}, {"jack", required_argument, 0, 'j'}, {"output", required_argument, 0, 'o'}, @@ -1425,6 +1438,16 @@ int main(int argc, char *argv[]) case 6: // Enable loopback decoder for AAC audio_enc.decode_wavfilename = optarg; break; + case 7: // Identifier for in-band version information + audio_enc.identifier = optarg; + /* The 32 character length restriction is arbitrary, but guarantees + * that the EDI packet will not grow too large */ + if (audio_enc.identifier.size() > 32) { + fprintf(stderr, "Output Identifier too long!\n"); + usage(argv[0]); + return 1; + } + break; case 'a': audio_enc.selected_encoder = encoder_selection_t::toolame_dab; break; @@ -1548,6 +1571,12 @@ int main(int argc, char *argv[]) } } - return audio_enc.run(); + try { + return audio_enc.run(); + } + catch (const std::runtime_error& e) { + fprintf(stderr, "ODR-AudioEnc failed to start: %s\n", e.what()); + return 1; + } } |