OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 1827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1838 CreateVideoEncoderConfig(last_dimensions_, codec_settings.codec); | 1838 CreateVideoEncoderConfig(last_dimensions_, codec_settings.codec); |
1839 RTC_DCHECK(!parameters_.encoder_config.streams.empty()); | 1839 RTC_DCHECK(!parameters_.encoder_config.streams.empty()); |
1840 | 1840 |
1841 format_ = VideoFormat(codec_settings.codec.width, | 1841 format_ = VideoFormat(codec_settings.codec.width, |
1842 codec_settings.codec.height, | 1842 codec_settings.codec.height, |
1843 VideoFormat::FpsToInterval(30), | 1843 VideoFormat::FpsToInterval(30), |
1844 FOURCC_I420); | 1844 FOURCC_I420); |
1845 | 1845 |
1846 AllocatedEncoder new_encoder = CreateVideoEncoder(codec_settings.codec); | 1846 AllocatedEncoder new_encoder = CreateVideoEncoder(codec_settings.codec); |
1847 parameters_.config.encoder_settings.encoder = new_encoder.encoder; | 1847 parameters_.config.encoder_settings.encoder = new_encoder.encoder; |
| 1848 parameters_.config.encoder_settings.full_overuse_time = new_encoder.external; |
1848 parameters_.config.encoder_settings.payload_name = codec_settings.codec.name; | 1849 parameters_.config.encoder_settings.payload_name = codec_settings.codec.name; |
1849 parameters_.config.encoder_settings.payload_type = codec_settings.codec.id; | 1850 parameters_.config.encoder_settings.payload_type = codec_settings.codec.id; |
1850 if (new_encoder.external) { | 1851 if (new_encoder.external) { |
1851 webrtc::VideoCodecType type = CodecTypeFromName(codec_settings.codec.name); | 1852 webrtc::VideoCodecType type = CodecTypeFromName(codec_settings.codec.name); |
1852 parameters_.config.encoder_settings.internal_source = | 1853 parameters_.config.encoder_settings.internal_source = |
1853 external_encoder_factory_->EncoderTypeHasInternalSource(type); | 1854 external_encoder_factory_->EncoderTypeHasInternalSource(type); |
1854 } | 1855 } |
1855 parameters_.config.rtp.fec = codec_settings.fec; | 1856 parameters_.config.rtp.fec = codec_settings.fec; |
1856 | 1857 |
1857 // Set RTX payload type if RTX is enabled. | 1858 // Set RTX payload type if RTX is enabled. |
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2605 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2606 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2606 } | 2607 } |
2607 } | 2608 } |
2608 | 2609 |
2609 return video_codecs; | 2610 return video_codecs; |
2610 } | 2611 } |
2611 | 2612 |
2612 } // namespace cricket | 2613 } // namespace cricket |
2613 | 2614 |
2614 #endif // HAVE_WEBRTC_VIDEO | 2615 #endif // HAVE_WEBRTC_VIDEO |
OLD | NEW |