| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 134   codecs[8] = std::make_pair(NetEqDecoder::kDecoderPCMa, "pcma"); | 134   codecs[8] = std::make_pair(NetEqDecoder::kDecoderPCMa, "pcma"); | 
| 135   codecs[103] = std::make_pair(NetEqDecoder::kDecoderISAC, "isac"); | 135   codecs[103] = std::make_pair(NetEqDecoder::kDecoderISAC, "isac"); | 
| 136   codecs[104] = std::make_pair(NetEqDecoder::kDecoderISACswb, "isac-swb"); | 136   codecs[104] = std::make_pair(NetEqDecoder::kDecoderISACswb, "isac-swb"); | 
| 137   codecs[111] = std::make_pair(NetEqDecoder::kDecoderOpus, "opus"); | 137   codecs[111] = std::make_pair(NetEqDecoder::kDecoderOpus, "opus"); | 
| 138   codecs[93] = std::make_pair(NetEqDecoder::kDecoderPCM16B, "pcm16-nb"); | 138   codecs[93] = std::make_pair(NetEqDecoder::kDecoderPCM16B, "pcm16-nb"); | 
| 139   codecs[94] = std::make_pair(NetEqDecoder::kDecoderPCM16Bwb, "pcm16-wb"); | 139   codecs[94] = std::make_pair(NetEqDecoder::kDecoderPCM16Bwb, "pcm16-wb"); | 
| 140   codecs[96] = | 140   codecs[96] = | 
| 141       std::make_pair(NetEqDecoder::kDecoderPCM16Bswb48kHz, "pcm16-swb48"); | 141       std::make_pair(NetEqDecoder::kDecoderPCM16Bswb48kHz, "pcm16-swb48"); | 
| 142   codecs[9] = std::make_pair(NetEqDecoder::kDecoderG722, "g722"); | 142   codecs[9] = std::make_pair(NetEqDecoder::kDecoderG722, "g722"); | 
| 143   codecs[106] = std::make_pair(NetEqDecoder::kDecoderAVT, "avt"); | 143   codecs[106] = std::make_pair(NetEqDecoder::kDecoderAVT, "avt"); | 
|  | 144   codecs[114] = std::make_pair(NetEqDecoder::kDecoderAVT16kHz, "avt-16"); | 
|  | 145   codecs[115] = std::make_pair(NetEqDecoder::kDecoderAVT32kHz, "avt-32"); | 
|  | 146   codecs[116] = std::make_pair(NetEqDecoder::kDecoderAVT48kHz, "avt-48"); | 
| 144   codecs[117] = std::make_pair(NetEqDecoder::kDecoderRED, "red"); | 147   codecs[117] = std::make_pair(NetEqDecoder::kDecoderRED, "red"); | 
| 145   codecs[13] = std::make_pair(NetEqDecoder::kDecoderCNGnb, "cng-nb"); | 148   codecs[13] = std::make_pair(NetEqDecoder::kDecoderCNGnb, "cng-nb"); | 
| 146   codecs[98] = std::make_pair(NetEqDecoder::kDecoderCNGwb, "cng-wb"); | 149   codecs[98] = std::make_pair(NetEqDecoder::kDecoderCNGwb, "cng-wb"); | 
| 147   codecs[99] = std::make_pair(NetEqDecoder::kDecoderCNGswb32kHz, "cng-swb32"); | 150   codecs[99] = std::make_pair(NetEqDecoder::kDecoderCNGswb32kHz, "cng-swb32"); | 
| 148   codecs[100] = std::make_pair(NetEqDecoder::kDecoderCNGswb48kHz, "cng-swb48"); | 151   codecs[100] = std::make_pair(NetEqDecoder::kDecoderCNGswb48kHz, "cng-swb48"); | 
| 149   // This is the payload type that will be used for encoding. | 152   // This is the payload type that will be used for encoding. | 
| 150   codecs[kPayloadType] = | 153   codecs[kPayloadType] = | 
| 151       std::make_pair(NetEqDecoder::kDecoderPCM16Bswb32kHz, "pcm16-swb32"); | 154       std::make_pair(NetEqDecoder::kDecoderPCM16Bswb32kHz, "pcm16-swb32"); | 
| 152   NetEqTest::ExtDecoderMap ext_codecs; | 155   NetEqTest::ExtDecoderMap ext_codecs; | 
| 153 | 156 | 
| 154   NetEqTest test(config, codecs, ext_codecs, std::move(input), | 157   NetEqTest test(config, codecs, ext_codecs, std::move(input), | 
| 155                  std::move(output), &dummy_callback); | 158                  std::move(output), &dummy_callback); | 
| 156   test.Run(); | 159   test.Run(); | 
| 157 } | 160 } | 
| 158 | 161 | 
| 159 }  // namespace test | 162 }  // namespace test | 
| 160 | 163 | 
| 161 void FuzzOneInput(const uint8_t* data, size_t size) { | 164 void FuzzOneInput(const uint8_t* data, size_t size) { | 
| 162   test::FuzzOneInputTest(data, size); | 165   test::FuzzOneInputTest(data, size); | 
| 163 } | 166 } | 
| 164 | 167 | 
| 165 }  // namespace webrtc | 168 }  // namespace webrtc | 
| OLD | NEW | 
|---|