2011-07-07 08:21:25 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
|
|
|
*
|
|
|
|
|
* Use of this source code is governed by a BSD-style license
|
|
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
|
|
|
|
* in the file PATENTS. All contributing project authors may
|
|
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/******************************************************************
|
|
|
|
|
|
|
|
|
|
iLBC Speech Coder ANSI-C Source Code
|
|
|
|
|
|
|
|
|
|
WebRtcIlbcfix_InitEncode.c
|
|
|
|
|
|
|
|
|
|
******************************************************************/
|
|
|
|
|
|
|
|
|
|
#include "defines.h"
|
|
|
|
|
#include "constants.h"
|
|
|
|
|
|
|
|
|
|
/*----------------------------------------------------------------*
|
|
|
|
|
* Initiation of encoder instance.
|
|
|
|
|
*---------------------------------------------------------------*/
|
|
|
|
|
|
Reland "Upconvert various types to int.", ilbc portion.
This reverts portions of commit cb180976dd0e9672cde4523d87b5f4857478b5e9, which
reverted commit 83ad33a8aed1fb00e422b6abd33c3e8942821c24. Specifically, the
files in webrtc/modules/audio_coding/codecs/ilbc/ are relanded.
The original commit message is below:
Upconvert various types to int.
Per comments from HL/kwiberg on https://webrtc-codereview.appspot.com/42569004 , when there is existing usage of mixed types (int16_t, int, etc.), we'd prefer to standardize on larger types like int and phase out use of int16_t.
Specifically, "Using int16 just because we're sure all reasonable values will fit in 16 bits isn't usually meaningful in C."
This converts some existing uses of int16_t (and, in a few cases, other types such as uint16_t) to int (or, in a few places, int32_t). Other locations will be converted to size_t in a separate change.
BUG=none
TBR=kwiberg
Review URL: https://codereview.webrtc.org/1184643002
Cr-Commit-Position: refs/heads/master@{#9423}
2015-06-11 18:51:20 -07:00
|
|
|
int WebRtcIlbcfix_InitEncode( /* (o) Number of bytes encoded */
|
2014-12-17 15:23:29 +00:00
|
|
|
IlbcEncoder *iLBCenc_inst, /* (i/o) Encoder instance */
|
2013-04-09 00:28:06 +00:00
|
|
|
int16_t mode) { /* (i) frame size mode */
|
2011-07-07 08:21:25 +00:00
|
|
|
iLBCenc_inst->mode = mode;
|
|
|
|
|
|
|
|
|
|
/* Set all the variables that are dependent on the frame size mode */
|
|
|
|
|
if (mode==30) {
|
|
|
|
|
iLBCenc_inst->blockl = BLOCKL_30MS;
|
|
|
|
|
iLBCenc_inst->nsub = NSUB_30MS;
|
|
|
|
|
iLBCenc_inst->nasub = NASUB_30MS;
|
|
|
|
|
iLBCenc_inst->lpc_n = LPC_N_30MS;
|
|
|
|
|
iLBCenc_inst->no_of_bytes = NO_OF_BYTES_30MS;
|
|
|
|
|
iLBCenc_inst->no_of_words = NO_OF_WORDS_30MS;
|
|
|
|
|
iLBCenc_inst->state_short_len=STATE_SHORT_LEN_30MS;
|
|
|
|
|
}
|
|
|
|
|
else if (mode==20) {
|
|
|
|
|
iLBCenc_inst->blockl = BLOCKL_20MS;
|
|
|
|
|
iLBCenc_inst->nsub = NSUB_20MS;
|
|
|
|
|
iLBCenc_inst->nasub = NASUB_20MS;
|
|
|
|
|
iLBCenc_inst->lpc_n = LPC_N_20MS;
|
|
|
|
|
iLBCenc_inst->no_of_bytes = NO_OF_BYTES_20MS;
|
|
|
|
|
iLBCenc_inst->no_of_words = NO_OF_WORDS_20MS;
|
|
|
|
|
iLBCenc_inst->state_short_len=STATE_SHORT_LEN_20MS;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
return(-1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Clear the buffers and set the previous LSF and LSP to the mean value */
|
|
|
|
|
WebRtcSpl_MemSetW16(iLBCenc_inst->anaMem, 0, LPC_FILTERORDER);
|
|
|
|
|
WEBRTC_SPL_MEMCPY_W16(iLBCenc_inst->lsfold, WebRtcIlbcfix_kLsfMean, LPC_FILTERORDER);
|
|
|
|
|
WEBRTC_SPL_MEMCPY_W16(iLBCenc_inst->lsfdeqold, WebRtcIlbcfix_kLsfMean, LPC_FILTERORDER);
|
|
|
|
|
WebRtcSpl_MemSetW16(iLBCenc_inst->lpc_buffer, 0, LPC_LOOKBACK + BLOCKL_MAX);
|
|
|
|
|
|
|
|
|
|
/* Set the filter state of the HP filter to 0 */
|
|
|
|
|
WebRtcSpl_MemSetW16(iLBCenc_inst->hpimemx, 0, 2);
|
|
|
|
|
WebRtcSpl_MemSetW16(iLBCenc_inst->hpimemy, 0, 4);
|
|
|
|
|
|
|
|
|
|
#ifdef SPLIT_10MS
|
|
|
|
|
/*Zeroing the past samples for 10msec Split*/
|
|
|
|
|
WebRtcSpl_MemSetW16(iLBCenc_inst->past_samples,0,160);
|
|
|
|
|
iLBCenc_inst->section = 0;
|
|
|
|
|
#endif
|
|
|
|
|
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
return (int)(iLBCenc_inst->no_of_bytes);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|