Reland of move deprecated CodecType methods. (patchset #1 id:1 of https://codereview.webrtc.org/3010553002/ )

Reason for revert:
Fixes have landed in chromium.

Original issue's description:
> Revert of Remove deprecated CodecType methods. (patchset #1 id:1 of https://codereview.webrtc.org/3009583002/ )
>
> 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}
> Committed: 673caedc39

TBR=magjed@webrtc.org,tommi@webrtc.org,mbonadei@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=None

Review-Url: https://codereview.webrtc.org/3009413002
Cr-Commit-Position: refs/heads/master@{#19816}
This commit is contained in:
kthelgason 2017-09-13 05:16:26 -07:00 committed by Commit Bot
parent d57f9ddfd1
commit dc80abe975
2 changed files with 0 additions and 14 deletions

View File

@ -178,16 +178,6 @@ 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();

View File

@ -554,10 +554,6 @@ 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;