diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /media-libs/codec2/files | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'media-libs/codec2/files')
-rw-r--r-- | media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch | 48 | ||||
-rw-r--r-- | media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch | 13 |
2 files changed, 0 insertions, 61 deletions
diff --git a/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch b/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch deleted file mode 100644 index 595e71a139dc..000000000000 --- a/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7a554bad2f28a4cf19cddf43c619fe5921ddaea3 Mon Sep 17 00:00:00 2001 -From: drowe67 <david@rowetel.com> -Date: Sat, 2 Oct 2021 15:48:09 +0930 -Subject: [PATCH] moved freedv_callback_rx_sym typedef and function into - freedv_api_internal.h - -Project-Bug-URL: https://github.com/drowe67/codec2/pull/235 -Gentoo-Bug-URL: https://bugs.gentoo.org/816453 ---- - src/freedv_api.h | 2 -- - src/freedv_api_internal.h | 4 ++++ - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/freedv_api.h b/src/freedv_api.h -index 23c5fef8..9393bd80 100644 ---- a/src/freedv_api.h -+++ b/src/freedv_api.h -@@ -145,7 +145,6 @@ struct freedv_advanced { - - // Called when text message char is decoded - typedef void (*freedv_callback_rx)(void *, char); --typedef void (*freedv_callback_rx_sym)(void *, _Complex float, float); - // Called when new text message char is needed - typedef char (*freedv_callback_tx)(void *); - typedef void (*freedv_calback_error_pattern) -@@ -212,7 +211,6 @@ int freedv_check_crc16_unpacked(unsigned char *unpacked_bits, int nbits); - // Set parameters ------------------------------------------------------------ - - void freedv_set_callback_txt (struct freedv *freedv, freedv_callback_rx rx, freedv_callback_tx tx, void *callback_state); --void freedv_set_callback_txt_sym (struct freedv *freedv, freedv_callback_rx_sym rx, void *callback_state); - void freedv_set_callback_protocol (struct freedv *freedv, freedv_callback_protorx rx, freedv_callback_prototx tx, void *callback_state); - void freedv_set_callback_data (struct freedv *freedv, freedv_callback_datarx datarx, freedv_callback_datatx datatx, void *callback_state); - void freedv_set_test_frames (struct freedv *freedv, int test_frames); -diff --git a/src/freedv_api_internal.h b/src/freedv_api_internal.h -index 0197e184..e7a9526c 100644 ---- a/src/freedv_api_internal.h -+++ b/src/freedv_api_internal.h -@@ -230,6 +230,10 @@ int freedv_rx_fsk_ldpc_data(struct freedv *f, COMP demod_in[]); - - int freedv_bits_to_speech(struct freedv *f, short speech_out[], short demod_in[], int rx_status); - -+// for the reliable text protocol we need to pass symbols back rather than text -+typedef void (*freedv_callback_rx_sym)(void *, _Complex float, float); -+void freedv_set_callback_txt_sym (struct freedv *freedv, freedv_callback_rx_sym rx, void *callback_state); -+ - #ifdef __cplusplus - } - #endif diff --git a/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch b/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch deleted file mode 100644 index 9290ea9b2cfa..000000000000 --- a/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cohpsk.c b/src/cohpsk.c -index f4f8dcdc..0b0ead9c 100644 ---- a/src/cohpsk.c -+++ b/src/cohpsk.c -@@ -809,7 +809,7 @@ typedef float float4 __attribute__ ((vector_size (16))); - - \*---------------------------------------------------------------------------*/ - --inline void rx_filter_coh(COMP rx_filt[COHPSK_NC+1][P+1], int Nc, COMP rx_baseband[COHPSK_NC+1][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC+1][+COHPSK_NFILTER], int nin) -+static inline void rx_filter_coh(COMP rx_filt[COHPSK_NC+1][P+1], int Nc, COMP rx_baseband[COHPSK_NC+1][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC+1][+COHPSK_NFILTER], int nin) - { - int c,i,j,k,l; - int n=COHPSK_M/P; |