OLD | NEW |
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 46 matching lines...) Loading... |
57 vp9_settings.flexibleMode = false; | 57 vp9_settings.flexibleMode = false; |
58 return vp9_settings; | 58 return vp9_settings; |
59 } | 59 } |
60 | 60 |
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.packetization_mode = kH264PacketizationMode1; |
67 h264_settings.spsData = nullptr; | 68 h264_settings.spsData = nullptr; |
68 h264_settings.spsLen = 0; | 69 h264_settings.spsLen = 0; |
69 h264_settings.ppsData = nullptr; | 70 h264_settings.ppsData = nullptr; |
70 h264_settings.ppsLen = 0; | 71 h264_settings.ppsLen = 0; |
71 | 72 |
72 return h264_settings; | 73 return h264_settings; |
73 } | 74 } |
74 | 75 |
75 VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings, | 76 VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings, |
76 int number_of_cores, | 77 int number_of_cores, |
(...skipping 523 matching lines...) Loading... |
600 | 601 |
601 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem( | 602 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem( |
602 uint8_t payload_type) const { | 603 uint8_t payload_type) const { |
603 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type); | 604 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type); |
604 if (it != dec_external_map_.end()) { | 605 if (it != dec_external_map_.end()) { |
605 return (*it).second; | 606 return (*it).second; |
606 } | 607 } |
607 return nullptr; | 608 return nullptr; |
608 } | 609 } |
609 } // namespace webrtc | 610 } // namespace webrtc |
OLD | NEW |