| 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 settings->maxFramerate = VCM_DEFAULT_FRAME_RATE; | 205 settings->maxFramerate = VCM_DEFAULT_FRAME_RATE; |
| 206 settings->width = VCM_DEFAULT_CODEC_WIDTH; | 206 settings->width = VCM_DEFAULT_CODEC_WIDTH; |
| 207 settings->height = VCM_DEFAULT_CODEC_HEIGHT; | 207 settings->height = VCM_DEFAULT_CODEC_HEIGHT; |
| 208 settings->minBitrate = VCM_MIN_BITRATE; | 208 settings->minBitrate = VCM_MIN_BITRATE; |
| 209 settings->numberOfSimulcastStreams = 0; | 209 settings->numberOfSimulcastStreams = 0; |
| 210 return; | 210 return; |
| 211 case kVideoCodecRED: | 211 case kVideoCodecRED: |
| 212 case kVideoCodecULPFEC: | 212 case kVideoCodecULPFEC: |
| 213 case kVideoCodecFlexfec: | 213 case kVideoCodecFlexfec: |
| 214 case kVideoCodecGeneric: | 214 case kVideoCodecGeneric: |
| 215 case kVideoCodecStereo: |
| 215 case kVideoCodecUnknown: | 216 case kVideoCodecUnknown: |
| 216 RTC_NOTREACHED(); | 217 RTC_NOTREACHED(); |
| 217 return; | 218 return; |
| 218 } | 219 } |
| 219 } | 220 } |
| 220 | 221 |
| 221 // Assuming only one registered encoder - since only one used, no need for more. | 222 // Assuming only one registered encoder - since only one used, no need for more. |
| 222 bool VCMCodecDataBase::SetSendCodec(const VideoCodec* send_codec, | 223 bool VCMCodecDataBase::SetSendCodec(const VideoCodec* send_codec, |
| 223 int number_of_cores, | 224 int number_of_cores, |
| 224 size_t max_payload_size) { | 225 size_t max_payload_size) { |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 case kVideoCodecGeneric: | 381 case kVideoCodecGeneric: |
| 381 break; | 382 break; |
| 382 // Known codecs without payload-specifics | 383 // Known codecs without payload-specifics |
| 383 case kVideoCodecI420: | 384 case kVideoCodecI420: |
| 384 case kVideoCodecRED: | 385 case kVideoCodecRED: |
| 385 case kVideoCodecULPFEC: | 386 case kVideoCodecULPFEC: |
| 386 case kVideoCodecFlexfec: | 387 case kVideoCodecFlexfec: |
| 387 break; | 388 break; |
| 388 // Unknown codec type, reset just to be sure. | 389 // Unknown codec type, reset just to be sure. |
| 389 case kVideoCodecUnknown: | 390 case kVideoCodecUnknown: |
| 391 case kVideoCodecStereo: |
| 390 return true; | 392 return true; |
| 391 } | 393 } |
| 392 | 394 |
| 393 if (new_send_codec.numberOfSimulcastStreams > 0) { | 395 if (new_send_codec.numberOfSimulcastStreams > 0) { |
| 394 for (unsigned char i = 0; i < new_send_codec.numberOfSimulcastStreams; | 396 for (unsigned char i = 0; i < new_send_codec.numberOfSimulcastStreams; |
| 395 ++i) { | 397 ++i) { |
| 396 if (memcmp(&new_send_codec.simulcastStream[i], | 398 if (memcmp(&new_send_codec.simulcastStream[i], |
| 397 &send_codec_.simulcastStream[i], | 399 &send_codec_.simulcastStream[i], |
| 398 sizeof(new_send_codec.simulcastStream[i])) != 0) { | 400 sizeof(new_send_codec.simulcastStream[i])) != 0) { |
| 399 return true; | 401 return true; |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 | 585 |
| 584 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem( | 586 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem( |
| 585 uint8_t payload_type) const { | 587 uint8_t payload_type) const { |
| 586 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type); | 588 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type); |
| 587 if (it != dec_external_map_.end()) { | 589 if (it != dec_external_map_.end()) { |
| 588 return (*it).second; | 590 return (*it).second; |
| 589 } | 591 } |
| 590 return nullptr; | 592 return nullptr; |
| 591 } | 593 } |
| 592 } // namespace webrtc | 594 } // namespace webrtc |
| OLD | NEW |