| 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 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 if (new_send_codec.codecType != send_codec_.codecType || | 321 if (new_send_codec.codecType != send_codec_.codecType || |
| 322 strcmp(new_send_codec.plName, send_codec_.plName) != 0 || | 322 strcmp(new_send_codec.plName, send_codec_.plName) != 0 || |
| 323 new_send_codec.plType != send_codec_.plType || | 323 new_send_codec.plType != send_codec_.plType || |
| 324 new_send_codec.width != send_codec_.width || | 324 new_send_codec.width != send_codec_.width || |
| 325 new_send_codec.height != send_codec_.height || | 325 new_send_codec.height != send_codec_.height || |
| 326 new_send_codec.maxBitrate != send_codec_.maxBitrate || | 326 new_send_codec.maxBitrate != send_codec_.maxBitrate || |
| 327 new_send_codec.minBitrate != send_codec_.minBitrate || | 327 new_send_codec.minBitrate != send_codec_.minBitrate || |
| 328 new_send_codec.qpMax != send_codec_.qpMax || | 328 new_send_codec.qpMax != send_codec_.qpMax || |
| 329 new_send_codec.numberOfSimulcastStreams != | 329 new_send_codec.numberOfSimulcastStreams != |
| 330 send_codec_.numberOfSimulcastStreams || | 330 send_codec_.numberOfSimulcastStreams || |
| 331 new_send_codec.mode != send_codec_.mode || | 331 new_send_codec.mode != send_codec_.mode) { |
| 332 new_send_codec.extra_options != send_codec_.extra_options) { | |
| 333 return true; | 332 return true; |
| 334 } | 333 } |
| 335 | 334 |
| 336 switch (new_send_codec.codecType) { | 335 switch (new_send_codec.codecType) { |
| 337 case kVideoCodecVP8: | 336 case kVideoCodecVP8: |
| 338 if (memcmp(&new_send_codec.codecSpecific.VP8, | 337 if (memcmp(&new_send_codec.codecSpecific.VP8, |
| 339 &send_codec_.codecSpecific.VP8, | 338 &send_codec_.codecSpecific.VP8, |
| 340 sizeof(new_send_codec.codecSpecific.VP8)) != 0) { | 339 sizeof(new_send_codec.codecSpecific.VP8)) != 0) { |
| 341 return true; | 340 return true; |
| 342 } | 341 } |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 607 | 606 |
| 608 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem( | 607 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem( |
| 609 uint8_t payload_type) const { | 608 uint8_t payload_type) const { |
| 610 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type); | 609 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type); |
| 611 if (it != dec_external_map_.end()) { | 610 if (it != dec_external_map_.end()) { |
| 612 return (*it).second; | 611 return (*it).second; |
| 613 } | 612 } |
| 614 return nullptr; | 613 return nullptr; |
| 615 } | 614 } |
| 616 } // namespace webrtc | 615 } // namespace webrtc |
| OLD | NEW |