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

Side by Side Diff: webrtc/common_types.h

Issue 3009413002: Reland of move deprecated CodecType methods. (Closed)
Patch Set: Created 3 years, 3 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
« no previous file with comments | « no previous file | webrtc/common_types.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 kVideoCodecRED, 543 kVideoCodecRED,
544 kVideoCodecULPFEC, 544 kVideoCodecULPFEC,
545 kVideoCodecFlexfec, 545 kVideoCodecFlexfec,
546 kVideoCodecGeneric, 546 kVideoCodecGeneric,
547 kVideoCodecUnknown 547 kVideoCodecUnknown
548 }; 548 };
549 549
550 // Translates from name of codec to codec type and vice versa. 550 // Translates from name of codec to codec type and vice versa.
551 const char* CodecTypeToPayloadString(VideoCodecType type); 551 const char* CodecTypeToPayloadString(VideoCodecType type);
552 VideoCodecType PayloadStringToCodecType(const std::string& name); 552 VideoCodecType PayloadStringToCodecType(const std::string& name);
553 // TODO(kthelgason): Remove these methods once upstream projects
554 // have been updated.
555 rtc::Optional<const char*> CodecTypeToPayloadName(VideoCodecType type);
556 rtc::Optional<VideoCodecType> PayloadNameToCodecType(const std::string& name);
557 553
558 union VideoCodecUnion { 554 union VideoCodecUnion {
559 VideoCodecVP8 VP8; 555 VideoCodecVP8 VP8;
560 VideoCodecVP9 VP9; 556 VideoCodecVP9 VP9;
561 VideoCodecH264 H264; 557 VideoCodecH264 H264;
562 }; 558 };
563 559
564 // Simulcast is when the same stream is encoded multiple times with different 560 // Simulcast is when the same stream is encoded multiple times with different
565 // settings such as resolution. 561 // settings such as resolution.
566 struct SimulcastStream { 562 struct SimulcastStream {
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
962 bool operator==(const RtpKeepAliveConfig& o) const { 958 bool operator==(const RtpKeepAliveConfig& o) const {
963 return timeout_interval_ms == o.timeout_interval_ms && 959 return timeout_interval_ms == o.timeout_interval_ms &&
964 payload_type == o.payload_type; 960 payload_type == o.payload_type;
965 } 961 }
966 bool operator!=(const RtpKeepAliveConfig& o) const { return !(*this == o); } 962 bool operator!=(const RtpKeepAliveConfig& o) const { return !(*this == o); }
967 }; 963 };
968 964
969 } // namespace webrtc 965 } // namespace webrtc
970 966
971 #endif // WEBRTC_COMMON_TYPES_H_ 967 #endif // WEBRTC_COMMON_TYPES_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/common_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698