e5b94160b5
See https://webrtc-review.googlesource.com/c/src/+/121764 for the overall vision. This CL adds a multistream Opus decoder. It's a new code-path to not interfere with the standard Opus decoder. We introduce new SDP syntax, which uses terminology of RFC 7845. We also set up the decoder side to parse it. The encoder part will come in a later CL. E.g. this is the new SDP syntax for 6.1 surround sound: "multiopus/48000/6 channel_mapping=0,4,1,2,3,5 num_streams=4 coupled_streams=2" Bug: webrtc:8649 Change-Id: Ifbc584cbb6d07aed373f223512a20d6d72cec5ec Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129768 Commit-Queue: Alex Loiko <aleloi@webrtc.org> Reviewed-by: Oskar Sundbom <ossu@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27493}
59 lines
2.4 KiB
C++
59 lines
2.4 KiB
C++
/*
|
|
* Copyright (c) 2019 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 "api/audio_codecs/opus/audio_decoder_multi_channel_opus.h"
|
|
#include "api/audio_codecs/opus/audio_decoder_multi_channel_opus_config.h"
|
|
#include "test/fuzzers/audio_decoder_fuzzer.h"
|
|
|
|
namespace webrtc {
|
|
|
|
AudioDecoderMultiChannelOpusConfig MakeDecoderConfig(
|
|
int num_channels,
|
|
int coupled_streams,
|
|
std::vector<unsigned char> channel_mapping) {
|
|
AudioDecoderMultiChannelOpusConfig config;
|
|
config.num_channels = num_channels;
|
|
config.coupled_streams = coupled_streams;
|
|
config.channel_mapping = channel_mapping;
|
|
return config;
|
|
}
|
|
|
|
void FuzzOneInput(const uint8_t* data, size_t size) {
|
|
const std::vector<AudioDecoderMultiChannelOpusConfig> surround_configs = {
|
|
MakeDecoderConfig(1, 0, {0}), // Mono
|
|
|
|
MakeDecoderConfig(2, 0, {0, 0}), // Copy the first (of
|
|
// 2) decoded streams
|
|
// into both output
|
|
// channel 0 and output
|
|
// channel 1. Ignore
|
|
// the 2nd decoded
|
|
// stream.
|
|
|
|
MakeDecoderConfig(4, 2, {0, 1, 2, 3}), // Quad.
|
|
MakeDecoderConfig(6, 2, {0, 4, 1, 2, 3, 5}), // 5.1
|
|
MakeDecoderConfig(8, 3, {0, 6, 1, 2, 3, 4, 5, 7}) // 7.1
|
|
};
|
|
|
|
const auto config = surround_configs[data[0] % surround_configs.size()];
|
|
std::unique_ptr<AudioDecoder> dec =
|
|
AudioDecoderMultiChannelOpus::MakeAudioDecoder(config);
|
|
RTC_CHECK(dec);
|
|
const int kSampleRateHz = 48000;
|
|
const size_t kAllocatedOuputSizeSamples =
|
|
4 * kSampleRateHz / 10; // 4x100 ms, 4 times the size of the output array
|
|
// for the stereo Opus codec. It should be enough
|
|
// for 8 channels.
|
|
int16_t output[kAllocatedOuputSizeSamples];
|
|
FuzzAudioDecoder(DecoderFunctionType::kNormalDecode, data, size, dec.get(),
|
|
kSampleRateHz, sizeof(output), output);
|
|
}
|
|
} // namespace webrtc
|