Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: webrtc/video/video_send_stream.cc

Issue 1351693005: Read the number of TLs for VP9 too + cleanup (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 break; 272 break;
273 case VideoEncoderConfig::ContentType::kScreen: 273 case VideoEncoderConfig::ContentType::kScreen:
274 video_codec.mode = kScreensharing; 274 video_codec.mode = kScreensharing;
275 if (config.streams.size() == 1 && 275 if (config.streams.size() == 1 &&
276 config.streams[0].temporal_layer_thresholds_bps.size() == 1) { 276 config.streams[0].temporal_layer_thresholds_bps.size() == 1) {
277 video_codec.targetBitrate = 277 video_codec.targetBitrate =
278 config.streams[0].temporal_layer_thresholds_bps[0] / 1000; 278 config.streams[0].temporal_layer_thresholds_bps[0] / 1000;
279 } 279 }
280 break; 280 break;
281 } 281 }
282 video_codec.forceDisableWrapperFrameDropper =
283 config.force_disable_wrapper_frame_dropper;
282 284
283 if (video_codec.codecType == kVideoCodecVP8) { 285 if (video_codec.codecType == kVideoCodecVP8) {
284 video_codec.codecSpecific.VP8 = VideoEncoder::GetDefaultVp8Settings(); 286 video_codec.codecSpecific.VP8 = VideoEncoder::GetDefaultVp8Settings();
285 } else if (video_codec.codecType == kVideoCodecVP9) { 287 } else if (video_codec.codecType == kVideoCodecVP9) {
286 video_codec.codecSpecific.VP9 = VideoEncoder::GetDefaultVp9Settings(); 288 video_codec.codecSpecific.VP9 = VideoEncoder::GetDefaultVp9Settings();
287 } else if (video_codec.codecType == kVideoCodecH264) { 289 } else if (video_codec.codecType == kVideoCodecH264) {
288 video_codec.codecSpecific.H264 = VideoEncoder::GetDefaultH264Settings(); 290 video_codec.codecSpecific.H264 = VideoEncoder::GetDefaultH264Settings();
289 } 291 }
290 292
291 if (video_codec.codecType == kVideoCodecVP8) { 293 if (video_codec.codecType == kVideoCodecVP8) {
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 vie_channel_->IsSendingFecEnabled()); 512 vie_channel_->IsSendingFecEnabled());
511 513
512 // Restart the media flow 514 // Restart the media flow
513 vie_encoder_->Restart(); 515 vie_encoder_->Restart();
514 516
515 return true; 517 return true;
516 } 518 }
517 519
518 } // namespace internal 520 } // namespace internal
519 } // namespace webrtc 521 } // namespace webrtc
OLDNEW
« webrtc/video/video_loopback.cc ('K') | « webrtc/video/video_quality_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698