Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
62e4828241
|
|
@ -16,6 +16,7 @@
|
|||
#define stricmp strcasecmp
|
||||
#endif
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
class strx
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 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);
|
||||
if (nr_of_frames > 0)
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ CodecList::Settings::OpusSpec CodecList::Settings::OpusSpec::parse(const std::st
|
|||
{
|
||||
OpusSpec result;
|
||||
|
||||
auto parts = strx::split(spec, "-");
|
||||
auto parts = strx::split(spec, "-/");
|
||||
if (parts.size() == 3)
|
||||
{
|
||||
result.mPayloadType = strx::toInt(strx::trim(parts.front()).c_str(), -1);
|
||||
|
|
|
|||
Loading…
Reference in New Issue