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.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
2014-09-03 19:42:16 +00:00
|
|
|
#include "g722_enc_dec.h"
|
2014-09-04 13:28:48 +00:00
|
|
|
#include "g722_interface.h"
|
|
|
|
|
#include "webrtc/typedefs.h"
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-04-09 00:28:06 +00:00
|
|
|
int16_t WebRtcG722_CreateEncoder(G722EncInst **G722enc_inst)
|
2011-07-07 08:21:25 +00:00
|
|
|
{
|
2014-12-17 15:23:29 +00:00
|
|
|
*G722enc_inst=(G722EncInst*)malloc(sizeof(G722EncoderState));
|
2011-07-07 08:21:25 +00:00
|
|
|
if (*G722enc_inst!=NULL) {
|
|
|
|
|
return(0);
|
|
|
|
|
} else {
|
|
|
|
|
return(-1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-04-09 00:28:06 +00:00
|
|
|
int16_t WebRtcG722_EncoderInit(G722EncInst *G722enc_inst)
|
2011-07-07 08:21:25 +00:00
|
|
|
{
|
|
|
|
|
// Create and/or reset the G.722 encoder
|
|
|
|
|
// Bitrate 64 kbps and wideband mode (2)
|
2011-12-22 12:20:06 +00:00
|
|
|
G722enc_inst = (G722EncInst *) WebRtc_g722_encode_init(
|
2014-12-17 15:23:29 +00:00
|
|
|
(G722EncoderState*) G722enc_inst, 64000, 2);
|
2011-07-07 08:21:25 +00:00
|
|
|
if (G722enc_inst == NULL) {
|
|
|
|
|
return -1;
|
|
|
|
|
} else {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Reland "Upconvert various types to int.", misc. codecs portion.
This reverts portions of commit cb180976dd0e9672cde4523d87b5f4857478b5e9, which
reverted commit 83ad33a8aed1fb00e422b6abd33c3e8942821c24. Specifically, the
files in webrtc/modules/audio_coding/codecs/ that are not in ilbc/ or isac/, as
well as webrtc/modules/audio_coding/main/test/opus_test.cc, 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/1179093003
Cr-Commit-Position: refs/heads/master@{#9424}
2015-06-11 19:02:46 -07:00
|
|
|
int WebRtcG722_FreeEncoder(G722EncInst *G722enc_inst)
|
2011-07-07 08:21:25 +00:00
|
|
|
{
|
|
|
|
|
// Free encoder memory
|
2014-12-17 15:23:29 +00:00
|
|
|
return WebRtc_g722_encode_release((G722EncoderState*) G722enc_inst);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
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
|
|
|
size_t WebRtcG722_Encode(G722EncInst *G722enc_inst,
|
|
|
|
|
const int16_t* speechIn,
|
|
|
|
|
size_t len,
|
|
|
|
|
uint8_t* encoded)
|
2011-07-07 08:21:25 +00:00
|
|
|
{
|
|
|
|
|
unsigned char *codechar = (unsigned char*) encoded;
|
|
|
|
|
// Encode the input speech vector
|
Reformat existing code. There should be no functional effects.
This includes changes like:
* Attempt to break lines at better positions
* Use "override" in more places, don't use "virtual" with it
* Use {} where the body is more than one line
* Make declaration and definition arg names match
* Eliminate unused code
* EXPECT_EQ(expected, actual) (but use (actual, expected) for e.g. _GT)
* Correct #include order
* Use anonymous namespaces in preference to "static" for file-scoping
* Eliminate unnecessary casts
* Update reference code in comments of ARM assembly sources to match actual current C code
* Fix indenting to be more style-guide compliant
* Use arraysize() in more places
* Use bool instead of int for "boolean" values (0/1)
* Shorten and simplify code
* Spaces around operators
* 80 column limit
* Use const more consistently
* Space goes after '*' in type name, not before
* Remove unnecessary return values
* Use "(var == const)", not "(const == var)"
* Spelling
* Prefer true, typed constants to "enum hack" constants
* Avoid "virtual" on non-overridden functions
* ASSERT(x == y) -> ASSERT_EQ(y, x)
BUG=none
R=andrew@webrtc.org, asapersson@webrtc.org, henrika@webrtc.org, juberti@webrtc.org, kjellander@webrtc.org, kwiberg@webrtc.org
Review URL: https://codereview.webrtc.org/1172163004
Cr-Commit-Position: refs/heads/master@{#9420}
2015-06-11 14:31:38 -07:00
|
|
|
return WebRtc_g722_encode((G722EncoderState*) G722enc_inst, codechar,
|
|
|
|
|
speechIn, len);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-09 00:28:06 +00:00
|
|
|
int16_t WebRtcG722_CreateDecoder(G722DecInst **G722dec_inst)
|
2011-07-07 08:21:25 +00:00
|
|
|
{
|
2014-12-17 15:23:29 +00:00
|
|
|
*G722dec_inst=(G722DecInst*)malloc(sizeof(G722DecoderState));
|
2011-07-07 08:21:25 +00:00
|
|
|
if (*G722dec_inst!=NULL) {
|
|
|
|
|
return(0);
|
|
|
|
|
} else {
|
|
|
|
|
return(-1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-04-09 00:28:06 +00:00
|
|
|
int16_t WebRtcG722_DecoderInit(G722DecInst *G722dec_inst)
|
2011-07-07 08:21:25 +00:00
|
|
|
{
|
|
|
|
|
// Create and/or reset the G.722 decoder
|
|
|
|
|
// Bitrate 64 kbps and wideband mode (2)
|
2011-12-22 12:20:06 +00:00
|
|
|
G722dec_inst = (G722DecInst *) WebRtc_g722_decode_init(
|
2014-12-17 15:23:29 +00:00
|
|
|
(G722DecoderState*) G722dec_inst, 64000, 2);
|
2011-07-07 08:21:25 +00:00
|
|
|
if (G722dec_inst == NULL) {
|
|
|
|
|
return -1;
|
|
|
|
|
} else {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Reland "Upconvert various types to int.", misc. codecs portion.
This reverts portions of commit cb180976dd0e9672cde4523d87b5f4857478b5e9, which
reverted commit 83ad33a8aed1fb00e422b6abd33c3e8942821c24. Specifically, the
files in webrtc/modules/audio_coding/codecs/ that are not in ilbc/ or isac/, as
well as webrtc/modules/audio_coding/main/test/opus_test.cc, 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/1179093003
Cr-Commit-Position: refs/heads/master@{#9424}
2015-06-11 19:02:46 -07:00
|
|
|
int WebRtcG722_FreeDecoder(G722DecInst *G722dec_inst)
|
2011-07-07 08:21:25 +00:00
|
|
|
{
|
|
|
|
|
// Free encoder memory
|
2014-12-17 15:23:29 +00:00
|
|
|
return WebRtc_g722_decode_release((G722DecoderState*) G722dec_inst);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
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
|
|
|
size_t WebRtcG722_Decode(G722DecInst *G722dec_inst,
|
|
|
|
|
const uint8_t *encoded,
|
|
|
|
|
size_t len,
|
|
|
|
|
int16_t *decoded,
|
|
|
|
|
int16_t *speechType)
|
2011-07-07 08:21:25 +00:00
|
|
|
{
|
|
|
|
|
// Decode the G.722 encoder stream
|
|
|
|
|
*speechType=G722_WEBRTC_SPEECH;
|
Reformat existing code. There should be no functional effects.
This includes changes like:
* Attempt to break lines at better positions
* Use "override" in more places, don't use "virtual" with it
* Use {} where the body is more than one line
* Make declaration and definition arg names match
* Eliminate unused code
* EXPECT_EQ(expected, actual) (but use (actual, expected) for e.g. _GT)
* Correct #include order
* Use anonymous namespaces in preference to "static" for file-scoping
* Eliminate unnecessary casts
* Update reference code in comments of ARM assembly sources to match actual current C code
* Fix indenting to be more style-guide compliant
* Use arraysize() in more places
* Use bool instead of int for "boolean" values (0/1)
* Shorten and simplify code
* Spaces around operators
* 80 column limit
* Use const more consistently
* Space goes after '*' in type name, not before
* Remove unnecessary return values
* Use "(var == const)", not "(const == var)"
* Spelling
* Prefer true, typed constants to "enum hack" constants
* Avoid "virtual" on non-overridden functions
* ASSERT(x == y) -> ASSERT_EQ(y, x)
BUG=none
R=andrew@webrtc.org, asapersson@webrtc.org, henrika@webrtc.org, juberti@webrtc.org, kjellander@webrtc.org, kwiberg@webrtc.org
Review URL: https://codereview.webrtc.org/1172163004
Cr-Commit-Position: refs/heads/master@{#9420}
2015-06-11 14:31:38 -07:00
|
|
|
return WebRtc_g722_decode((G722DecoderState*) G722dec_inst, decoded,
|
|
|
|
|
encoded, len);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-09 00:28:06 +00:00
|
|
|
int16_t WebRtcG722_Version(char *versionStr, short len)
|
2011-07-07 08:21:25 +00:00
|
|
|
{
|
|
|
|
|
// Get version string
|
|
|
|
|
char version[30] = "2.0.0\n";
|
|
|
|
|
if (strlen(version) < (unsigned int)len)
|
|
|
|
|
{
|
|
|
|
|
strcpy(versionStr, version);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|