OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 case kVideoCodecGeneric: | 250 case kVideoCodecGeneric: |
251 break; | 251 break; |
252 // Known codecs without payload-specifics | 252 // Known codecs without payload-specifics |
253 case kVideoCodecI420: | 253 case kVideoCodecI420: |
254 case kVideoCodecRED: | 254 case kVideoCodecRED: |
255 case kVideoCodecULPFEC: | 255 case kVideoCodecULPFEC: |
256 case kVideoCodecFlexfec: | 256 case kVideoCodecFlexfec: |
257 break; | 257 break; |
258 // Unknown codec type, reset just to be sure. | 258 // Unknown codec type, reset just to be sure. |
259 case kVideoCodecUnknown: | 259 case kVideoCodecUnknown: |
| 260 case kVideoCodecStereo: |
260 return true; | 261 return true; |
261 } | 262 } |
262 | 263 |
263 if (new_send_codec.numberOfSimulcastStreams > 0) { | 264 if (new_send_codec.numberOfSimulcastStreams > 0) { |
264 for (unsigned char i = 0; i < new_send_codec.numberOfSimulcastStreams; | 265 for (unsigned char i = 0; i < new_send_codec.numberOfSimulcastStreams; |
265 ++i) { | 266 ++i) { |
266 if (memcmp(&new_send_codec.simulcastStream[i], | 267 if (memcmp(&new_send_codec.simulcastStream[i], |
267 &send_codec_.simulcastStream[i], | 268 &send_codec_.simulcastStream[i], |
268 sizeof(new_send_codec.simulcastStream[i])) != 0) { | 269 sizeof(new_send_codec.simulcastStream[i])) != 0) { |
269 return true; | 270 return true; |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
453 | 454 |
454 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem( | 455 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem( |
455 uint8_t payload_type) const { | 456 uint8_t payload_type) const { |
456 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type); | 457 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type); |
457 if (it != dec_external_map_.end()) { | 458 if (it != dec_external_map_.end()) { |
458 return (*it).second; | 459 return (*it).second; |
459 } | 460 } |
460 return nullptr; | 461 return nullptr; |
461 } | 462 } |
462 } // namespace webrtc | 463 } // namespace webrtc |
OLD | NEW |