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

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

Issue 1289933003: Full stack graphs (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: addressing comments 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
« no previous file with comments | « webrtc/video/full_stack_quality_sampler.cc ('k') | webrtc/webrtc_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 namespace { 96 namespace {
97 97
98 VideoCodec CreateDecoderVideoCodec(const VideoReceiveStream::Decoder& decoder) { 98 VideoCodec CreateDecoderVideoCodec(const VideoReceiveStream::Decoder& decoder) {
99 VideoCodec codec; 99 VideoCodec codec;
100 memset(&codec, 0, sizeof(codec)); 100 memset(&codec, 0, sizeof(codec));
101 101
102 codec.plType = decoder.payload_type; 102 codec.plType = decoder.payload_type;
103 strcpy(codec.plName, decoder.payload_name.c_str()); 103 strcpy(codec.plName, decoder.payload_name.c_str());
104 if (decoder.payload_name == "VP8") { 104 if (decoder.payload_name == "VP8") {
105 codec.codecType = kVideoCodecVP8; 105 codec.codecType = kVideoCodecVP8;
106 } else if (decoder.payload_name == "VP9") {
107 codec.codecType = kVideoCodecVP9;
106 } else if (decoder.payload_name == "H264") { 108 } else if (decoder.payload_name == "H264") {
107 codec.codecType = kVideoCodecH264; 109 codec.codecType = kVideoCodecH264;
108 } else { 110 } else {
109 codec.codecType = kVideoCodecGeneric; 111 codec.codecType = kVideoCodecGeneric;
110 } 112 }
111 113
112 if (codec.codecType == kVideoCodecVP8) { 114 if (codec.codecType == kVideoCodecVP8) {
113 codec.codecSpecific.VP8 = VideoEncoder::GetDefaultVp8Settings(); 115 codec.codecSpecific.VP8 = VideoEncoder::GetDefaultVp8Settings();
116 } else if (codec.codecType == kVideoCodecVP9) {
117 codec.codecSpecific.VP9 = VideoEncoder::GetDefaultVp9Settings();
114 } else if (codec.codecType == kVideoCodecH264) { 118 } else if (codec.codecType == kVideoCodecH264) {
115 codec.codecSpecific.H264 = VideoEncoder::GetDefaultH264Settings(); 119 codec.codecSpecific.H264 = VideoEncoder::GetDefaultH264Settings();
116 } 120 }
117 121
118 codec.width = 320; 122 codec.width = 320;
119 codec.height = 180; 123 codec.height = 180;
120 codec.startBitrate = codec.minBitrate = codec.maxBitrate = 124 codec.startBitrate = codec.minBitrate = codec.maxBitrate =
121 Call::Config::kDefaultStartBitrateBps / 1000; 125 Call::Config::kDefaultStartBitrateBps / 1000;
122 126
123 return codec; 127 return codec;
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 case newapi::kRtcpCompound: 332 case newapi::kRtcpCompound:
329 vie_channel_->SetRTCPMode(kRtcpCompound); 333 vie_channel_->SetRTCPMode(kRtcpCompound);
330 break; 334 break;
331 case newapi::kRtcpReducedSize: 335 case newapi::kRtcpReducedSize:
332 vie_channel_->SetRTCPMode(kRtcpNonCompound); 336 vie_channel_->SetRTCPMode(kRtcpNonCompound);
333 break; 337 break;
334 } 338 }
335 } 339 }
336 } // namespace internal 340 } // namespace internal
337 } // namespace webrtc 341 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/full_stack_quality_sampler.cc ('k') | webrtc/webrtc_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698