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

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

Issue 2529143002: Revert of Add H264 profile to webrtc::VideoCodecH264 and webrtc::VideoPayload (Closed)
Patch Set: Created 4 years 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 VideoCodecH264 VideoEncoder::GetDefaultH264Settings() { 61 VideoCodecH264 VideoEncoder::GetDefaultH264Settings() {
62 VideoCodecH264 h264_settings; 62 VideoCodecH264 h264_settings;
63 memset(&h264_settings, 0, sizeof(h264_settings)); 63 memset(&h264_settings, 0, sizeof(h264_settings));
64 64
65 h264_settings.frameDroppingOn = true; 65 h264_settings.frameDroppingOn = true;
66 h264_settings.keyFrameInterval = 3000; 66 h264_settings.keyFrameInterval = 3000;
67 h264_settings.spsData = nullptr; 67 h264_settings.spsData = nullptr;
68 h264_settings.spsLen = 0; 68 h264_settings.spsLen = 0;
69 h264_settings.ppsData = nullptr; 69 h264_settings.ppsData = nullptr;
70 h264_settings.ppsLen = 0; 70 h264_settings.ppsLen = 0;
71 h264_settings.profile = H264::kProfileConstrainedBaseline;
72 71
73 return h264_settings; 72 return h264_settings;
74 } 73 }
75 74
76 VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings, 75 VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings,
77 int number_of_cores, 76 int number_of_cores,
78 bool require_key_frame) 77 bool require_key_frame)
79 : settings(settings), 78 : settings(settings),
80 number_of_cores(number_of_cores), 79 number_of_cores(number_of_cores),
81 require_key_frame(require_key_frame) { 80 require_key_frame(require_key_frame) {
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 600
602 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem( 601 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem(
603 uint8_t payload_type) const { 602 uint8_t payload_type) const {
604 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type); 603 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type);
605 if (it != dec_external_map_.end()) { 604 if (it != dec_external_map_.end()) {
606 return (*it).second; 605 return (*it).second;
607 } 606 }
608 return nullptr; 607 return nullptr;
609 } 608 }
610 } // namespace webrtc 609 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698