public
/
rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dmytro Bogovych 2024-10-24 12:29:43 +03:00
parent 81bc17fbe2 5a0a7e1070
commit 62e4828241
3 changed files with 666 additions and 661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/engine/helper/HL_String.h
View File

@ -16,6 +16,7 @@
#define stricmp strcasecmp #define stricmp strcasecmp
#endif #endif
#include <cstdint>
class strx class strx
{ {

6
src/engine/media/MT_AudioCodec.cpp
View File

@ -494,7 +494,11 @@ int OpusCodec::encode(const void* input, int inputBytes, void* output, int outpu
int OpusCodec::decode(const void* input, int inputBytes, void* output, int outputCapacity) int OpusCodec::decode(const void* input, int inputBytes, void* output, int outputCapacity)
{ {
int nr_of_channels = opus_packet_get_nb_channels((const unsigned char*)input); int nr_of_channels = opus_packet_get_nb_channels((const unsigned char*)input);
assert(nr_of_channels == channels()); if (nr_of_channels != channels())
{
// Most probably bad configuration
return 0;
}
int nr_of_frames = opus_decoder_get_nb_samples(mDecoderCtx, (const unsigned char*)input, inputBytes); int nr_of_frames = opus_decoder_get_nb_samples(mDecoderCtx, (const unsigned char*)input, inputBytes);
if (nr_of_frames > 0) if (nr_of_frames > 0)

2
src/engine/media/MT_CodecList.cpp
View File

@ -116,7 +116,7 @@ CodecList::Settings::OpusSpec CodecList::Settings::OpusSpec::parse(const std::st
{ {
OpusSpec result; OpusSpec result;
auto parts = strx::split(spec, "-"); auto parts = strx::split(spec, "-/");
if (parts.size() == 3) if (parts.size() == 3)
{ {
result.mPayloadType = strx::toInt(strx::trim(parts.front()).c_str(), -1); result.mPayloadType = strx::toInt(strx::trim(parts.front()).c_str(), -1);