admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Remove deprecated CodecType methods. (patchset #1 id:1 of https://codereview.webrtc.org/3009583002/ )

Browse Source 
Reason for revert:
It breaks chromium FYI bots.

E.g.: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Win%20Builder/builds/11615

Original issue's description:
> Remove deprecated CodecType methods.
>
> These are no longer needed as all clients have been updated to use the
> new methods that always return a value.
>
> BUG=None
>
> Review-Url: https://codereview.webrtc.org/3009583002
> Cr-Commit-Position: refs/heads/master@{#19559}
> Committed: 1a92d0de49

TBR=magjed@webrtc.org,tommi@webrtc.org,kthelgason@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None

Review-Url: https://codereview.webrtc.org/3010553002
Cr-Commit-Position: refs/heads/master@{#19563}
This commit is contained in:
mbonadei 2017-08-28 07:16:43 -07:00 committed by Commit Bot
parent bc4cbe1b6c
commit 673caedc39
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/common_types.cc
View File

@ -168,6 +168,16 @@ VideoCodecType PayloadStringToCodecType(const std::string& name) {
return kVideoCodecGeneric;
}
// TODO(kthelgason): Remove these methods once upstream projects
// have been updated.
rtc::Optional<const char*> CodecTypeToPayloadName(VideoCodecType type) {
return rtc::Optional<const char*>(CodecTypeToPayloadString(type));
}
rtc::Optional<VideoCodecType> PayloadNameToCodecType(const std::string& name) {
return rtc::Optional<VideoCodecType>(PayloadStringToCodecType(name));
}
const uint32_t BitrateAllocation::kMaxBitrateBps =
std::numeric_limits<uint32_t>::max();

4
webrtc/common_types.h
View File

@ -553,6 +553,10 @@ enum VideoCodecType {
// Translates from name of codec to codec type and vice versa.
const char* CodecTypeToPayloadString(VideoCodecType type);
VideoCodecType PayloadStringToCodecType(const std::string& name);
// TODO(kthelgason): Remove these methods once upstream projects
// have been updated.
rtc::Optional<const char*> CodecTypeToPayloadName(VideoCodecType type);
rtc::Optional<VideoCodecType> PayloadNameToCodecType(const std::string& name);
union VideoCodecUnion {
VideoCodecVP8 VP8;