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

Side by Side Diff: webrtc/modules/video_coding/codec_database.cc

Issue 2911193002: Implement timing frames. (Closed)
Patch Set: Fix uninitialized variables memcheck errors Created 3 years, 6 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // 96 to 127 dynamic payload types for video codecs. 120 // 96 to 127 dynamic payload types for video codecs.
121 settings->plType = kDefaultPayloadType; 121 settings->plType = kDefaultPayloadType;
122 settings->startBitrate = kDefaultStartBitrateKbps; 122 settings->startBitrate = kDefaultStartBitrateKbps;
123 settings->minBitrate = VCM_MIN_BITRATE; 123 settings->minBitrate = VCM_MIN_BITRATE;
124 settings->maxBitrate = 0; 124 settings->maxBitrate = 0;
125 settings->maxFramerate = VCM_DEFAULT_FRAME_RATE; 125 settings->maxFramerate = VCM_DEFAULT_FRAME_RATE;
126 settings->width = VCM_DEFAULT_CODEC_WIDTH; 126 settings->width = VCM_DEFAULT_CODEC_WIDTH;
127 settings->height = VCM_DEFAULT_CODEC_HEIGHT; 127 settings->height = VCM_DEFAULT_CODEC_HEIGHT;
128 settings->numberOfSimulcastStreams = 0; 128 settings->numberOfSimulcastStreams = 0;
129 settings->qpMax = 56; 129 settings->qpMax = 56;
130 settings->minFrameSizeToForceTimingFrameBytes =
131 kMinFrameSizeToForceTimingFrameBytes;
132 settings->timingFramesDelayMs = kTimingFramesDelayMs;
130 *(settings->VP8()) = VideoEncoder::GetDefaultVp8Settings(); 133 *(settings->VP8()) = VideoEncoder::GetDefaultVp8Settings();
131 return; 134 return;
132 case kVideoCodecVP9: 135 case kVideoCodecVP9:
133 strncpy(settings->plName, "VP9", 4); 136 strncpy(settings->plName, "VP9", 4);
134 settings->codecType = kVideoCodecVP9; 137 settings->codecType = kVideoCodecVP9;
135 // 96 to 127 dynamic payload types for video codecs. 138 // 96 to 127 dynamic payload types for video codecs.
136 settings->plType = kDefaultPayloadType; 139 settings->plType = kDefaultPayloadType;
137 settings->startBitrate = 100; 140 settings->startBitrate = 100;
138 settings->minBitrate = VCM_MIN_BITRATE; 141 settings->minBitrate = VCM_MIN_BITRATE;
139 settings->maxBitrate = 0; 142 settings->maxBitrate = 0;
140 settings->maxFramerate = VCM_DEFAULT_FRAME_RATE; 143 settings->maxFramerate = VCM_DEFAULT_FRAME_RATE;
141 settings->width = VCM_DEFAULT_CODEC_WIDTH; 144 settings->width = VCM_DEFAULT_CODEC_WIDTH;
142 settings->height = VCM_DEFAULT_CODEC_HEIGHT; 145 settings->height = VCM_DEFAULT_CODEC_HEIGHT;
143 settings->numberOfSimulcastStreams = 0; 146 settings->numberOfSimulcastStreams = 0;
144 settings->qpMax = 56; 147 settings->qpMax = 56;
148 settings->minFrameSizeToForceTimingFrameBytes =
149 kMinFrameSizeToForceTimingFrameBytes;
150 settings->timingFramesDelayMs = kTimingFramesDelayMs;
145 *(settings->VP9()) = VideoEncoder::GetDefaultVp9Settings(); 151 *(settings->VP9()) = VideoEncoder::GetDefaultVp9Settings();
146 return; 152 return;
147 case kVideoCodecH264: 153 case kVideoCodecH264:
148 strncpy(settings->plName, "H264", 5); 154 strncpy(settings->plName, "H264", 5);
149 settings->codecType = kVideoCodecH264; 155 settings->codecType = kVideoCodecH264;
150 // 96 to 127 dynamic payload types for video codecs. 156 // 96 to 127 dynamic payload types for video codecs.
151 settings->plType = kDefaultPayloadType; 157 settings->plType = kDefaultPayloadType;
152 settings->startBitrate = kDefaultStartBitrateKbps; 158 settings->startBitrate = kDefaultStartBitrateKbps;
153 settings->minBitrate = VCM_MIN_BITRATE; 159 settings->minBitrate = VCM_MIN_BITRATE;
154 settings->maxBitrate = 0; 160 settings->maxBitrate = 0;
155 settings->maxFramerate = VCM_DEFAULT_FRAME_RATE; 161 settings->maxFramerate = VCM_DEFAULT_FRAME_RATE;
156 settings->width = VCM_DEFAULT_CODEC_WIDTH; 162 settings->width = VCM_DEFAULT_CODEC_WIDTH;
157 settings->height = VCM_DEFAULT_CODEC_HEIGHT; 163 settings->height = VCM_DEFAULT_CODEC_HEIGHT;
158 settings->numberOfSimulcastStreams = 0; 164 settings->numberOfSimulcastStreams = 0;
159 settings->qpMax = 56; 165 settings->qpMax = 56;
166 settings->minFrameSizeToForceTimingFrameBytes =
167 kMinFrameSizeToForceTimingFrameBytes;
168 settings->timingFramesDelayMs = kTimingFramesDelayMs;
160 *(settings->H264()) = VideoEncoder::GetDefaultH264Settings(); 169 *(settings->H264()) = VideoEncoder::GetDefaultH264Settings();
161 return; 170 return;
162 case kVideoCodecI420: 171 case kVideoCodecI420:
163 strncpy(settings->plName, "I420", 5); 172 strncpy(settings->plName, "I420", 5);
164 settings->codecType = kVideoCodecI420; 173 settings->codecType = kVideoCodecI420;
165 // 96 to 127 dynamic payload types for video codecs. 174 // 96 to 127 dynamic payload types for video codecs.
166 settings->plType = kDefaultPayloadType; 175 settings->plType = kDefaultPayloadType;
167 // Bitrate needed for this size and framerate. 176 // Bitrate needed for this size and framerate.
168 settings->startBitrate = 3 * VCM_DEFAULT_CODEC_WIDTH * 177 settings->startBitrate = 3 * VCM_DEFAULT_CODEC_WIDTH *
169 VCM_DEFAULT_CODEC_HEIGHT * 8 * 178 VCM_DEFAULT_CODEC_HEIGHT * 8 *
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 592
584 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem( 593 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem(
585 uint8_t payload_type) const { 594 uint8_t payload_type) const {
586 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type); 595 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type);
587 if (it != dec_external_map_.end()) { 596 if (it != dec_external_map_.end()) {
588 return (*it).second; 597 return (*it).second;
589 } 598 }
590 return nullptr; 599 return nullptr;
591 } 600 }
592 } // namespace webrtc 601 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698