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 1770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1781 CreateVideoEncoderConfig(last_dimensions_, codec_settings.codec); | 1781 CreateVideoEncoderConfig(last_dimensions_, codec_settings.codec); |
1782 RTC_DCHECK(!parameters_.encoder_config.streams.empty()); | 1782 RTC_DCHECK(!parameters_.encoder_config.streams.empty()); |
1783 | 1783 |
1784 format_ = VideoFormat(codec_settings.codec.width, | 1784 format_ = VideoFormat(codec_settings.codec.width, |
1785 codec_settings.codec.height, | 1785 codec_settings.codec.height, |
1786 VideoFormat::FpsToInterval(30), | 1786 VideoFormat::FpsToInterval(30), |
1787 FOURCC_I420); | 1787 FOURCC_I420); |
1788 | 1788 |
1789 AllocatedEncoder new_encoder = CreateVideoEncoder(codec_settings.codec); | 1789 AllocatedEncoder new_encoder = CreateVideoEncoder(codec_settings.codec); |
1790 parameters_.config.encoder_settings.encoder = new_encoder.encoder; | 1790 parameters_.config.encoder_settings.encoder = new_encoder.encoder; |
| 1791 parameters_.config.encoder_settings.full_overuse_time = new_encoder.external; |
1791 parameters_.config.encoder_settings.payload_name = codec_settings.codec.name; | 1792 parameters_.config.encoder_settings.payload_name = codec_settings.codec.name; |
1792 parameters_.config.encoder_settings.payload_type = codec_settings.codec.id; | 1793 parameters_.config.encoder_settings.payload_type = codec_settings.codec.id; |
1793 if (new_encoder.external) { | 1794 if (new_encoder.external) { |
1794 webrtc::VideoCodecType type = CodecTypeFromName(codec_settings.codec.name); | 1795 webrtc::VideoCodecType type = CodecTypeFromName(codec_settings.codec.name); |
1795 parameters_.config.encoder_settings.internal_source = | 1796 parameters_.config.encoder_settings.internal_source = |
1796 external_encoder_factory_->EncoderTypeHasInternalSource(type); | 1797 external_encoder_factory_->EncoderTypeHasInternalSource(type); |
1797 } | 1798 } |
1798 parameters_.config.rtp.fec = codec_settings.fec; | 1799 parameters_.config.rtp.fec = codec_settings.fec; |
1799 | 1800 |
1800 // Set RTX payload type if RTX is enabled. | 1801 // Set RTX payload type if RTX is enabled. |
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2548 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2549 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2549 } | 2550 } |
2550 } | 2551 } |
2551 | 2552 |
2552 return video_codecs; | 2553 return video_codecs; |
2553 } | 2554 } |
2554 | 2555 |
2555 } // namespace cricket | 2556 } // namespace cricket |
2556 | 2557 |
2557 #endif // HAVE_WEBRTC_VIDEO | 2558 #endif // HAVE_WEBRTC_VIDEO |
OLD | NEW |