| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 factory_->DestroyVideoEncoder(encoder); | 142 factory_->DestroyVideoEncoder(encoder); |
| 143 return; | 143 return; |
| 144 } | 144 } |
| 145 | 145 |
| 146 // Otherwise, SimulcastEncoderAdapter can be deleted directly, and will call | 146 // Otherwise, SimulcastEncoderAdapter can be deleted directly, and will call |
| 147 // DestroyVideoEncoder on the factory for individual encoder instances. | 147 // DestroyVideoEncoder on the factory for individual encoder instances. |
| 148 delete encoder; | 148 delete encoder; |
| 149 } | 149 } |
| 150 | 150 |
| 151 private: | 151 private: |
| 152 // Disable overloaded virtual function warning. TODO(magjed): Remove once |
| 153 // http://crbug/webrtc/6402 is fixed. |
| 154 using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder; |
| 155 |
| 152 cricket::WebRtcVideoEncoderFactory* factory_; | 156 cricket::WebRtcVideoEncoderFactory* factory_; |
| 153 // A list of encoders that were created without being wrapped in a | 157 // A list of encoders that were created without being wrapped in a |
| 154 // SimulcastEncoderAdapter. | 158 // SimulcastEncoderAdapter. |
| 155 std::vector<webrtc::VideoEncoder*> non_simulcast_encoders_; | 159 std::vector<webrtc::VideoEncoder*> non_simulcast_encoders_; |
| 156 }; | 160 }; |
| 157 | 161 |
| 158 void AddDefaultFeedbackParams(VideoCodec* codec) { | 162 void AddDefaultFeedbackParams(VideoCodec* codec) { |
| 159 codec->AddFeedbackParam(FeedbackParam(kRtcpFbParamCcm, kRtcpFbCcmParamFir)); | 163 codec->AddFeedbackParam(FeedbackParam(kRtcpFbParamCcm, kRtcpFbCcmParamFir)); |
| 160 codec->AddFeedbackParam(FeedbackParam(kRtcpFbParamNack, kParamValueEmpty)); | 164 codec->AddFeedbackParam(FeedbackParam(kRtcpFbParamNack, kParamValueEmpty)); |
| 161 codec->AddFeedbackParam(FeedbackParam(kRtcpFbParamNack, kRtcpFbNackParamPli)); | 165 codec->AddFeedbackParam(FeedbackParam(kRtcpFbParamNack, kRtcpFbNackParamPli)); |
| (...skipping 2397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2559 rtx_mapping[video_codecs[i].codec.id] != | 2563 rtx_mapping[video_codecs[i].codec.id] != |
| 2560 ulpfec_config.red_payload_type) { | 2564 ulpfec_config.red_payload_type) { |
| 2561 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2565 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
| 2562 } | 2566 } |
| 2563 } | 2567 } |
| 2564 | 2568 |
| 2565 return video_codecs; | 2569 return video_codecs; |
| 2566 } | 2570 } |
| 2567 | 2571 |
| 2568 } // namespace cricket | 2572 } // namespace cricket |
| OLD | NEW |