| 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 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 kVideoCodecH264, | 558 kVideoCodecH264, |
| 559 kVideoCodecI420, | 559 kVideoCodecI420, |
| 560 kVideoCodecRED, | 560 kVideoCodecRED, |
| 561 kVideoCodecULPFEC, | 561 kVideoCodecULPFEC, |
| 562 kVideoCodecFlexfec, | 562 kVideoCodecFlexfec, |
| 563 kVideoCodecGeneric, | 563 kVideoCodecGeneric, |
| 564 kVideoCodecUnknown | 564 kVideoCodecUnknown |
| 565 }; | 565 }; |
| 566 | 566 |
| 567 // Translates from name of codec to codec type and vice versa. | 567 // Translates from name of codec to codec type and vice versa. |
| 568 rtc::Optional<std::string> CodecTypeToPayloadName(VideoCodecType type); | 568 rtc::Optional<const char*> CodecTypeToPayloadName(VideoCodecType type); |
| 569 rtc::Optional<VideoCodecType> PayloadNameToCodecType(const std::string& name); | 569 rtc::Optional<VideoCodecType> PayloadNameToCodecType(const std::string& name); |
| 570 | 570 |
| 571 union VideoCodecUnion { | 571 union VideoCodecUnion { |
| 572 VideoCodecVP8 VP8; | 572 VideoCodecVP8 VP8; |
| 573 VideoCodecVP9 VP9; | 573 VideoCodecVP9 VP9; |
| 574 VideoCodecH264 H264; | 574 VideoCodecH264 H264; |
| 575 }; | 575 }; |
| 576 | 576 |
| 577 // Simulcast is when the same stream is encoded multiple times with different | 577 // Simulcast is when the same stream is encoded multiple times with different |
| 578 // settings such as resolution. | 578 // settings such as resolution. |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 872 enum class RtcpMode { kOff, kCompound, kReducedSize }; | 872 enum class RtcpMode { kOff, kCompound, kReducedSize }; |
| 873 | 873 |
| 874 enum NetworkState { | 874 enum NetworkState { |
| 875 kNetworkUp, | 875 kNetworkUp, |
| 876 kNetworkDown, | 876 kNetworkDown, |
| 877 }; | 877 }; |
| 878 | 878 |
| 879 } // namespace webrtc | 879 } // namespace webrtc |
| 880 | 880 |
| 881 #endif // WEBRTC_COMMON_TYPES_H_ | 881 #endif // WEBRTC_COMMON_TYPES_H_ |
| OLD | NEW |