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 1860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1871 if (parameters_.encoder_config.streams.empty()) | 1871 if (parameters_.encoder_config.streams.empty()) |
1872 return; | 1872 return; |
1873 | 1873 |
1874 format_ = VideoFormat(codec_settings.codec.width, | 1874 format_ = VideoFormat(codec_settings.codec.width, |
1875 codec_settings.codec.height, | 1875 codec_settings.codec.height, |
1876 VideoFormat::FpsToInterval(30), | 1876 VideoFormat::FpsToInterval(30), |
1877 FOURCC_I420); | 1877 FOURCC_I420); |
1878 | 1878 |
1879 AllocatedEncoder new_encoder = CreateVideoEncoder(codec_settings.codec); | 1879 AllocatedEncoder new_encoder = CreateVideoEncoder(codec_settings.codec); |
1880 parameters_.config.encoder_settings.encoder = new_encoder.encoder; | 1880 parameters_.config.encoder_settings.encoder = new_encoder.encoder; |
| 1881 parameters_.config.encoder_settings.full_overuse_time = new_encoder.external; |
1881 parameters_.config.encoder_settings.payload_name = codec_settings.codec.name; | 1882 parameters_.config.encoder_settings.payload_name = codec_settings.codec.name; |
1882 parameters_.config.encoder_settings.payload_type = codec_settings.codec.id; | 1883 parameters_.config.encoder_settings.payload_type = codec_settings.codec.id; |
1883 if (new_encoder.external) { | 1884 if (new_encoder.external) { |
1884 webrtc::VideoCodecType type = CodecTypeFromName(codec_settings.codec.name); | 1885 webrtc::VideoCodecType type = CodecTypeFromName(codec_settings.codec.name); |
1885 parameters_.config.encoder_settings.internal_source = | 1886 parameters_.config.encoder_settings.internal_source = |
1886 external_encoder_factory_->EncoderTypeHasInternalSource(type); | 1887 external_encoder_factory_->EncoderTypeHasInternalSource(type); |
1887 } | 1888 } |
1888 parameters_.config.rtp.fec = codec_settings.fec; | 1889 parameters_.config.rtp.fec = codec_settings.fec; |
1889 | 1890 |
1890 // Set RTX payload type if RTX is enabled. | 1891 // Set RTX payload type if RTX is enabled. |
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2626 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2627 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2627 } | 2628 } |
2628 } | 2629 } |
2629 | 2630 |
2630 return video_codecs; | 2631 return video_codecs; |
2631 } | 2632 } |
2632 | 2633 |
2633 } // namespace cricket | 2634 } // namespace cricket |
2634 | 2635 |
2635 #endif // HAVE_WEBRTC_VIDEO | 2636 #endif // HAVE_WEBRTC_VIDEO |
OLD | NEW |