In change [1] I moved libraries from _LDFLAGS to _LIBADD, but I did
not notice that there was another problem: when building with gsmhr,
the content of _LIBADD gets overwritten in a conditional block.
Do not overwrite but append libgsmhr.la to _LIBADD.
Change-Id: Ib46b1f6555b13e0937a8d6fe6e2ad70ed9d06d58
Fixes: [1] 08c1edb986
Use the OSMO_IS_LITTLE_ENDIAN / OSMO_IS_BIG_ENDIAN macros from
libosmocore and run struct_endianness.py to auto-generate the big endian
part.
Related: OS#5884
Change-Id: Ibeb96f61054b11ca9d82f8d9a00c3935ffb086a6
When throttling is enabled, one voice frame will be processed every
20ms. This is useful for e.g. playback of a file as a RTP stream.
Without this option, the entire file would generate a flood of RTP
messages, rather than a continuous stream.
Change-Id: I0dcd4248cc800b82142722aa36a811f0657b3e0c
For a long time the RTP payload type was hard-coded for outgoing
frames. The problem is that according to RFC 3551 only GSM FR has
a static payload type value (see table 4, value 3). For other
codecs the payload type may be negotiated between the both
sides dynamically (i.e. in range 96-127).
Let's allow a binary/API user to configure this manually.
Change-Id: Ia07ed4e13b4a70c8bb4181564a8190861fd269da
Closes: OS#2482
Despite it was stated that only the last nibble isn't being
written, some other bytes in the middle of the output buffer
were uninitialized during the first exectution of a queue.
The problem was observed with AddressSanitizer enabled.
Valgrind output:
$ valgrind --track-origins=yes \
src/.libs/lt-osmo-gapk \
-i tests/ref-files/hhgttg_part1_5.s16.ti-efr \
-f ti-efr -g rawpcm-s16le \
-o /dev/null -v
Conditional jump or move depends on uninitialised value(s)
at 0x52728F2: msb_put_bit (utils.h:39)
by 0x52728F2: amr_efr_from_canon (fmt_amr.c:45)
by 0x5270A7D: osmo_gapk_pq_execute (procqueue.c:202)
by 0x40296A: run (app_osmo_gapk.c:650)
by 0x40296A: main (app_osmo_gapk.c:778)
Uninitialised value was created by a heap allocation
at 0x4C2AB80: malloc (in vgpreload_memcheck-amd64-linux.so)
by 0x4E3C2A8: talloc_named_const (in libtalloc.so.2.1.5)
by 0x5270A1B: osmo_gapk_pq_prepare (procqueue.c:180)
by 0x402940: run (app_osmo_gapk.c:645)
by 0x402940: main (app_osmo_gapk.c:778)
Change-Id: I79df56dde23702b0eac8e8fdbc0efd270cc0ace4
Related: OS#2934
In I06a21f60db01bfe1c2b838f93866fad1d53fdcd1 the Error Concealment
Unit API for FR codec was introduced. This change implements a
corresponding block.
Note: at the moment, only Full Rate is supported by the ECU API.
Change-Id: Ia929ee04f6be3d842c6ef7bc40cce0fdab16e90a
In the osmo_gapk_pq_prepare() we do allocate an item's buffer
conditionally, only when its type is not sink, because an output
buffer is not required for sink.
Let's use a bit more elegant way to check, whether item is sink.
Change-Id: I770a1d02273d9d8301a9e4ec72426fb8f4060277
This change fixes parallel building problem, when osmo-gapk was
being compiled before its libosmogapk dependency:
make[2]: *** No rule to make target '../src/libosmogapk.la',
needed by 'osmo-gapk'. Stop.
make[2]: *** Waiting for unfinished jobs....
For some reason, automake ignores a dependency if the full
path is provided:
$(top_builddir)/src/libosmogapk.la
while the relative path solves the problem:
libosmogapk.la
Closes: OS#2907
Change-Id: I3fdd1731bd372bbb42fe57981e757386e8ede0f0
The previous GAPK implementation was represented by a single
executable. So, all audio transcoding operations were available
only via calling the 'gapk' binary. This approach didn't allow
external applications to benefit from using GAPK API directly.
The following set of changes separates the common code into a
shared library called 'libosmogapk', linking the 'gapk' binary
against it:
- 95e6664 Introduce a shared 'libosmogapk' library
- 30209ce Install GAPK headers to '${includedir}/osmocom/gapk/'
- a8d4657 Add an 'osmo_gapk' prefix to the exposed symbols
- 40d59f1 Add a pkg-config manifest for libosmogapk
- 4f0a47d Add the symbol export map for libosmogapk
All memory management operations are now based on talloc library:
- 3c20dac libosmogapk: use talloc for memory management
- 5cabe1e osmo-gapk: use talloc for memory management
Integrated Osmocom logging framework:
- c35ba8a libosmogapk: use Osmocom logging framework
- 4b7cd2c osmo-gapk: drop useless printf calls
- 0fe18af osmo-gapk: use Osmocom logging framework
- 11943bf osmo-gapk: adjust application verbosity
Integrated GNU Autotest environment and basic test coverage:
- f069eb3 Init automake test environment
- 1fe6a9b tests: add procqueue test
- 3e9e57f tests: add pq_file test
- 9d2b15d tests: add pq_rtp test
- f59f3f1 tests: add format / codec transcoding tests
For more details, see commits history.
Change-Id: I3c6d4a9d326ee49153e4ad83823d094831c112da
Let's use the common string representation for item category
names, defined in the shared header, instead of defining
them in every file.
Change-Id: Ie0c449d77fa383cad27f67b8ce902bd071342dbb
Abusing the talloc hierarchical nature may cause some problems,
e.g. on embedded systems with emulated talloc API. Let's release
the memory allocated for a state explicitly.
Change-Id: Ie675a92b1e52a4886dc447af19f65ff5e12a4c40
The BENCHMARK_STOP should be called with a correct codec type and
a correct operation type (encode or decode). Otherwise the results
could be incorrect.
Change-Id: Ie90e85ca8d9ec3175a58dde60525e0b7d6daf608
The talloc_size() call sets the current file name and the current
line number as name for chunk being allocated. This combination
is not so informative during debugging, so let's use the static
'.buffer' string as context name for item's output buffer.
In order to give advanced control over a processing queue,
it would be better to have the checking function separated from
the osmo_gapk_pq_prepare(). Moreover, this change introduces an
additional 'strict' checking mode that requires a queue to have
a source item first and a sink item in the last position.
This change adds two meta-information fields to the processing
queue item structure. Both of them will be used for more
detailed logging and for the human-readable processing
queue description.
There are currently three types of prcessing queue items:
- source (file, alsa, rtp)
- proc (format, codec)
- sink (file, alsa, rtp)
Let's assign corresponding type for each item.
This would facilitate logging and the queue checking.
Since this change, every processing queue may optionally have
an associated human-readable name. If name is not required,
NULL should be passed to the osmo_gapk_pq_create().
In order to simplify memory leak debugging, this change introduces
the library's internal talloc context that may be changed by
external application by calling the osmo_gapk_set_talloc_ctx().
There are not so much code, related to internal logging subsystem.
So, there is no reason to keep a few lines in a dedicated file.
In the future one may also be used for other routines.
Previously the osmo-gapk application used to exit as soon as all
the frames are processed, no matter has the sink finished its
internal processing (e.g. ALSA playback).
In some cases it's required to wait for some queue items
to finish processing. For example, the ALSA sink writes the
audio samples to the buffer in non-blocking mode, so as soon
as all of them will be written, a program may finish execution,
causing the playback abort.
To prevent that, this change extends the library's API, allowing
each queue item to have a processing state callback that returns
a positive integer if processing is not finished yet,
and 0 otherwise.
Instead of immediately shutting down the application, it is
better to try to break the processing queue first, and stop
the execution immediately if second SIGINT is received.
The printf() writes the text into stdout, which may be undesirable
in some use cases. Moreover, the printed information was redundant.
So, let's drop such calls.
Since this change, the libosmogapk uses the Osmocom logging
framework. By default, logging is disabled and could be enabled
by the external applications calling the osmo_gapk_log_init()
with a desired log target as an argument.
Since GAPK package contains a library and the representative
osmo-gapk application, the 'main.c' looks a bit confusing. Let's
use the common naming scheme.
The usage of linuxlist is more flexible than having a limited
array of pointers. This approach allows to have as much items
in a processing queue as required.
To simplify the benchrarking process via the library API, this
change introduces two new functions, which are intended to
provide total cycle and frame count.
Having statically allocated memory for benchmark data of every
codec causes high memory usage, especially if actual benchmarking
is not required for a particular use case. Instead of that, let's
provide an optional opportunity to enable benchmarking for a
particular codec by calling the osmo_gapk_bench_enable(). The
required amount of memory would be allocated, and then can be
freed by calling the osmo_gapk_bench_free() or manually.
Matan Perelman
Vadim Yanitskiy
Oliver Smith
Harald Welte
Martin Hauke