diff options
author | Vadim Yanitskiy <axilirator@gmail.com> | 2017-08-31 17:22:56 +0700 |
---|---|---|
committer | Vadim Yanitskiy <axilirator@gmail.com> | 2017-12-31 12:20:59 +0100 |
commit | a8d46571cebb7f14501fa7bcf3c2eb86c473d8b2 (patch) | |
tree | 8e8dfb392f9a13026ff521e85f2b5babd1ce4c12 /src/pq_codec.c | |
parent | 9cba760ba2ca5fd73e34f91bf388fc255dbcd335 (diff) |
Add an 'osmo_gapk' prefix to the exposed symbols
To avoid a naming conflict between libosmogapk and other projects
during linkage, all the exposed symbols should have an unique
prefix. Let's use 'osmo_gapk' for that.
Diffstat (limited to 'src/pq_codec.c')
-rw-r--r-- | src/pq_codec.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/pq_codec.c b/src/pq_codec.c index 4b41e1d..37fa1c9 100644 --- a/src/pq_codec.c +++ b/src/pq_codec.c @@ -31,14 +31,14 @@ * \param[in] encode (1) or decode (0) * \returns 0 on success; negative on error */ int -pq_queue_codec(struct pq *pq, const struct codec_desc *codec, int enc_dec_n) +osmo_gapk_pq_queue_codec(struct osmo_gapk_pq *pq, const struct osmo_gapk_codec_desc *codec, int enc_dec_n) { - const struct codec_desc *codec_pcm = codec_get_from_type(CODEC_PCM); - const struct format_desc *fmt; - struct pq_item *item; + const struct osmo_gapk_codec_desc *codec_pcm; + const struct osmo_gapk_format_desc *fmt; + struct osmo_gapk_pq_item *item; /* allocate a new item to the processing queue */ - item = pq_add_item(pq); + item = osmo_gapk_pq_add_item(pq); if (!item) return -ENOMEM; @@ -50,7 +50,8 @@ pq_queue_codec(struct pq *pq, const struct codec_desc *codec, int enc_dec_n) } if (enc_dec_n) { - fmt = fmt_get_from_type(codec->codec_enc_format_type); + codec_pcm = osmo_gapk_codec_get_from_type(CODEC_PCM); + fmt = osmo_gapk_fmt_get_from_type(codec->codec_enc_format_type); if (!fmt) return -EINVAL; @@ -58,7 +59,8 @@ pq_queue_codec(struct pq *pq, const struct codec_desc *codec, int enc_dec_n) item->len_out = fmt->frame_len; item->proc = codec->codec_encode; } else { - fmt = fmt_get_from_type(codec->codec_dec_format_type); + codec_pcm = osmo_gapk_codec_get_from_type(CODEC_PCM); + fmt = osmo_gapk_fmt_get_from_type(codec->codec_dec_format_type); if (!fmt) return -EINVAL; |