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 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
425 std::vector<webrtc::VideoStream> | 425 std::vector<webrtc::VideoStream> |
426 WebRtcVideoChannel2::WebRtcVideoSendStream::CreateSimulcastVideoStreams( | 426 WebRtcVideoChannel2::WebRtcVideoSendStream::CreateSimulcastVideoStreams( |
427 const VideoCodec& codec, | 427 const VideoCodec& codec, |
428 const VideoOptions& options, | 428 const VideoOptions& options, |
429 int max_bitrate_bps, | 429 int max_bitrate_bps, |
430 size_t num_streams) { | 430 size_t num_streams) { |
431 int max_qp = kDefaultQpMax; | 431 int max_qp = kDefaultQpMax; |
432 codec.GetParam(kCodecParamMaxQuantization, &max_qp); | 432 codec.GetParam(kCodecParamMaxQuantization, &max_qp); |
433 | 433 |
434 return GetSimulcastConfig( | 434 return GetSimulcastConfig( |
435 num_streams, GetSimulcastBitrateMode(options), codec.width, codec.height, | 435 num_streams, codec.width, codec.height, max_bitrate_bps, max_qp, |
436 max_bitrate_bps, max_qp, | |
437 codec.framerate != 0 ? codec.framerate : kDefaultVideoMaxFramerate); | 436 codec.framerate != 0 ? codec.framerate : kDefaultVideoMaxFramerate); |
438 } | 437 } |
439 | 438 |
440 std::vector<webrtc::VideoStream> | 439 std::vector<webrtc::VideoStream> |
441 WebRtcVideoChannel2::WebRtcVideoSendStream::CreateVideoStreams( | 440 WebRtcVideoChannel2::WebRtcVideoSendStream::CreateVideoStreams( |
442 const VideoCodec& codec, | 441 const VideoCodec& codec, |
443 const VideoOptions& options, | 442 const VideoOptions& options, |
444 int max_bitrate_bps, | 443 int max_bitrate_bps, |
445 size_t num_streams) { | 444 size_t num_streams) { |
446 int codec_max_bitrate_kbps; | 445 int codec_max_bitrate_kbps; |
(...skipping 2285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2732 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2731 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2733 } | 2732 } |
2734 } | 2733 } |
2735 | 2734 |
2736 return video_codecs; | 2735 return video_codecs; |
2737 } | 2736 } |
2738 | 2737 |
2739 } // namespace cricket | 2738 } // namespace cricket |
2740 | 2739 |
2741 #endif // HAVE_WEBRTC_VIDEO | 2740 #endif // HAVE_WEBRTC_VIDEO |
OLD | NEW |