| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2017 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 |
| 11 #ifndef WEBRTC_COMMON_VIDEO_H264_PROFILE_LEVEL_ID_H_ | 11 #ifndef WEBRTC_MEDIA_BASE_H264_PROFILE_LEVEL_ID_H_ |
| 12 #define WEBRTC_COMMON_VIDEO_H264_PROFILE_LEVEL_ID_H_ | 12 #define WEBRTC_MEDIA_BASE_H264_PROFILE_LEVEL_ID_H_ |
| 13 | 13 |
| 14 #include <map> | 14 #include <map> |
| 15 #include <string> | 15 #include <string> |
| 16 | 16 |
| 17 #include "webrtc/base/optional.h" | 17 #include "webrtc/base/optional.h" |
| 18 #include "webrtc/common_types.h" | 18 #include "webrtc/common_types.h" |
| 19 | 19 |
| 20 namespace webrtc { | 20 namespace webrtc { |
| 21 namespace H264 { | 21 namespace H264 { |
| 22 | 22 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 // parameters that are used when negotiating are the level part of | 92 // parameters that are used when negotiating are the level part of |
| 93 // profile-level-id and level-asymmetry-allowed. | 93 // profile-level-id and level-asymmetry-allowed. |
| 94 void GenerateProfileLevelIdForAnswer( | 94 void GenerateProfileLevelIdForAnswer( |
| 95 const CodecParameterMap& local_supported_params, | 95 const CodecParameterMap& local_supported_params, |
| 96 const CodecParameterMap& remote_offered_params, | 96 const CodecParameterMap& remote_offered_params, |
| 97 CodecParameterMap* answer_params); | 97 CodecParameterMap* answer_params); |
| 98 | 98 |
| 99 } // namespace H264 | 99 } // namespace H264 |
| 100 } // namespace webrtc | 100 } // namespace webrtc |
| 101 | 101 |
| 102 #endif // WEBRTC_COMMON_VIDEO_H264_PROFILE_LEVEL_ID_H_ | 102 #endif // WEBRTC_MEDIA_BASE_H264_PROFILE_LEVEL_ID_H_ |
| OLD | NEW |