1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-03 11:12:13 +00:00

Update asterisk-g72x to 1.4.2

This commit is contained in:
Guido Falsi 2018-03-25 20:49:08 +00:00
parent d17e47575b
commit 1f5755641b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=465546
3 changed files with 4 additions and 46 deletions

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asterisk-g72x
PORTVERSION= 1.4
PORTREVISION= 1
PORTVERSION= 1.4.2
CATEGORIES= net
MASTER_SITES= http://asterisk.hosting.lv/src/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1475740880
SHA256 (asterisk-g72x-1.4.tar.bz2) = 0b4959c757c33d5cf0038f40ed94e7bfc00fd0dc22821d48742fe930cc24ae54
SIZE (asterisk-g72x-1.4.tar.bz2) = 125990
TIMESTAMP = 1521966069
SHA256 (asterisk-g72x-1.4.2.tar.bz2) = 0c6cb1a61d408c882ce3fe10db4d467407ce3863f672a91aa7d3aea082a23fbc
SIZE (asterisk-g72x-1.4.2.tar.bz2) = 125789

View File

@ -1,41 +0,0 @@
--- 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;