mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
- Update audio/bcg729 to 1.0.2
- Apply upstream patch to net/asterisk-g72x diue to API changes in bcg729
This commit is contained in:
parent
1c3ff69e42
commit
3ba0564475
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=444761
4 changed files with 46 additions and 3 deletions
|
@ -2,7 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= bcg729
|
||||
PORTVERSION= 1.0.1
|
||||
PORTVERSION= 1.0.2
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= SAVANNAH/linphone/plugins/sources
|
||||
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
SHA256 (bcg729-1.0.1.tar.gz) = 15f45abe2568b608984fe5f74aa8916d01a51cb26dcd559423d886d68ebe04ef
|
||||
SIZE (bcg729-1.0.1.tar.gz) = 473172
|
||||
TIMESTAMP = 1498733816
|
||||
SHA256 (bcg729-1.0.2.tar.gz) = 77c923edc57a53014da5f31788b63efbabfc7277c06deaeada06574628e4b03f
|
||||
SIZE (bcg729-1.0.2.tar.gz) = 474851
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= asterisk-g72x
|
||||
PORTVERSION= 1.4
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= http://asterisk.hosting.lv/src/
|
||||
|
||||
|
|
41
net/asterisk-g72x/files/patch-codec__g72x.c
Normal file
41
net/asterisk-g72x/files/patch-codec__g72x.c
Normal file
|
@ -0,0 +1,41 @@
|
|||
--- codec_g72x.c.orig 2016-10-05 19:27:27 UTC
|
||||
+++ codec_g72x.c
|
||||
@@ -215,7 +215,7 @@ static int lintog72x_new(struct ast_trans_pvt *pvt)
|
||||
apiG723Encoder_Init(state->coder, G723Encode_DefaultMode);
|
||||
#endif
|
||||
#else
|
||||
- state->coder = initBcg729EncoderChannel();
|
||||
+ state->coder = initBcg729EncoderChannel(0);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
@@ -320,7 +320,7 @@ static int g72xtolin_framein(struct ast_trans_pvt *pvt
|
||||
#if !G72X_BCG729
|
||||
apiG729Decode(state->coder, (unsigned char *)lost_frame, g729_frame_type(0), dst + pvt->samples);
|
||||
#else
|
||||
- bcg729Decoder(state->coder, (unsigned char *)lost_frame, 1, dst + pvt->samples);
|
||||
+ bcg729Decoder(state->coder, (unsigned char *)lost_frame, 0, 1, 0, 0, dst + pvt->samples);
|
||||
#endif
|
||||
pvt->samples += G729_SAMPLES;
|
||||
pvt->datalen += 2 * G729_SAMPLES; /* 2 bytes/sample */
|
||||
@@ -339,7 +339,7 @@ static int g72xtolin_framein(struct ast_trans_pvt *pvt
|
||||
#if !G72X_BCG729
|
||||
apiG729Decode(state->coder, (unsigned char *)f->FRAME_DATA + x, g729_frame_type(framesize), dst + pvt->samples);
|
||||
#elif G72X_9
|
||||
- bcg729Decoder(state->coder, (unsigned char *)f->FRAME_DATA + x, 0, dst + pvt->samples);
|
||||
+ bcg729Decoder(state->coder, (unsigned char *)f->FRAME_DATA + x, 0, 0, framesize == 2 ? 1 : 0, 0, dst + pvt->samples);
|
||||
#endif
|
||||
pvt->samples += G729_SAMPLES;
|
||||
pvt->datalen += 2*G729_SAMPLES;
|
||||
@@ -447,8 +447,9 @@ static struct ast_frame *lintog72x_frameout(struct ast
|
||||
datalen += (g723_sendrate == G723_RATE_63) ? 24 : 20;
|
||||
#endif
|
||||
#else
|
||||
- bcg729Encoder(state->coder, state->buf + samples, (unsigned char *)(pvt->OUTBUF_G72X) + datalen);
|
||||
- datalen += G729_FRAME_LEN;
|
||||
+ uint8_t framesize;
|
||||
+ bcg729Encoder(state->coder, state->buf + samples, (unsigned char *)(pvt->OUTBUF_G72X) + datalen, &framesize);
|
||||
+ datalen += framesize; // VAD is disabled, it's G729_FRAME_LEN
|
||||
#endif
|
||||
samples += G72X_SAMPLES;
|
||||
pvt->samples -= G72X_SAMPLES;
|
Loading…
Add table
Reference in a new issue