|
3 | 3 | * @author Martin Pulec <[email protected]> |
4 | 4 | */ |
5 | 5 | /* |
6 | | - * Copyright (c) 2016-2023 CESNET z.s.p.o. |
| 6 | + * Copyright (c) 2016-2024 CESNET |
7 | 7 | * All rights reserved. |
8 | 8 | * |
9 | 9 | * Redistribution and use in source and binary forms, with or without |
|
35 | 35 | * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | 36 | */ |
37 | 37 |
|
| 38 | +#include <algorithm> // for max, min |
| 39 | +#include <cassert> // for assert |
| 40 | +#include <chrono> |
| 41 | +#include <cmath> // for fabs, log |
| 42 | +#include <cstdint> // for int16_t, int32_t |
| 43 | +#include <cstdio> // for printf |
| 44 | +#include <cstdlib> // for free, abort |
| 45 | +#include <cstring> // for NULL, strlen, strncmp, memcpy, memset |
| 46 | +#include <iostream> |
| 47 | +#include <limits> // for numeric_limits |
| 48 | +#include <map> |
| 49 | +#include <memory> // for unique_ptr, shared_ptr |
| 50 | +#include <mutex> |
| 51 | +#include <string> // for basic_string, operator==, string |
| 52 | +#include <thread> |
| 53 | +#include <utility> // for move, pair |
| 54 | +#include <vector> |
38 | 55 |
|
39 | | -#ifdef HAVE_CONFIG_H |
40 | | -#include "config.h" |
41 | | -#include "config_unix.h" |
42 | | -#include "config_win32.h" |
43 | | -#endif |
44 | | - |
45 | | -#include "audio/audio_capture.h" |
46 | 56 | #include "audio/audio_playback.h" |
47 | 57 | #include "audio/codec.h" |
48 | 58 | #include "audio/types.h" |
| 59 | +#include "compat/net.h" // for sockaddr_in, sockaddr_in6, in6_addr |
49 | 60 | #include "debug.h" |
| 61 | +#include "host.h" // for get_commandline_param, uv_argv |
50 | 62 | #include "lib_common.h" |
51 | 63 | #include "module.h" |
52 | 64 | #include "rtp/rtp.h" |
53 | 65 | #include "transmit.h" |
| 66 | +#include "types.h" // for tx_media_type |
54 | 67 | #include "utils/audio_buffer.h" |
55 | 68 | #include "utils/thread.h" |
56 | | -#include <chrono> |
57 | | -#include <iostream> |
58 | | -#include <map> |
59 | | -#include <mutex> |
60 | | -#include <thread> |
61 | | -#include <vector> |
62 | 69 |
|
63 | 70 | #define SAMPLE_RATE 48000 |
64 | 71 | #define BPS 2 /// @todo 4? |
@@ -375,14 +382,14 @@ static void audio_play_mixer_help() |
375 | 382 | "\n" |
376 | 383 | "Notes:\n" |
377 | 384 | "1)\tYou do not need to specify audio participants explicitly,\n" |
378 | | - "\t" PACKAGE_NAME " simply sends the the stream back to the host\n" |
| 385 | + "\tthe mixer simply sends the the stream back to the host\n" |
379 | 386 | "\tthat is sending to mixer. Therefore it is necessary that the\n" |
380 | | - "\tparticipant uses single " PACKAGE_NAME " for both sending and\n" |
| 387 | + "\tparticipant uses single UltraGrid for both sending and\n" |
381 | 388 | "\treceiving audio.\n" |
382 | 389 | "2)\tUses default port for receiving, therefore if you want to use it\n" |
383 | 390 | "\ton machine that is a part of the conference, you should use something like:\n" |
384 | 391 | "\t\t%s -s <your_capture> -P 5004:5004:5010:5006\n" |
385 | | - "\tfor the " PACKAGE_NAME " instance that is part of the conference (not mixer!)\n", |
| 392 | + "\tfor the UltraGrid instance that is part of the conference (not mixer!)\n", |
386 | 393 | uv_argv[0], uv_argv[0]); |
387 | 394 | } |
388 | 395 |
|
|
0 commit comments