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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
480 stream.max_qp = max_qp; | 480 stream.max_qp = max_qp; |
481 std::vector<webrtc::VideoStream> streams; | 481 std::vector<webrtc::VideoStream> streams; |
482 streams.push_back(stream); | 482 streams.push_back(stream); |
483 return streams; | 483 return streams; |
484 } | 484 } |
485 | 485 |
486 void* WebRtcVideoChannel2::WebRtcVideoSendStream::ConfigureVideoEncoderSettings( | 486 void* WebRtcVideoChannel2::WebRtcVideoSendStream::ConfigureVideoEncoderSettings( |
487 const VideoCodec& codec, | 487 const VideoCodec& codec, |
488 const VideoOptions& options, | 488 const VideoOptions& options, |
489 bool is_screencast) { | 489 bool is_screencast) { |
490 // No automatic resizing when using simulcast. | 490 // No automatic resizing when using simulcast or screencast. |
491 bool automatic_resize = !is_screencast && ssrcs_.size() == 1; | 491 bool automatic_resize = |
| 492 !is_screencast && parameters_.config.rtp.ssrcs.size() == 1; |
492 bool frame_dropping = !is_screencast; | 493 bool frame_dropping = !is_screencast; |
493 bool denoising; | 494 bool denoising; |
494 if (is_screencast) { | 495 if (is_screencast) { |
495 denoising = false; | 496 denoising = false; |
496 } else { | 497 } else { |
497 options.video_noise_reduction.Get(&denoising); | 498 options.video_noise_reduction.Get(&denoising); |
498 } | 499 } |
499 | 500 |
500 if (CodecNamesEq(codec.name, kVp8CodecName)) { | 501 if (CodecNamesEq(codec.name, kVp8CodecName)) { |
501 encoder_settings_.vp8 = webrtc::VideoEncoder::GetDefaultVp8Settings(); | 502 encoder_settings_.vp8 = webrtc::VideoEncoder::GetDefaultVp8Settings(); |
(...skipping 2271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2773 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2774 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2774 } | 2775 } |
2775 } | 2776 } |
2776 | 2777 |
2777 return video_codecs; | 2778 return video_codecs; |
2778 } | 2779 } |
2779 | 2780 |
2780 } // namespace cricket | 2781 } // namespace cricket |
2781 | 2782 |
2782 #endif // HAVE_WEBRTC_VIDEO | 2783 #endif // HAVE_WEBRTC_VIDEO |
OLD | NEW |